From 6ef3c100fbc79ec106756f383f5df2be682d5409 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Sat, 14 Apr 2018 02:47:35 +0300
Subject: MAINT-8440 Create a tabbed panel for managing users for Region/Estate
 owners

---
 .../skins/default/xui/en/panel_region_access.xml   | 295 +++++++++++++++++++++
 .../skins/default/xui/en/panel_region_estate.xml   | 206 --------------
 2 files changed, 295 insertions(+), 206 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_region_access.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
new file mode 100644
index 0000000000..abadd7aa2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="top|left"
+ height="510"
+ help_topic="panel_region_access_tab"
+ label="Access"
+ layout="topleft"
+ left="0"
+ name="Access"
+ top="320"
+ width="530">
+
+
+<tab_container
+ bottom="-10"
+ follows="all"
+ layout="topleft"
+ left="3"
+ name="tabs"
+ tab_min_width="70"
+ tab_height="30"
+ tab_position="top"
+ top="10"
+ halign="center"
+ right="-5">
+    
+<!-- ============================= ESTATE MANAGERS tab ====================== -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="ESTATE MANAGERS"
+    layout="topleft"
+    left="0"
+    help_topic="estate_managers_tab"
+    name="estate_managers_panel"
+    right="-1"
+    top="0">
+    <text
+     type="string"
+     length="1"
+     bottom="34"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="estate_manager_label"
+     top_pad="10"
+     left="10"
+     width="200">
+        Estate Managers:
+    </text>
+    <!-- Estate Managers box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="estate_manager_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Estate Managers buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_estate_manager_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_estate_manager_btn"
+     left_pad="6"
+     width="114" />      
+  </panel>
+        
+        
+<!-- ================================ ALLOWED tab =========================== -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="ALLOWED"
+    layout="topleft"
+    left="0"
+    help_topic="allowed_tab"
+    name="allowed_panel"
+    right="-1"
+    top="0">
+   <text
+     type="string"
+     length="1"
+     bottom="34"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="allow_resident_label"
+     top_pad="10"
+     left="10"
+     width="200">
+        Always allowed:
+    </text>
+    <!-- Always allowed box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="allowed_avatar_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Always allowed buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_allowed_avatar_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_avatar_btn"
+     left_pad="6"
+     width="114" />
+  </panel>
+
+  <!-- ============================= ALLOWED GROUPS tab ======================= -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="ALLOWED GROUPS"
+    layout="topleft"
+    left="0"
+    help_topic="allowed_groups_tab"
+    name="allowed_groups_panel"
+    right="-1"
+    top="0">  
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="allow_group_label"
+     top_pad="10"
+     width="200">
+        Groups always allowed:
+    </text>
+    <!-- Groups always allowed box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="allowed_group_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Groups always allowed buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_allowed_group_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_group_btn"
+     left_pad="6"
+     top_delta="0"
+     width="114" />
+  </panel>
+
+  <!-- ================================ BANNED tab ============================ -->
+  <panel
+    background_opaque="true"
+    background_visible="true"
+    bg_alpha_color="DkGray"
+    bg_opaque_color="DkGray"
+    bottom="-1"
+    follows="all"
+    label="BANNED"
+    layout="topleft"
+    left="0"
+    help_topic="banned_tab"
+    name="banned_panel"
+    right="-1"
+    top="0">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="ban_resident_label"
+     top_pad="10"
+     width="200">
+        Always banned:
+    </text>
+    <!-- Always banned box -->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="400"
+     layout="topleft"
+     left="10"
+     top_pad="-5"
+     width="498" />
+    <name_list
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="banned_avatar_name_list"
+     top_delta="0"
+     width="498" />
+    <!-- Always banned buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_banned_avatar_btn"
+     top_pad="6"
+     width="114" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_banned_avatar_btn"
+     left_pad="6"
+     top_delta="0"
+     width="114" />
+  </panel>
+
+
+</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index a0c1dd0be6..0e99fb1c14 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -159,212 +159,6 @@
      top_pad="30"
      left_delta="0"
      width="97" />
-    
-    <text
-     type="string"
-     length="1"
-     bottom="34"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     name="estate_manager_label"
-     top_pad="25"
-     left="10"
-     width="200">
-        Estate Managers:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="280"
-     name="allow_resident_label"
-     top_delta="0"
-     width="200">
-        Always allowed:
-    </text>
-
-    <!-- Estate Managers box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="10"
-     top_pad="-5"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="estate_manager_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Always allowed box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="280"
-     top_delta="0"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="allowed_avatar_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Estate Managers buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left="10"
-     name="add_estate_manager_btn"
-     top_pad="6"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_estate_manager_btn"
-     left_pad="6"
-     width="114" />
-
-    <!-- Always allowed buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     left="280"
-     label="Add..."
-     layout="topleft"
-     name="add_allowed_avatar_btn"
-     top_delta="0"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_avatar_btn"
-     left_pad="6"
-     top_delta="0"
-     width="114" />
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="allow_group_label"
-     top_pad="10"
-     width="200">
-        Groups always allowed:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="280"
-     name="ban_resident_label"
-     top_delta="0"
-     width="200">
-        Always banned:
-    </text>
-
-    <!-- Groups always allowed box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="10"
-     top_pad="-5"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="allowed_group_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Always banned box -->
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="71"
-     layout="topleft"
-     left="280"
-     top_delta="0"
-     width="235" />
-    <name_list
-     follows="left|top"
-     height="71"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="banned_avatar_name_list"
-     top_delta="0"
-     width="235" />
-
-    <!-- Groups always allowed buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left="10"
-     name="add_allowed_group_btn"
-     top_pad="6"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_group_btn"
-     left_pad="6"
-     top_delta="0"
-     width="114" />
-
-    <!-- Always banned buttons -->
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left="280"
-     name="add_banned_avatar_btn"
-     top_delta="0"
-     width="114" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_banned_avatar_btn"
-     top_delta="0"
-     left_pad="6"
-     width="114" />
 
     <button
      follows="left|top"
-- 
cgit v1.2.3


From 8c1d51caf31c7d34c0c6c347576eed141577de2f Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 23 Apr 2018 20:54:08 +0300
Subject: MAINT-8441 Generate Confirmation message when adding a person to a
 estate list

---
 .../newview/skins/default/xui/en/notifications.xml | 42 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  3 ++
 2 files changed, 45 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 6aa6653f42..d139534328 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3805,6 +3805,48 @@ Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
    type="alertmodal">
 Unable to add banned resident to estate manager list.
   </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentIsAlreadyInList"
+   type="alertmodal">
+[AGENT] is already in your [LIST_TYPE] list.
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentsAreAlreadyInList"
+   type="alertmodal">
+[AGENT] are already in your [LIST_TYPE] list.
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentWasAddedToList"
+   type="alertmodal">
+[AGENT] was added to [LIST_TYPE] list of [ESTATE].
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentsWereAddedToList"
+   type="alertmodal">
+[AGENT] were added to [LIST_TYPE] list of [ESTATE].
+
+  </notification>
+      <notification
+   icon="alertmodal.tga"
+   name="AgentWasRemovedFromList"
+   type="alertmodal">
+[AGENT] was removed from [LIST_TYPE] list of [ESTATE].
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="AgentsWereRemovedFromList"
+   type="alertmodal">
+[AGENT] were removed from [LIST_TYPE] list of [ESTATE].
+  </notification>
 
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5f30a7e87d..17ce94d2d7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2659,6 +2659,9 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="RegionInfoBannedResidents">Always banned: ([BANNEDAGENTS], max [MAXBANNED])</string>
 	<string name="RegionInfoListTypeAllowedAgents">Always allowed</string>
 	<string name="RegionInfoListTypeBannedAgents">Always banned</string>
+	<string name="RegionInfoAllEstates">all estates</string>
+	<string name="RegionInfoManagedEstates">managed estates</string>
+	<string name="RegionInfoThisEstate">this estate</string>
 
 	<!-- script limits floater -->
 	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
-- 
cgit v1.2.3


From b29c7173c68707c7173c5bc26e54047e8f751c15 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 16 May 2018 23:50:57 +0300
Subject: MAINT-8581 Better handling of adding Estate Managers to Banned list

---
 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 d139534328..98cd11fb6c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3806,6 +3806,13 @@ Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
 Unable to add banned resident to estate manager list.
   </notification>
     
+  <notification
+   icon="alertmodal.tga"
+   name="ProblemBanningEstateManager"
+   type="alertmodal">
+Unable to add estate manager [AGENT] to banned list.
+  </notification>
+    
   <notification
    icon="alertmodal.tga"
    name="AgentIsAlreadyInList"
-- 
cgit v1.2.3


From 99d9befb629c97f7c778c8a9ddfb9d0060d54de9 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 18 May 2018 00:21:39 +0300
Subject: MAINT-8524 Estate Access Management - Viewer side changes for the
 "Banned" list

---
 .../skins/default/xui/en/panel_region_access.xml   | 36 ++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index abadd7aa2d..7f6df426de 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -260,15 +260,33 @@
      left="10"
      top_pad="-5"
      width="498" />
-    <name_list
-     follows="left|top"
-     height="400"
-     layout="topleft"
-     left_delta="0"
-     multi_select="true"
-     name="banned_avatar_name_list"
-     top_delta="0"
-     width="498" />
+      <name_list
+       draw_heading="true"
+       follows="left|top"
+       height="400"
+       layout="topleft"
+       left_delta="0"
+       multi_select="true"
+       name="banned_avatar_name_list"
+       top_delta="0"
+       width="498">
+          <columns
+            label="Name"
+            name="name"
+            width="140" />
+          <columns
+            label="Last login date"
+            name="last_login_date"
+            width="100" />
+          <columns
+            label="Date banned"
+            name="ban_date"
+            width="100" />
+          <columns
+            label="Banned by"
+            name="bannedby"
+            width="140" />
+      </name_list>
     <!-- Always banned buttons -->
     <button
      follows="left|top"
-- 
cgit v1.2.3


From 522f0db9f5eeae1fbe001a05f4a958fb1e56a8f1 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 27 Jun 2018 12:57:04 +0300
Subject: MAINT-8696 FIXED Multiple confirmation floaters can be opened when
 removing an entity from access list

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 +++++++++-----
 1 file changed, 9 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 a1494515ed..3d994f73af 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4630,7 +4630,8 @@ Add to allowed list for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateAllowedAgentRemove"
-   type="alert">
+   type="alertmodal">
+    <unique/>
 Remove from allowed list for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
@@ -4659,7 +4660,8 @@ Add to group allowed list for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateAllowedGroupRemove"
-   type="alert">
+   type="alertmodal">
+    <unique/>
 Remove from group allowed list for this estate only or [ALL_ESTATES]?
     <tag>group</tag>
     <tag>confirm</tag>
@@ -4688,8 +4690,9 @@ Deny access for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateBannedAgentRemove"
-   type="alert">
-Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
+   type="alertmodal">
+    <unique/>
+Remove this Resident from the ban list for access for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
      canceltext="Cancel"
@@ -4716,7 +4719,8 @@ Add estate manager for this estate only or for [ALL_ESTATES]?
    icon="alert.tga"
    label="Select estate"
    name="EstateManagerRemove"
-   type="alert">
+   type="alertmodal">
+    <unique/>
 Remove estate manager for this estate only or for [ALL_ESTATES]?
     <tag>confirm</tag>
     <usetemplate
-- 
cgit v1.2.3


From 7ee5ee3dfdda7809c1ff3c40d6de2f01e5e207aa Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 3 Jul 2018 14:22:15 +0300
Subject: MAINT-8582 FIXED The message "Group is already in the list" is not
 displayed

---
 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 3d994f73af..30ae7c1d09 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3812,6 +3812,13 @@ Unable to add banned resident to estate manager list.
    type="alertmodal">
 Unable to add estate manager [AGENT] to banned list.
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="GroupIsAlreadyInList"
+   type="alertmodal">
+[GROUP] is already in the Allowed Groups list.
+  </notification>
     
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From d21d43743a746a82166c7206f5a7376c2f6cb122 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 11 Jul 2018 22:59:04 +0300
Subject: MAINT-8567 Enabled sorting for the estate access lists

---
 .../skins/default/xui/en/panel_region_access.xml   | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 7f6df426de..84967f466c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -68,9 +68,15 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     draw_heading="true"
      name="estate_manager_name_list"
      top_delta="0"
-     width="498" />
+     width="498">
+        <columns
+         label="Name"
+         name="name"
+         width="498" />
+    </name_list>
     <!-- Estate Managers buttons -->
     <button
      follows="left|top"
@@ -135,9 +141,15 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     draw_heading="true"
      name="allowed_avatar_name_list"
      top_delta="0"
-     width="498" />
+     width="498">
+        <columns
+         label="Name"
+         name="name"
+         width="498" />
+    </name_list>
     <!-- Always allowed buttons -->
     <button
      follows="left|top"
@@ -200,9 +212,15 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     draw_heading="true"
      name="allowed_group_name_list"
      top_delta="0"
-     width="498" />
+     width="498">
+        <columns
+         label="Name"
+         name="name"
+         width="498" />
+    </name_list>
     <!-- Groups always allowed buttons -->
     <button
      follows="left|top"
@@ -261,12 +279,12 @@
      top_pad="-5"
      width="498" />
       <name_list
-       draw_heading="true"
        follows="left|top"
        height="400"
        layout="topleft"
        left_delta="0"
        multi_select="true"
+       draw_heading="true"
        name="banned_avatar_name_list"
        top_delta="0"
        width="498">
-- 
cgit v1.2.3


From 599cd81b8c912d8db377f5be475ea6fd4abaab1d Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 11 Jul 2018 23:14:50 +0300
Subject: MAINT-8692 Estate tab layout improvements

---
 indra/newview/skins/default/xui/en/panel_region_estate.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/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 0e99fb1c14..9b9c870c49 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -82,7 +82,7 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="105"
+     height="185"
      layout="topleft"
      left="10"
      top_pad="5"
@@ -96,7 +96,7 @@
      width="200">
         <radio_item
          height="16"
-         label="Allow only residents and groups listed below"
+         label="Allow only residents and groups listed on the Access tab"
          layout="topleft"
          name="estate_restricted_access" />
         <radio_item
@@ -137,10 +137,10 @@
      height="18"
      label="Allow Voice Chat"
      layout="topleft"
-     left="290"
+     left="20"
      name="voice_chat_check"
-     top_delta="-78"
-     width="200" />
+     top_pad="2"
+     width="240" />
     <check_box
      height="18"
      label="Allow Direct Teleport"
@@ -148,7 +148,7 @@
      left_delta="0"
      name="allow_direct_teleport"
      top_pad="2"
-     width="80" />
+     width="240" />
     <button
      enabled="false"
      follows="left|top"
@@ -156,7 +156,7 @@
      label="Apply"
      layout="topleft"
      name="apply_btn"
-     top_pad="30"
+     top_pad="10"
      left_delta="0"
      width="97" />
 
-- 
cgit v1.2.3


From 28cdee4e0833c96f4b0c707092814f6ed0bbfd96 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 12 Jul 2018 20:35:01 +0300
Subject: MAINT-8566 Access lists search implementation

---
 .../skins/default/xui/en/panel_region_access.xml   | 80 ++++++++++++++++++++--
 1 file changed, 73 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 84967f466c..4a78cdacf0 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -113,6 +113,28 @@
     name="allowed_panel"
     right="-1"
     top="0">
+       <panel
+        follows="left|top|right"
+        height="27"
+        label="top_panel"
+        layout="topleft"
+        left="0"
+        name="allowed_search_panel"
+        right="-1"
+        top="0">
+           <filter_editor
+            follows="left|top|right"
+            height="23"
+            layout="topleft"
+            left="6"
+            label="Search allowed agents"
+            max_length_chars="300"
+            name="allowed_search_input"
+            text_color="Black"
+            text_pad_left="10"
+            top="4"
+            width="498" />
+        </panel>
    <text
      type="string"
      length="1"
@@ -130,14 +152,14 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="400"
+     height="370"
      layout="topleft"
      left="10"
      top_pad="-5"
      width="498" />
     <name_list
      follows="left|top"
-     height="400"
+     height="370"
      layout="topleft"
      left_delta="0"
      multi_select="true"
@@ -184,7 +206,29 @@
     help_topic="allowed_groups_tab"
     name="allowed_groups_panel"
     right="-1"
-    top="0">  
+    top="0">
+       <panel
+        follows="left|top|right"
+        height="27"
+        label="top_panel"
+        layout="topleft"
+        left="0"
+        name="allowed_group_search_panel"
+        right="-1"
+        top="0">
+           <filter_editor
+            follows="left|top|right"
+            height="23"
+            layout="topleft"
+            left="6"
+            label="Search allowed groups"
+            max_length_chars="300"
+            name="allowed_group_search_input"
+            text_color="Black"
+            text_pad_left="10"
+            top="4"
+            width="498" />
+        </panel>
     <text
      type="string"
      length="1"
@@ -201,14 +245,14 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="400"
+     height="370"
      layout="topleft"
      left="10"
      top_pad="-5"
      width="498" />
     <name_list
      follows="left|top"
-     height="400"
+     height="370"
      layout="topleft"
      left_delta="0"
      multi_select="true"
@@ -257,6 +301,28 @@
     name="banned_panel"
     right="-1"
     top="0">
+       <panel
+        follows="left|top|right"
+        height="27"
+        label="top_panel"
+        layout="topleft"
+        left="0"
+        name="banned_search_panel"
+        right="-1"
+        top="0">
+           <filter_editor
+            follows="left|top|right"
+            height="23"
+            layout="topleft"
+            left="6"
+            label="Search banned agents"
+            max_length_chars="300"
+            name="banned_search_input"
+            text_color="Black"
+            text_pad_left="10"
+            top="4"
+            width="498" />
+        </panel>
     <text
      type="string"
      length="1"
@@ -273,14 +339,14 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="400"
+     height="370"
      layout="topleft"
      left="10"
      top_pad="-5"
      width="498" />
       <name_list
        follows="left|top"
-       height="400"
+       height="370"
        layout="topleft"
        left_delta="0"
        multi_select="true"
-- 
cgit v1.2.3


From 5b9ab1b7bfe4f7e0612784d566afc936995abc53 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 13 Jul 2018 18:32:58 +0300
Subject: MAINT-8872 Don't display url-like group name as a link in
 notification

---
 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 30ae7c1d09..e96843b8fe 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3817,7 +3817,7 @@ Unable to add estate manager [AGENT] to banned list.
    icon="alertmodal.tga"
    name="GroupIsAlreadyInList"
    type="alertmodal">
-[GROUP] is already in the Allowed Groups list.
+&lt;nolink&gt;[GROUP]&lt;/nolink&gt; is already in the Allowed Groups list.
   </notification>
     
   <notification
-- 
cgit v1.2.3


From 1ea68249d88a603d294628cf966f0e9317425aa1 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 25 Jul 2018 00:02:44 +0300
Subject: MAINT-8583 Fix for the truncated message when removing a large number
 of banned users

---
 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 fd2749bb81..d4327b0c7c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2661,6 +2661,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="RegionInfoAllEstates">all estates</string>
 	<string name="RegionInfoManagedEstates">managed estates</string>
 	<string name="RegionInfoThisEstate">this estate</string>
+	<string name="AndNMore">and [EXTRA_COUNT] more</string>
 
 	<!-- script limits floater -->
 	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
-- 
cgit v1.2.3


From 747eccd63faa8595803b253a2dcf4d1732d924ce Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 6 Sep 2018 03:24:06 +0300
Subject: MAINT-8777 added ability to copy access lists to clipboard

---
 .../skins/default/xui/en/panel_region_access.xml   | 30 +++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 4a78cdacf0..4be073195b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -133,7 +133,15 @@
             text_color="Black"
             text_pad_left="10"
             top="4"
-            width="498" />
+            width="440" />
+           <button
+            follows="left|top"
+            height="23"
+            label="Copy"
+            layout="topleft"
+            left_pad="10"
+            name="copy_allowed_list_btn"
+            width="40" />
         </panel>
    <text
      type="string"
@@ -227,7 +235,15 @@
             text_color="Black"
             text_pad_left="10"
             top="4"
-            width="498" />
+            width="440" />
+           <button
+            follows="left|top"
+            height="23"
+            label="Copy"
+            layout="topleft"
+            left_pad="10"
+            name="copy_allowed_group_list_btn"
+            width="40" />
         </panel>
     <text
      type="string"
@@ -321,7 +337,15 @@
             text_color="Black"
             text_pad_left="10"
             top="4"
-            width="498" />
+            width="440" />
+               <button
+                follows="left|top"
+                height="23"
+                label="Copy"
+                layout="topleft"
+                left_pad="10"
+                name="copy_banned_list_btn"
+                width="40" />
         </panel>
     <text
      type="string"
-- 
cgit v1.2.3


From a8eb461e8a95f7e7def15e14dc3f60bb48dde958 Mon Sep 17 00:00:00 2001
From: eli <eli@lindenlab.com>
Date: Thu, 6 Sep 2018 18:17:31 -0700
Subject: FIX INTL-302 translation of Viewer Set52 (DRTVWR-461:
 viewer-estate-access)

---
 .../skins/default/xui/de/floater_auction.xml       |   4 +-
 .../newview/skins/default/xui/de/floater_tools.xml |  81 +------------
 indra/newview/skins/default/xui/de/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/de/notifications.xml |  47 ++++++--
 indra/newview/skins/default/xui/de/panel_login.xml |  14 ++-
 .../skins/default/xui/de/panel_login_first.xml     |   6 +
 .../skins/default/xui/de/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/de/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/de/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/de/strings.xml     |  12 ++
 .../skins/default/xui/es/floater_auction.xml       |   6 +-
 .../newview/skins/default/xui/es/floater_tools.xml |  81 +------------
 indra/newview/skins/default/xui/es/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/es/notifications.xml |  47 ++++++--
 indra/newview/skins/default/xui/es/panel_login.xml |  14 ++-
 .../skins/default/xui/es/panel_login_first.xml     |   6 +
 .../skins/default/xui/es/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/es/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/es/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/es/strings.xml     |  12 ++
 .../skins/default/xui/fr/floater_auction.xml       |   8 +-
 .../newview/skins/default/xui/fr/floater_tools.xml |  81 +------------
 indra/newview/skins/default/xui/fr/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/fr/notifications.xml |  45 +++++++-
 indra/newview/skins/default/xui/fr/panel_login.xml |  16 ++-
 .../skins/default/xui/fr/panel_login_first.xml     |   8 +-
 .../skins/default/xui/fr/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/fr/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/fr/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/fr/strings.xml     |  12 ++
 .../skins/default/xui/it/floater_auction.xml       |   6 +-
 .../newview/skins/default/xui/it/floater_tools.xml |  81 +------------
 indra/newview/skins/default/xui/it/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/it/notifications.xml |  47 ++++++--
 indra/newview/skins/default/xui/it/panel_login.xml |  14 ++-
 .../skins/default/xui/it/panel_login_first.xml     |   6 +
 .../skins/default/xui/it/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/it/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/it/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/it/strings.xml     |  12 ++
 .../skins/default/xui/ja/floater_auction.xml       |   4 +-
 .../newview/skins/default/xui/ja/floater_tools.xml |  81 +------------
 indra/newview/skins/default/xui/ja/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/ja/notifications.xml |  44 +++++++-
 indra/newview/skins/default/xui/ja/panel_login.xml |  14 ++-
 .../skins/default/xui/ja/panel_login_first.xml     |   6 +
 .../skins/default/xui/ja/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/ja/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/ja/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/ja/strings.xml     |  12 ++
 .../skins/default/xui/pt/floater_auction.xml       |  10 +-
 .../newview/skins/default/xui/pt/floater_tools.xml |  81 +------------
 indra/newview/skins/default/xui/pt/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/pt/notifications.xml |  47 ++++++--
 indra/newview/skins/default/xui/pt/panel_login.xml |  14 ++-
 .../skins/default/xui/pt/panel_login_first.xml     |   6 +
 .../skins/default/xui/pt/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/pt/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/pt/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/pt/strings.xml     |  12 ++
 .../skins/default/xui/ru/floater_auction.xml       |   4 +-
 .../newview/skins/default/xui/ru/floater_tools.xml |   1 +
 indra/newview/skins/default/xui/ru/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/ru/notifications.xml |  47 ++++++--
 indra/newview/skins/default/xui/ru/panel_login.xml |  14 ++-
 .../skins/default/xui/ru/panel_login_first.xml     |   6 +
 .../skins/default/xui/ru/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/ru/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/ru/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/ru/strings.xml     |  12 ++
 .../skins/default/xui/tr/floater_auction.xml       |   4 +-
 .../newview/skins/default/xui/tr/floater_tools.xml |   1 +
 indra/newview/skins/default/xui/tr/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/tr/notifications.xml |  47 ++++++--
 indra/newview/skins/default/xui/tr/panel_login.xml |  14 ++-
 .../skins/default/xui/tr/panel_login_first.xml     |   6 +
 .../skins/default/xui/tr/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/tr/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/tr/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/tr/strings.xml     |  12 ++
 .../skins/default/xui/zh/floater_auction.xml       |   2 +-
 .../newview/skins/default/xui/zh/floater_tools.xml |   1 +
 indra/newview/skins/default/xui/zh/menu_viewer.xml |   2 +-
 .../newview/skins/default/xui/zh/notifications.xml |  37 +++++-
 indra/newview/skins/default/xui/zh/panel_login.xml |  14 ++-
 .../skins/default/xui/zh/panel_login_first.xml     |   6 +
 .../skins/default/xui/zh/panel_region_access.xml   |  57 ++++++++++
 .../skins/default/xui/zh/panel_region_estate.xml   |   2 +-
 .../skins/default/xui/zh/sidepanel_task_info.xml   | 125 ++++++++++++++++-----
 indra/newview/skins/default/xui/zh/strings.xml     |  12 ++
 90 files changed, 2042 insertions(+), 869 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_region_access.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_region_access.xml

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

diff --git a/indra/newview/skins/default/xui/de/floater_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml
index 8ededff319..4a0b136235 100644
--- a/indra/newview/skins/default/xui/de/floater_auction.xml
+++ b/indra/newview/skins/default/xui/de/floater_auction.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="LINDEN LAND VERKAUF STARTEN">
+<floater name="floater_auction" title="LINDEN-LANDVERKAUF STARTEN">
 	<floater.string name="already for sale">
 		Parzellen, die bereits zum Verkauf stehen, können nicht auktioniert werden.
 	</floater.string>
 	<check_box initial_value="true" label="Gelben Auswahlrahmen einschließen" name="fence_check"/>
-	<button label="Foto" label_selected="Foto" name="snapshot_btn"/>
+	<button label="Screenshot" label_selected="Screenshot" name="snapshot_btn"/>
 	<button label="An jeden verkaufen" label_selected="An jeden verkaufen" name="sell_to_anyone_btn"/>
 	<button label="Einstellungen löschen" label_selected="Einstellungen löschen" name="reset_parcel_btn"/>
 	<button label="Auktion beginnen" label_selected="Auktion beginnen" name="start_auction_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 7dd5938601..96d49fdaa5 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -73,9 +73,6 @@
 	<button label="Link" name="link_btn" width="30"/>
 	<button label="Verknüpfung auflösen" name="unlink_btn" width="126"/>
 	<check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
-	<text label="Beide Seiten dehnen" name="checkbox uniform label">
-		Beide Seiten dehnen
-	</text>
 	<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures" top_pad="-5"/>
 	<check_box initial_value="true" label="Einrasten" name="checkbox snap to grid" top_pad="15"/>
 	<combo_box name="combobox grid mode" tool_tip="Wählen Sie das gewünschte Rasterlineal zum Positionieren des Objekts aus.">
@@ -201,6 +198,7 @@
 				<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 				<combo_box.item label="Öffnen" name="Open"/>
 				<combo_box.item label="Zoom" name="Zoom"/>
+				<combo_box.item label="Keine" name="None"/>
 			</combo_box>
 			<check_box label="Zum Verkauf:" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
@@ -411,82 +409,7 @@
 			<spinner label="Dichte in 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
-		<panel label="Textur" name="Texture">
-			<panel.string name="string repeats per meter">
-				Kacheln pro Meter
-			</panel.string>
-			<panel.string name="string repeats per face">
-				Wiederholungen pro Fläche
-			</panel.string>
-			<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
-			<color_swatch label="Farbe" 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"/>
-			<text name="tex gen">
-				Zuordnung
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_box.item label="Standard" name="Default"/>
-				<combo_box.item label="Eben" name="Planar"/>
-			</combo_box>
-			<text name="label shininess">
-				Glanz
-			</text>
-			<combo_box name="combobox shininess">
-				<combo_box.item label="Kein" 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 bumpiness">
-				Holprigkeit
-			</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="Ziegel" name="bricks"/>
-				<combo_box.item label="Karo" name="checker"/>
-				<combo_box.item label="Beton" name="concrete"/>
-				<combo_box.item label="verkrustete Fliesen" name="crustytile"/>
-				<combo_box.item label="Steinplatten" 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="Steinfliesen" name="stonetile"/>
-				<combo_box.item label="Stuck" name="stucco"/>
-				<combo_box.item label="Saugen" name="suction"/>
-				<combo_box.item label="gewoben" name="weave"/>
-			</combo_box>
-			<spinner label="Horizontal (U)" name="TexScaleU"/>
-			<check_box label="Umkehren" name="checkbox flip s"/>
-			<spinner label="Vertikal (V)" name="TexScaleV"/>
-			<check_box label="Umkehren" name="checkbox flip t"/>
-			<spinner label="Rotation˚" name="TexRot"/>
-			<button label="Übernehmen" label_selected="Übernehmen" name="button apply"/>
-			<text name="tex offset">
-				Texture-Versatz
-			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU"/>
-			<spinner label="Vertikal (V)" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					Medien
-				</text>
-				<button name="add_media" tool_tip="Medien hinzufügen"/>
-				<button name="delete_media" tool_tip="Diese Medien-Textur löschen"/>
-				<button name="edit_media" tool_tip="Diese Medien bearbeiten"/>
-				<button label="Ausrichten" label_selected="Medien angleichen" name="button align" tool_tip="Medientexturen angleichen (müssen zunächst geladen werden)"/>
-			</panel>
-		</panel>
+		<panel label="Textur" name="Texture"/>
 		<panel label="Inhalt" name="Contents">
 			<button label="Neues Skript" label_selected="Neues Skript" name="button new script"/>
 			<button label="Berechtigungen" name="button permissions"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 58c691351c..9c260092f9 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Kamerasteuerungen..." name="Camera Controls"/>
 		<menu label="Bewegung" name="Movement">
 			<menu_item_call label="Hinsetzen" name="Sit Down Here"/>
+			<menu_item_call label="Aufstehen" name="Stand up"/>
 			<menu_item_check label="Fliegen" name="Fly"/>
 			<menu_item_check label="Immer rennen" name="Always Run"/>
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
@@ -278,7 +279,6 @@
 			<menu_item_check label="Matrizen anzeigen" name="Show Matrices"/>
 			<menu_item_check label="Farbe unter Cursor anzeigen" name="Show Color Under Cursor"/>
 			<menu_item_check label="Speicher anzeigen" name="Show Memory"/>
-			<menu_item_check label="Info über privaten Speicher anzeigen" name="Show Private Mem Info"/>
 			<menu_item_check label="Akutalisierungen an Objekten anzeigen" name="Show Updates"/>
 		</menu>
 		<menu label="Fehler erzwingen" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 8cebd1f441..4c22e7d830 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1584,6 +1584,30 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
 	<notification name="ProblemAddingEstateManagerBanned">
 		Verbannter Einwohner kann nicht zur Grundbesitzverwalterliste hinzugefügt werden.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Grundbesitzverwalter [AGENT] kann nicht zur Bannliste hinzugefügt werden.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; befindet sich bereits auf der Liste der zulässigen Gruppen.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] befindet sich bereits auf Ihrer [LIST_TYPE]-Liste.
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] befinden sich bereits auf Ihrer [LIST_TYPE]-Liste.
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] wurde der [LIST_TYPE]-Liste von [ESTATE] hinzugefügt.
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] wurden zur [LIST_TYPE]-Liste von [ESTATE] hinzugefügt.
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] wurden von der [LIST_TYPE]-Liste von [ESTATE] entfernt.
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] wurden von der [LIST_TYPE]-Liste von [ESTATE] entfernt.
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Das Aussehen lässt sich erst ändern, wenn Kleider und Form/Gestalt geladen sind.
 	</notification>
@@ -1889,7 +1913,7 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
 		<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
 	</notification>
 	<notification label="Grundbesitz wählen" name="EstateBannedAgentRemove">
-		Einwohner nur für diesen Grundbesitz oder für alle [ALL_ESTATES] von der Bannliste entfernen?
+		Den Einwohner nur für diesen Grundbesitz oder für [ALL_ESTATES] von der Bannliste entfernen?
 		<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
 	</notification>
 	<notification label="Grundbesitz wählen" name="EstateManagerAdd">
@@ -3181,16 +3205,22 @@ Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Chat beizutreten, oder auf  &a
 		Verbindung zu [VOICE_CHANNEL_NAME] nicht möglich. Bitte versuchen Sie es später.  Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Ein oder mehrere Ihrer Voice-Morph-Abos ist/sind abgelaufen.
-[[URL] Hier klicken], um Ihr Abo zu erneuern.
+		Ein oder mehrere Ihrer Voice-Morph-Abos sind abgelaufen. 
+[[URL] Klicken Sie hier], um Ihr Abo zu erneuern. 
+
+Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		Das aktive Voice-Morph-Abo ist abgelaufen. Ihre normalen Voice-Einstellungen werden angewendet.
-[[URL] Hier klicken], um Ihr Abo zu erneuern.
+		Das aktive Voice-Morph-Abo ist abgelaufen. Ihre normalen Voice-Einstellungen werden angewendet. 
+[[URL] Klicken Sie hier], um Ihr Abo zu erneuern. 
+
+Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Ein oder mehrere Ihrer Voice-Morph-Abos werden in weniger als [INTERVAL] Tagen ablaufen.
-[[URL] Hier klicken], um Ihr Abo zu erneuern.
+		Ein oder mehrere Ihrer Voice-Morph-Abos laufen in weniger als [INTERVAL] Tagen ab. 
+[[URL] Klicken Sie hier], um Ihr Abo zu erneuern. 
+
+Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Neue Voice-Morph-Effekte sind erhältlich!
@@ -3242,6 +3272,9 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
 	<notification name="SnapshotToComputerFailed">
 		Fehler beim Speichern des Bildes unter [PATH]: Zu wenig Speicherplatz auf dem Medium. [NEED_MEMORY]KB werden benötigt, es stehen jedoch nur [FREE_MEMORY]KB zur Verfügung.
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Fehler beim Speichern des Bildes unter [PATH]: Verzeichnis nicht vorhanden.
+	</notification>
 	<notification name="PresetNotSaved">
 		Fehler beim Speichern der Voreinstellung [NAME].
 	</notification>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 32c9598edf..287f55a127 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=de</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=de
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Benutzername" name="username_combo" tool_tip="Bei der Registrierung gewählter Benutzername wie „berndschmidt12“ oder „Liebe Sonne“"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Anmelden" name="connect_btn"/>
 			<check_box label="Details speichern" name="remember_check"/>
-			<text name="forgot_password_text">Kennwort vergessen</text>
+			<text name="forgot_password_text">
+				Kennwort vergessen
+			</text>
 			<combo_box label="Grid auswählen" name="server_combo"/>
+			<text name="sign_up_text">
+				Registrieren
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_login_first.xml b/indra/newview/skins/default/xui/de/panel_login_first.xml
index 44637d5159..038001157e 100644
--- a/indra/newview/skins/default/xui/de/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/de/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=de
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						Kennwort vergessen
 					</text>
+					<text name="sign_up_text">
+						Registrieren
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_access.xml b/indra/newview/skins/default/xui/de/panel_region_access.xml
new file mode 100644
index 0000000000..4ebc4867fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Zugang" name="Access">
+	<tab_container name="tabs">
+		<panel label="GRUNDBESITZVERWALTER" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Grundbesitzverwalter:
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Name" name="name"/>
+			</name_list>
+			<button label="Hinzufügen..." name="add_estate_manager_btn"/>
+			<button label="Entfernen..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="ZULÄSSIG" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="Zulässige Agenten suchen" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Immer zugelassen:
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Name" name="name"/>
+			</name_list>
+			<button label="Hinzufügen..." name="add_allowed_avatar_btn"/>
+			<button label="Entfernen..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="ZULÄSSIGE GRUPPEN" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="Zulässige Gruppen Suchen" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Immer zugelassene Gruppen:
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Name" name="name"/>
+			</name_list>
+			<button label="Hinzufügen..." name="add_allowed_group_btn"/>
+			<button label="Entfernen..." name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="VERBANNT" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Verbannte Agenten suchen" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Immer verbannt:
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Name" name="name"/>
+				<columns label="Letztes Login-Datum" name="last_login_date"/>
+				<columns label="Datum der Verbannung" name="ban_date"/>
+				<columns label="Verbannt von" name="bannedby"/>
+			</name_list>
+			<button label="Hinzufügen..." name="add_banned_avatar_btn"/>
+			<button label="Entfernen..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index 2a7b654954..b713dd58d0 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(unbekannt)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Nur nachstehend aufgelistete Einwohner und Gruppen zulassen" name="estate_restricted_access"/>
+		<radio_item label="Nur Einwohner und Gruppen zulassen, die im Reiter &quot;Zugang&quot; aufgelistet sind." name="estate_restricted_access"/>
 		<radio_item label="Alle Besucher zugelassen" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Muss 18+ sein" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diesen Grundbesitz betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
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 c30611c66c..c8cd499956 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Objektprofil">
-	<panel.string name="text deed continued">Übertragung</panel.string>
-	<panel.string name="text deed">Übertragung</panel.string>
-	<panel.string name="text modify info 1">Sie können dieses Objekt bearbeiten.</panel.string>
-	<panel.string name="text modify info 2">Sie können diese Objekte bearbeiten.</panel.string>
-	<panel.string name="text modify info 3">Sie können dieses Objekt nicht bearbeiten.</panel.string>
-	<panel.string name="text modify info 4">Sie können diese Objekte nicht bearbeiten.</panel.string>
-	<panel.string name="text modify info 5">Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden</panel.string>
-	<panel.string name="text modify info 6">Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden</panel.string>
-	<panel.string name="text modify warning">Diese Objekt verfügt über verknüpfte Teile</panel.string>
-	<panel.string name="Cost Default">Preis: L$</panel.string>
-	<panel.string name="Cost Total">Summenpreis: L$</panel.string>
-	<panel.string name="Cost Per Unit">Stückpreis: L$</panel.string>
-	<panel.string name="Cost Mixed">Mischpreis</panel.string>
-	<panel.string name="Sale Mixed">Mischverkauf</panel.string>
+	<panel.string name="text deed continued">
+		Übertragung
+	</panel.string>
+	<panel.string name="text deed">
+		Übertragung
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Sie können dieses Objekt bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Sie können diese Objekte bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Sie können dieses Objekt nicht bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Sie können diese Objekte nicht bearbeiten.
+	</panel.string>
+	<panel.string name="text modify info 5">
+		Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden
+	</panel.string>
+	<panel.string name="text modify warning">
+		Diese Objekt verfügt über verknüpfte Teile
+	</panel.string>
+	<panel.string name="Cost Default">
+		Preis: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Summenpreis: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Stückpreis: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Mischpreis
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Mischverkauf
+	</panel.string>
 	<text name="title" value="Objektprofil"/>
 	<text name="where" value="(Inworld)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Name:</text>
-		<text name="Description:">Beschreibung:</text>
-		<text name="CreatorNameLabel">Ersteller:</text>
-		<text name="Owner:">Eigentümer:</text>
-		<text name="Group_label">Gruppe:</text>
+		<text name="Name:">
+			Name:
+		</text>
+		<text name="Description:">
+			Beschreibung:
+		</text>
+		<text name="CreatorNameLabel">
+			Ersteller:
+		</text>
+		<text name="Owner:">
+			Eigentümer:
+		</text>
+		<text name="Group_label">
+			Gruppe:
+		</text>
 		<button name="button set group" tool_tip="Eine Gruppe auswählen, um die Berechtigungen des Objekts zu teilen."/>
 		<name_box initial_value="Wird geladen..." name="Group Name Proxy"/>
 		<button label="Übertragung" label_selected="Übertragung" name="button deed" tool_tip="Eine Übertragung bedeutet, dass das Objekt mit den Berechtigungen „Nächster Eigentümer“ weitergegeben wird. Mit der Gruppe geteilte Objekte können von einem Gruppen-Officer übertragen werden."/>
-		<text name="label click action">Bei Linksklick:</text>
+		<text name="label click action">
+			Bei Linksklick:
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Berühren (Standard)" name="Touch/grab(default)"/>
 			<combo_box.item label="Auf Objekt setzen" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
 			<combo_box.item label="Zoomen" name="Zoom"/>
+			<combo_box.item label="Keine" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Sie können dieses Objekt bearbeiten.</text>
-			<text name="Anyone can:">Jeder:</text>
+			<text name="perm_modify">
+				Sie können dieses Objekt bearbeiten.
+			</text>
+			<text name="Anyone can:">
+				Jeder:
+			</text>
 			<check_box label="Kopieren" name="checkbox allow everyone copy"/>
 			<check_box label="Bewegen" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Gruppe:</text>
+			<text name="GroupLabel">
+				Gruppe:
+			</text>
 			<check_box label="Teilen" name="checkbox share with group" tool_tip="Mit allen Mitgliedern der zugeordneten Gruppe, Ihre Berechtigungen dieses Objekt zu ändern, teilen. Sie müssen Übereignen, um Rollenbeschränkungen zu aktivieren."/>
-			<text name="NextOwnerLabel">Nächster Eigentümer:</text>
+			<text name="NextOwnerLabel">
+				Nächster Eigentümer:
+			</text>
 			<check_box label="Bearbeiten" name="checkbox next owner can modify"/>
 			<check_box label="Kopieren" name="checkbox next owner can copy"/>
 			<check_box label="Transferieren" name="checkbox next owner can transfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Preis: L$" name="Edit Cost"/>
 		<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
-		<text name="pathfinding_attributes_label">Pathfinding-Attribute:</text>
-		<text name="B:">B:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			Pathfinding-Attribute:
+		</text>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Öffnen" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 3e66007627..f926f8a841 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -2228,6 +2228,18 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich unter http://suppo
 	<string name="RegionInfoListTypeBannedAgents">
 		Immer verbannt
 	</string>
+	<string name="RegionInfoAllEstates">
+		alle Grundbesitze
+	</string>
+	<string name="RegionInfoManagedEstates">
+		verwaltete Grundbesitze
+	</string>
+	<string name="RegionInfoThisEstate">
+		dieser Grundbesitz
+	</string>
+	<string name="AndNMore">
+		und [EXTRA_COUNT] weitere
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Parzellenskript-Speicher
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
index 6faf19dbb5..cbafe92cdf 100644
--- a/indra/newview/skins/default/xui/es/floater_auction.xml
+++ b/indra/newview/skins/default/xui/es/floater_auction.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_auction" title="COMENZAR LA VENTA DE TERRENO LINDEN">
 	<floater.string name="already for sale">
-		No puede subastar parcelas que ya están en venta.
+		No puedes ofertar en parcelas que ya están en venta.
 	</floater.string>
-	<check_box initial_value="true" label="Incluir la valla amarilla de selección" name="fence_check"/>
+	<check_box initial_value="true" label="Incluir la cerca de selección amarilla" name="fence_check"/>
 	<button label="Foto" label_selected="Foto" name="snapshot_btn"/>
 	<button label="Vender a cualquiera" label_selected="Vender a cualquiera" name="sell_to_anyone_btn"/>
-	<button label="Limpiar las configuraciones" label_selected="Limpiar las configuraciones" name="reset_parcel_btn"/>
+	<button label="Borrar las configuraciones" label_selected="Borrar las configuraciones" name="reset_parcel_btn"/>
 	<button label="Comenzar subasta" label_selected="Comenzar subasta" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 159619decc..0933eef0fd 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -58,9 +58,6 @@
 	<button label="Enlazar" name="link_btn"/>
 	<button label="Desenlazar" name="unlink_btn" width="95"/>
 	<check_box label="Estirar ambos lados" name="checkbox uniform"/>
-	<text label="Estirar ambos lados" name="checkbox uniform label">
-		Estirar ambos lados
-	</text>
 	<check_box initial_value="true" label="Estirar las texturas" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Intervalo" name="checkbox snap to grid"/>
 	<button label="Opciones..." label_selected="Opciones..." name="Options..." tool_tip="Ver más opciones de la cuadrícula"/>
@@ -181,6 +178,7 @@
 				<combo_box.item label="Pagar al objeto" name="Payobject"/>
 				<combo_box.item label="Abrirlo" name="Open"/>
 				<combo_box.item label="Zoom" name="Zoom"/>
+				<combo_box.item label="Ninguno" name="None"/>
 			</combo_box>
 			<check_box label="En venta:" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
@@ -388,82 +386,7 @@
 			<spinner label="Densidad en 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Reemplazo" name="Physics Restitution"/>
 		</panel>
-		<panel label="Textura" name="Texture">
-			<panel.string name="string repeats per meter">
-				Repeticiones por m.
-			</panel.string>
-			<panel.string name="string repeats per face">
-				Repeticiones por cara
-			</panel.string>
-			<texture_picker label="Textura" name="texture control" tool_tip="Pulse para elegir una imagen"/>
-			<color_swatch label="Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
-			<text name="color trans">
-				Transparencia %
-			</text>
-			<text name="glow label">
-				Resplandor
-			</text>
-			<check_box bottom_delta="-21" label="Brillo al  máximo" name="checkbox fullbright"/>
-			<text name="tex gen">
-				Detallado
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_box.item label="Por defecto" name="Default"/>
-				<combo_box.item label="Plano" name="Planar"/>
-			</combo_box>
-			<text name="label shininess">
-				Brillantez
-			</text>
-			<combo_box name="combobox shininess">
-				<combo_box.item label="Ninguna" name="None"/>
-				<combo_box.item label="Baja" name="Low"/>
-				<combo_box.item label="Media" name="Medium"/>
-				<combo_box.item label="Alta" name="High"/>
-			</combo_box>
-			<text name="label bumpiness">
-				Relieve
-			</text>
-			<combo_box name="combobox bumpiness">
-				<combo_box.item label="Ninguno" name="None"/>
-				<combo_box.item label="Brillo" name="Brightness"/>
-				<combo_box.item label="Oscuro" name="Darkness"/>
-				<combo_box.item label="grano de madera" name="woodgrain"/>
-				<combo_box.item label="corteza" name="bark"/>
-				<combo_box.item label="ladrillos" name="bricks"/>
-				<combo_box.item label="cajero" name="checker"/>
-				<combo_box.item label="cemento" name="concrete"/>
-				<combo_box.item label="azulejería" name="crustytile"/>
-				<combo_box.item label="piedra cortada" name="cutstone"/>
-				<combo_box.item label="discos" name="discs"/>
-				<combo_box.item label="grava" name="gravel"/>
-				<combo_box.item label="placa de Petri" name="petridish"/>
-				<combo_box.item label="revestimiento" name="siding"/>
-				<combo_box.item label="baldosa de piedra" 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>
-			<spinner label="Horizontal (U)" name="TexScaleU"/>
-			<check_box label="Voltear" name="checkbox flip s"/>
-			<spinner label="Vertical (V)" name="TexScaleV"/>
-			<check_box label="Voltear" name="checkbox flip t"/>
-			<spinner label="Rotación" name="TexRot"/>
-			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
-			<text name="tex offset">
-				Desplazar
-			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU"/>
-			<spinner label="Vertical (V)" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					Media
-				</text>
-				<button name="add_media" tool_tip="Añadir un media"/>
-				<button name="delete_media" tool_tip="Borrar esta textura para media"/>
-				<button name="edit_media" tool_tip="Editar este media"/>
-				<button label="Centrar" label_selected="Centrar los media" name="button align" tool_tip="Centrar esta textura para media (primero debe cargarse)"/>
-			</panel>
-		</panel>
+		<panel label="Textura" name="Texture"/>
 		<panel label="Contenido " name="Contents">
 			<button label="Script nuevo" label_selected="Script nuevo" name="button new script"/>
 			<button label="Permisos" name="button permissions"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index dec4a5082d..e1a669130d 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Controles de la cámara..." name="Camera Controls"/>
 		<menu label="Movimiento" name="Movement">
 			<menu_item_call label="Sentarte" name="Sit Down Here"/>
+			<menu_item_call label="Levantarme" name="Stand up"/>
 			<menu_item_check label="Volar" name="Fly"/>
 			<menu_item_check label="Correr siempre" name="Always Run"/>
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
@@ -273,7 +274,6 @@
 			<menu_item_check label="Mostrar información de textura" name="Show Texture Info"/>
 			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="Mostrar la memoria" name="Show Memory"/>
-			<menu_item_check label="Mostrar información de memoria privada" name="Show Private Mem Info"/>
 			<menu_item_check label="Show Updates to Objects" name="Show Updates"/>
 		</menu>
 		<menu label="Force an Error" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 028354f3cf..74c12b619d 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1574,6 +1574,30 @@ Se superan en [NUM_EXCESS] los [MAX_AGENTS] permitidos en [LIST_TYPE].
 	<notification name="ProblemAddingEstateManagerBanned">
 		No se puede añadir un residente expulsado a la lista de administradores de estado.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		No fue posible agregar al administrador de estado [AGENT] a la lista de prohibidos.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; ya está en la lista de Grupos autorizados.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] ya está en tu lista [LIST_TYPE].
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] ya está en tu lista [LIST_TYPE].
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] fue añadido a la lista [LIST_TYPE] de [ESTATE].
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] fueron añadidos a la lista [LIST_TYPE] de [ESTATE].
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] fue eliminado de la lista [LIST_TYPE] de [ESTATE].
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] fueron eliminados de la lista [LIST_TYPE] de [ESTATE].
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		No puedes cambiar la apariencia hasta que no se carguen la ropa y la forma.
 	</notification>
@@ -1880,7 +1904,7 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
 	</notification>
 	<notification label="Seleccionar el estado" name="EstateBannedAgentRemove">
-		¿Quitar de la lista de prohibición de acceso a este residente para que acceda sólo a este estado o a [ALL_ESTATES]?
+		¿Quitar a este Residente de la lista de acceso prohibido para este estado únicamente o para [ALL_ESTATES]?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
 	</notification>
 	<notification label="Seleccionar el estado" name="EstateManagerAdd">
@@ -3164,16 +3188,22 @@ Pulsa Aceptar o Rehusar para coger o no la llamada. Pulsa Ignorar para ignorar a
 		Fallo al conectar a [VOICE_CHANNEL_NAME]; por favor, inténtalo más tarde.  Vas a ser reconectado al chat de voz.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Una o más de las transformaciones de voz a las que estás suscrito han caducado.
-[Pulsa aquí [URL]] para renovar la suscripción.
+		Una o más de las transformaciones de voz a las que estás suscrito han caducado. 
+[[URL] Pulsa aquí] para renovar la suscripción. 
+
+Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		La transformación de voz activa ha caducado y se ha aplicado tu configuración de voz normal.
-[Pulsa aquí [URL]] para renovar la suscripción.
+		La transformación de voz activa ha caducado y se ha aplicado tu configuración de voz normal. 
+[[URL] Pulsa aquí] para renovar la suscripción. 
+
+Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Una o más de tus transformaciones de voz caducarán en menos de [INTERVAL] días.
-[Pulsa aquí [URL]] para renovar la suscripción.
+		Una o más de tus transformaciones de voz caducarán en menos de [INTERVAL] días. 
+[[URL] Pulsa aquí] para renovar la suscripción 
+
+Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Están disponibles nuevas transformaciones de voz.
@@ -3225,6 +3255,9 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
 	<notification name="SnapshotToComputerFailed">
 		Error al guardar la foto en [PATH]: Disco lleno. Se requieren [NEED_MEMORY]KB pero solo hay [FREE_MEMORY]KB libres.
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Error al guardar la foto en [PATH]: El directorio no existe.
+	</notification>
 	<notification name="PresetNotSaved">
 		Error al guardar el valor predefinido [NAME].
 	</notification>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 5300fce153..f79d3b9422 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=es</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=es
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Nombre de usuario" name="username_combo" tool_tip="El nombre de usuario que elegiste al registrarte, como bobsmith12 o Steller Sunshine"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Iniciar sesión" name="connect_btn"/>
 			<check_box label="Recordarme" name="remember_check"/>
-			<text name="forgot_password_text">Contraseña olvidada</text>
+			<text name="forgot_password_text">
+				Contraseña olvidada
+			</text>
 			<combo_box label="Seleccionar cuadrícula" name="server_combo"/>
+			<text name="sign_up_text">
+				Regístrate
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_login_first.xml b/indra/newview/skins/default/xui/es/panel_login_first.xml
index 7787c6526f..ccb6858351 100644
--- a/indra/newview/skins/default/xui/es/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/es/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=es
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						Contraseña olvidada
 					</text>
+					<text name="sign_up_text">
+						Regístrate
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_access.xml b/indra/newview/skins/default/xui/es/panel_region_access.xml
new file mode 100644
index 0000000000..3177aa2ab2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Acceso" name="Access">
+	<tab_container name="tabs">
+		<panel label="ADMINISTRADORES DE ESTADO" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Administradores de estado:
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Nombre" name="name"/>
+			</name_list>
+			<button label="Añadir..." name="add_estate_manager_btn"/>
+			<button label="Quitar..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="PERMITIDO" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="Buscar agentes autorizados" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Siempre autorizado:
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Nombre" name="name"/>
+			</name_list>
+			<button label="Añadir..." name="add_allowed_avatar_btn"/>
+			<button label="Quitar..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="GRUPOS AUTORIZADOS:" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="Buscar grupos autorizados" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Grupos siempre autorizados:
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Nombre" name="name"/>
+			</name_list>
+			<button label="Añadir..." name="add_allowed_group_btn"/>
+			<button label="Quitar..." name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="PROHIBIDO" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Buscar agentes prohibidos" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Siempre prohibido:
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Nombre" name="name"/>
+				<columns label="Última fecha de inicio de sesión" name="last_login_date"/>
+				<columns label="Fecha de prohibición" name="ban_date"/>
+				<columns label="Prohibido por" name="bannedby"/>
+			</name_list>
+			<button label="Añadir..." name="add_banned_avatar_btn"/>
+			<button label="Quitar..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 7e12b0e599..b3ee34bbfd 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(desconocido)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Permitir únicamente a los residentes y grupos indicados a continuación" name="estate_restricted_access"/>
+		<radio_item label="Permitir únicamente a los residentes y grupos indicados en la pestaña Acceso" name="estate_restricted_access"/>
 		<radio_item label="Cualquiera puede visitar" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Debe ser mayor de 18" name="limit_age_verified" tool_tip="Para poder acceder a este estado, los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
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 b9c8139f16..2032edfb3a 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Perfil del objeto">
-	<panel.string name="text deed continued">Transferir</panel.string>
-	<panel.string name="text deed">Transferir</panel.string>
-	<panel.string name="text modify info 1">Puedes modificar este objeto</panel.string>
-	<panel.string name="text modify info 2">Puedes modificar estos objetos</panel.string>
-	<panel.string name="text modify info 3">No puedes modificar este objeto</panel.string>
-	<panel.string name="text modify info 4">No puedes modificar estos objetos</panel.string>
-	<panel.string name="text modify info 5">No se puede modificar este objeto a través del límite de una región</panel.string>
-	<panel.string name="text modify info 6">No se pueden modificar estos objetos a través del límite de una región</panel.string>
-	<panel.string name="text modify warning">Este objeto tiene partes enlazadas</panel.string>
-	<panel.string name="Cost Default">Precio: L$</panel.string>
-	<panel.string name="Cost Total">Precio total: L$</panel.string>
-	<panel.string name="Cost Per Unit">Price Per: L$</panel.string>
-	<panel.string name="Cost Mixed">Mixed Price</panel.string>
-	<panel.string name="Sale Mixed">Mixed Sale</panel.string>
+	<panel.string name="text deed continued">
+		Transferir
+	</panel.string>
+	<panel.string name="text deed">
+		Transferir
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Puedes modificar este objeto
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Puedes modificar estos objetos
+	</panel.string>
+	<panel.string name="text modify info 3">
+		No puedes modificar este objeto
+	</panel.string>
+	<panel.string name="text modify info 4">
+		No puedes modificar estos objetos
+	</panel.string>
+	<panel.string name="text modify info 5">
+		No se puede modificar este objeto a través del límite de una región
+	</panel.string>
+	<panel.string name="text modify info 6">
+		No se pueden modificar estos objetos a través del límite de una región
+	</panel.string>
+	<panel.string name="text modify warning">
+		Este objeto tiene partes enlazadas
+	</panel.string>
+	<panel.string name="Cost Default">
+		Precio: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Precio total: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Price Per: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Mixed Price
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Mixed Sale
+	</panel.string>
 	<text name="title" value="Perfil del objeto"/>
 	<text name="where" value="(En el mundo)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Nombre:</text>
-		<text name="Description:">Descripción:</text>
-		<text name="CreatorNameLabel">Creador:</text>
-		<text name="Owner:">Propietario:</text>
-		<text name="Group_label">Grupo:</text>
+		<text name="Name:">
+			Nombre:
+		</text>
+		<text name="Description:">
+			Descripción:
+		</text>
+		<text name="CreatorNameLabel">
+			Creador:
+		</text>
+		<text name="Owner:">
+			Propietario:
+		</text>
+		<text name="Group_label">
+			Grupo:
+		</text>
 		<button name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/>
 		<name_box initial_value="Cargando..." name="Group Name Proxy"/>
 		<button label="Transferir" label_selected="Transferir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
-		<text name="label click action">Pulsa para:</text>
+		<text name="label click action">
+			Pulsa para:
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/>
 			<combo_box.item label="Sentarme en el objeto" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<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.item label="Ninguno" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Puedes modificar este objeto</text>
-			<text name="Anyone can:">Cualquiera:</text>
+			<text name="perm_modify">
+				Puedes modificar este objeto
+			</text>
+			<text name="Anyone can:">
+				Cualquiera:
+			</text>
 			<check_box label="Copiar" name="checkbox allow everyone copy"/>
 			<check_box label="Mover" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Grupo:</text>
+			<text name="GroupLabel">
+				Grupo:
+			</text>
 			<check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación de este objeto. Debes transferirlo para activar las restricciones según los roles."/>
-			<text name="NextOwnerLabel">Próximo propietario:</text>
+			<text name="NextOwnerLabel">
+				Próximo propietario:
+			</text>
 			<check_box label="Modificar" name="checkbox next owner can modify"/>
 			<check_box label="Copiar" name="checkbox next owner can copy"/>
 			<check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Precio: L$" name="Edit Cost"/>
 		<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objeto en los resultados de la búsqueda"/>
-		<text name="pathfinding_attributes_label">Atributos de pathfinding:</text>
-		<text name="B:">B:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			Atributos de pathfinding:
+		</text>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Abrir" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 341c6d2fe8..daa10dbd61 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -2205,6 +2205,18 @@ Si sigues recibiendo el mismo mensaje, solicita ayuda al personal de asistencia
 	<string name="RegionInfoListTypeBannedAgents">
 		Siempre prohibido
 	</string>
+	<string name="RegionInfoAllEstates">
+		todos los estados
+	</string>
+	<string name="RegionInfoManagedEstates">
+		estados administrados
+	</string>
+	<string name="RegionInfoThisEstate">
+		este estado
+	</string>
+	<string name="AndNMore">
+		y [EXTRA_COUNT] más
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Memoria de los scripts de la parcela
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
index 6cef2a3591..b1bd2cdd2f 100644
--- a/indra/newview/skins/default/xui/fr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/fr/floater_auction.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="COMMENCER LA VENTE DE TERRAINS LINDEN">
+<floater name="floater_auction" title="COMMENCER LA VENTE DES TERRAINS LINDEN">
 	<floater.string name="already for sale">
 		Vous ne pouvez pas mettre aux enchères des parcelles déjà en vente.
 	</floater.string>
-	<check_box initial_value="true" label="Inclure le marquage de sélection jaune" name="fence_check"/>
-	<button label="Capture d&apos;écran" label_selected="Capture d&apos;écran" name="snapshot_btn" width="110"/>
-	<button label="Vendre à n&apos;importe qui" label_selected="Vendre à n&apos;importe qui" name="sell_to_anyone_btn"/>
+	<check_box initial_value="true" label="Inclure la cloison jaune de sélection" name="fence_check"/>
+	<button label="Photo" label_selected="Photo" name="snapshot_btn" width="110"/>
+	<button label="Vendre à n’importe qui" label_selected="Vendre à n’importe qui" name="sell_to_anyone_btn"/>
 	<button label="Effacer les paramètres" label_selected="Effacer les paramètres" name="reset_parcel_btn"/>
 	<button label="Commencer les enchères" label_selected="Commencer les enchères" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index b254a178f9..7c56c34b0a 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -73,9 +73,6 @@
 	<button label="Lien" name="link_btn"/>
 	<button label="Annuler le lien" name="unlink_btn"/>
 	<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
-	<text label="Étirer les deux côtés" name="checkbox uniform label">
-		Étirer les deux côtés
-	</text>
 	<check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Fixer" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Choisir le type d&apos;axe de grille pour le positionnement de l&apos;objet.">
@@ -201,6 +198,7 @@
 				<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 				<combo_box.item label="Ouvrir" name="Open"/>
 				<combo_box.item label="Zoomer" name="Zoom"/>
+				<combo_box.item label="Aucun" name="None"/>
 			</combo_box>
 			<check_box label="À vendre :" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
@@ -408,82 +406,7 @@
 			<spinner label="Densité en 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
-		<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>
-			<texture_picker label="Texture" name="texture control" tool_tip="Cliquez pour sélectionner une image"/>
-			<color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
-			<text name="color trans" width="88">
-				Transparence
-			</text>
-			<text name="glow label">
-				Rayonnement
-			</text>
-			<check_box label="Lumineux" name="checkbox fullbright"/>
-			<text name="tex gen">
-				Application
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_box.item label="Par défaut" name="Default"/>
-				<combo_box.item label="Plan" name="Planar"/>
-			</combo_box>
-			<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 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>
-			<spinner label="Horizontal (U)" name="TexScaleU"/>
-			<check_box label="Inverser" name="checkbox flip s"/>
-			<spinner label="Vertical (V)" name="TexScaleV"/>
-			<check_box label="Inverser" name="checkbox flip t"/>
-			<spinner label="Rotation˚" name="TexRot"/>
-			<button label="Appliquer" label_selected="Appliquer" name="button apply"/>
-			<text name="tex offset">
-				Décalage de la texture
-			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU"/>
-			<spinner label="Vertical (V)" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					Média
-				</text>
-				<button name="add_media" tool_tip="Ajouter un média"/>
-				<button name="delete_media" tool_tip="Supprimer cette texture de média"/>
-				<button name="edit_media" tool_tip="Modifier ce 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&apos;abord se terminer)"/>
-			</panel>
-		</panel>
+		<panel label="Texture" name="Texture"/>
 		<panel label="Contenu" name="Contents">
 			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
 			<button label="Droits" name="button permissions"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 06697ae13a..6be609ed0c 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Contrôles de la caméra..." name="Camera Controls"/>
 		<menu label="Déplacement" name="Movement">
 			<menu_item_call label="M&apos;asseoir" name="Sit Down Here"/>
+			<menu_item_call label="Se lever" name="Stand up"/>
 			<menu_item_check label="Voler" name="Fly"/>
 			<menu_item_check label="Toujours courir" name="Always Run"/>
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
@@ -278,7 +279,6 @@
 			<menu_item_check label="Afficher les matrices" name="Show Matrices"/>
 			<menu_item_check label="Afficher la couleur sous le curseur" name="Show Color Under Cursor"/>
 			<menu_item_check label="Afficher la mémoire" name="Show Memory"/>
-			<menu_item_check label="Afficher les infos de mémoire privées" name="Show Private Mem Info"/>
 			<menu_item_check label="Afficher les mises à jour des objets" name="Show Updates"/>
 		</menu>
 		<menu label="Forcer une erreur" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 4976b4a724..717fa5b3de 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1567,6 +1567,30 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
 	<notification name="ProblemAddingEstateManagerBanned">
 		Impossible d’ajouter un résident banni à la liste des gérants de domaine.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Impossible d&apos;ajouter le gérant de domaine à la liste interdite.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; est déjà dans la liste des groupes autorisés.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] est déjà dans votre liste [LIST_TYPE].
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] sont déjà dans votre liste [LIST_TYPE].
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] a été ajouté à la liste [LIST_TYPE] de [ESTATE].
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] ont été ajoutéq à la liste [LIST_TYPE] de [ESTATE].
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] a été supprimé de la liste [LIST_TYPE] de [ESTATE].
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] ont été supprimés de la liste [LIST_TYPE] de [ESTATE].
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Impossible de changer d&apos;apparence jusqu&apos;à ce que les habits et la silhouette soient chargés.
 	</notification>
@@ -1872,7 +1896,7 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
 		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
 	</notification>
 	<notification label="Choisir le domaine" name="EstateBannedAgentRemove">
-		Supprimer ce résident de la liste des résidents bannis pour ce domaine uniquement ou pour [ALL_ESTATES] ?
+		Supprimer ce résident de la liste des résidents interdits pour ce domaine uniquement ou pour [ALL_ESTATES] ?
 		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
 	</notification>
 	<notification label="Choisir le domaine" name="EstateManagerAdd">
@@ -3165,16 +3189,22 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
 		Échec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement.  Vous allez maintenant être reconnecté(e) au chat vocal près de vous.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Au moins l&apos;un des effets de voix auxquels vous êtes abonné a expiré.
-[[URL] Cliquez ici] pour renouveler votre abonnement.
+		Au moins l&apos;un des effets de voix auxquels vous êtes abonné a expiré. 
+[[URL] Cliquez ici] pour renouveler votre abonnement. 
+
+Si vous êtes un membre Premium,  [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
 		L&apos;effet de voix actif a expiré. Vos paramètres de voix normaux ont été rétablis.
-[[URL] Cliquez ici] pour renouveler votre abonnement.
+[[URL] Cliquez ici] pour renouveler votre abonnement. 
+
+Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Au moins l&apos;un de vos effets de voix expirera dans moins de [INTERVAL] jours.
-[[URL] Cliquez ici] pour renouveler votre abonnement.
+		Au moins l&apos;un de vos effets de voix expirera dans moins de [INTERVAL] jours.  
+[[URL] Cliquez ici] pour renouveler votre abonnement. 
+
+Si vous êtes un membre Premium,  [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		De nouveaux effets de voix sont disponibles !
@@ -3226,6 +3256,9 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
 	<notification name="SnapshotToComputerFailed">
 		Échec d’enregistrement de la photo dans [PATH] : Le disque est plein. [NEED_MEMORY]KB est nécessaire mais l&apos;espace libre est de seulement [FREE_MEMORY]KB.
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Échec d’enregistrement de la photo dans [PATH] : Le répertoire n&apos;existe pas.
+	</notification>
 	<notification name="PresetNotSaved">
 		Erreur d’enregistrement du préréglage [NAME].
 	</notification>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 2b8249c8a9..a4f0ff7061 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=fr</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=fr
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Nom d&apos;utilisateur" name="username_combo" tool_tip="Nom d&apos;utilisateur que vous avez choisi lors de votre inscription (par exemple, bobsmith12 ou Steller Sunshine)."/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Connexion" name="connect_btn"/>
 			<check_box label="Mémoriser mes informations" name="remember_check"/>
-			<text name="forgot_password_text">Mot de passe oublié</text>
-			<combo_box label="Sélectionner la grille" name="server_combo" left_pad="20"/>
+			<text name="forgot_password_text">
+				Mot de passe oublié
+			</text>
+			<combo_box label="Sélectionner la grille" left_pad="20" name="server_combo"/>
+			<text name="sign_up_text">
+				S&apos;inscrire
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_login_first.xml b/indra/newview/skins/default/xui/fr/panel_login_first.xml
index 9534ac7b83..8f40d0230c 100644
--- a/indra/newview/skins/default/xui/fr/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=fr
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -10,10 +13,13 @@
 					<combo_box label="Nom d&apos;utilisateur" name="username_combo" tool_tip="Nom d&apos;utilisateur que vous avez choisi lors de votre inscription (par exemple, bobsmith12 ou Steller Sunshine)."/>
 					<line_editor label="Mot de passe" name="password_edit"/>
 					<button label="Connexion" name="connect_btn"/>
-					<check_box label="Mémoriser mes informations" name="remember_check" font="SansSerifSmall"/>
+					<check_box font="SansSerifSmall" label="Mémoriser mes informations" name="remember_check"/>
 					<text name="forgot_password_text">
 						Mot de passe oublié
 					</text>
+					<text name="sign_up_text">
+						S&apos;inscrire
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_access.xml b/indra/newview/skins/default/xui/fr/panel_region_access.xml
new file mode 100644
index 0000000000..db77f3b8f1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ACCÈS" name="Access">
+	<tab_container name="tabs">
+		<panel label="GÉRANTS DU DOMAINE" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Gérants du domaine :
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Nom" name="name"/>
+			</name_list>
+			<button label="Ajouter..." name="add_estate_manager_btn"/>
+			<button label="Supprimer..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="AUTORISÉ" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="Rechercher des agents autorisés" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Toujours autorisé :
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Nom" name="name"/>
+			</name_list>
+			<button label="Ajouter..." name="add_allowed_avatar_btn"/>
+			<button label="Supprimer..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="GROUPES AUTORISÉS" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="Rechercher des groupes autorisés" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Groupes toujours autorisés :
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Nom" name="name"/>
+			</name_list>
+			<button label="Ajouter..." name="add_allowed_group_btn"/>
+			<button label="Supprimer" name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="INTERDIT" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Rechercher des agents interdits" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Toujours interdit :
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Nom" name="name"/>
+				<columns label="Date de la dernière connexion" name="last_login_date"/>
+				<columns label="Date d&apos;interdiction" name="ban_date"/>
+				<columns label="Interdit par" name="bannedby"/>
+			</name_list>
+			<button label="Ajouter..." name="add_banned_avatar_btn"/>
+			<button label="Supprimer..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 9bf3fdfc96..0987ef3fa3 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -18,7 +18,7 @@ domaine.
 		(inconnu)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Autoriser uniquement les résidents et les groupes indiqués ci-dessous" name="estate_restricted_access"/>
+		<radio_item label="Autoriser uniquement les résidents et les groupes indiqués dans l&apos;onglet Accès" name="estate_restricted_access"/>
 		<radio_item label="Visite ouverte à tous" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Doit avoir plus de 18 ans" name="limit_age_verified" tool_tip="Pour accéder à ce domaine, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
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 f6b4f28046..9064da2a5f 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Profil de l&apos;objet">
-	<panel.string name="text deed continued">Céder</panel.string>
-	<panel.string name="text deed">Céder</panel.string>
-	<panel.string name="text modify info 1">Vous pouvez modifier cet objet</panel.string>
-	<panel.string name="text modify info 2">Vous pouvez modifier ces objets</panel.string>
-	<panel.string name="text modify info 3">Vous ne pouvez pas modifier cet objet</panel.string>
-	<panel.string name="text modify info 4">Vous ne pouvez pas modifier ces objets</panel.string>
-	<panel.string name="text modify info 5">Impossible de modifier cet objet au-delà de la frontière d&apos;une région</panel.string>
-	<panel.string name="text modify info 6">Impossible de modifier ces objets au-delà de la frontière d&apos;une région</panel.string>
-	<panel.string name="text modify warning">Cet objet comprend des parties liées</panel.string>
-	<panel.string name="Cost Default">Prix : L$</panel.string>
-	<panel.string name="Cost Total">Prix total : L$</panel.string>
-	<panel.string name="Cost Per Unit">Prix par : L$</panel.string>
-	<panel.string name="Cost Mixed">Prix mixte</panel.string>
-	<panel.string name="Sale Mixed">Vente mixte</panel.string>
+	<panel.string name="text deed continued">
+		Céder
+	</panel.string>
+	<panel.string name="text deed">
+		Céder
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Vous pouvez modifier cet objet
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Vous pouvez modifier ces objets
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Vous ne pouvez pas modifier cet objet
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Vous ne pouvez pas modifier ces objets
+	</panel.string>
+	<panel.string name="text modify info 5">
+		Impossible de modifier cet objet au-delà de la frontière d&apos;une région
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Impossible de modifier ces objets au-delà de la frontière d&apos;une région
+	</panel.string>
+	<panel.string name="text modify warning">
+		Cet objet comprend des parties liées
+	</panel.string>
+	<panel.string name="Cost Default">
+		Prix : L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Prix total : L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Prix par : L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Prix mixte
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Vente mixte
+	</panel.string>
 	<text name="title" value="Profil de l&apos;objet"/>
 	<text name="where" value="(dans Second Life)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Nom :</text>
-		<text name="Description:">Description :</text>
-		<text name="CreatorNameLabel">Créateur :</text>
-		<text name="Owner:">Propriétaire :</text>
-		<text name="Group_label">Groupe :</text>
+		<text name="Name:">
+			Nom :
+		</text>
+		<text name="Description:">
+			Description :
+		</text>
+		<text name="CreatorNameLabel">
+			Créateur :
+		</text>
+		<text name="Owner:">
+			Propriétaire :
+		</text>
+		<text name="Group_label">
+			Groupe :
+		</text>
 		<button name="button set group" tool_tip="Choisir un groupe pour partager les droits relatifs à cet objet"/>
 		<name_box initial_value="Chargement…" name="Group Name Proxy"/>
 		<button label="Céder" label_selected="Céder" name="button deed" tool_tip="En cédant un objet, vous donnez aussi les droits au prochain propriétaire. Seul un officier peut céder les objets partagés d&apos;un groupe."/>
-		<text name="label click action">Cliquer pour :</text>
+		<text name="label click action">
+			Cliquer pour :
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Toucher (défaut)" name="Touch/grab(default)"/>
 			<combo_box.item label="S&apos;asseoir sur l&apos;objet" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<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.item label="Aucun" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Vous pouvez modifier cet objet</text>
-			<text name="Anyone can:">N&apos;importe qui :</text>
+			<text name="perm_modify">
+				Vous pouvez modifier cet objet
+			</text>
+			<text name="Anyone can:">
+				N&apos;importe qui :
+			</text>
 			<check_box label="Copier" name="checkbox allow everyone copy"/>
 			<check_box label="Bouger" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Groupe :</text>
+			<text name="GroupLabel">
+				Groupe :
+			</text>
 			<check_box label="Partager" name="checkbox share with group" tool_tip="Autoriser tous les membres du groupe choisi à partager vos droits de modification pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Céder."/>
-			<text name="NextOwnerLabel">Le prochain propriétaire :</text>
+			<text name="NextOwnerLabel">
+				Le prochain propriétaire :
+			</text>
 			<check_box label="Modifier" name="checkbox next owner can modify"/>
 			<check_box label="Copier" name="checkbox next owner can copy"/>
 			<check_box label="Transférer" name="checkbox next owner can transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Prix : L$" name="Edit Cost"/>
 		<check_box label="Afficher avec la recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/>
-		<text name="pathfinding_attributes_label">Attributs de recherche de chemin :</text>
-		<text name="B:">B :</text>
-		<text name="O:">O :</text>
-		<text name="G:">G :</text>
-		<text name="E:">E :</text>
-		<text name="N:">N :</text>
-		<text name="F:">F :</text>
+		<text name="pathfinding_attributes_label">
+			Attributs de recherche de chemin :
+		</text>
+		<text name="B:">
+			B :
+		</text>
+		<text name="O:">
+			O :
+		</text>
+		<text name="G:">
+			G :
+		</text>
+		<text name="E:">
+			E :
+		</text>
+		<text name="N:">
+			N :
+		</text>
+		<text name="F:">
+			F :
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Ouvrir" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index d76beee93d..886705a644 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -2229,6 +2229,18 @@ Si vous continuez de recevoir ce message, contactez l’assistance Second Life 
 	<string name="RegionInfoListTypeBannedAgents">
 		Toujours interdit
 	</string>
+	<string name="RegionInfoAllEstates">
+		tous les domaines
+	</string>
+	<string name="RegionInfoManagedEstates">
+		domaines gérés
+	</string>
+	<string name="RegionInfoThisEstate">
+		ce domaine
+	</string>
+	<string name="AndNMore">
+		et [EXTRA_COUNT] plus
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Mémoire des scripts de parcelles
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_auction.xml b/indra/newview/skins/default/xui/it/floater_auction.xml
index 4cad8b744d..ea524a153c 100644
--- a/indra/newview/skins/default/xui/it/floater_auction.xml
+++ b/indra/newview/skins/default/xui/it/floater_auction.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_auction" title="INIZIA LA VENDITA DI TERRENO LINDEN">
 	<floater.string name="already for sale">
-		Non puoi mettere in asta terreni che sono già in vendita.
+		Non puoi mettere all’asta terreni che sono già in vendita.
 	</floater.string>
-	<check_box initial_value="true" label="Includi barriere di selezione gialle" name="fence_check"/>
-	<button label="Fotografia" label_selected="Fotografia" name="snapshot_btn"/>
+	<check_box initial_value="true" label="Includi la parte selezionata in giallo" name="fence_check"/>
+	<button label="Istantanea" label_selected="Istantanea" name="snapshot_btn"/>
 	<button label="Vendi a chiunque" label_selected="Vendi a chiunque" name="sell_to_anyone_btn"/>
 	<button label="Cancella impostazioni" label_selected="Cancella impostazioni" name="reset_parcel_btn"/>
 	<button label="Inizia l&apos;asta" label_selected="Inizia l&apos;asta" name="start_auction_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index efd1ea808a..b5d9475c2e 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -73,9 +73,6 @@
 	<button label="Collegamento" name="link_btn"/>
 	<button label="Scollega" name="unlink_btn"/>
 	<check_box label="Allunga entrambi i lati" name="checkbox uniform"/>
-	<text label="Allunga entrambi i lati" name="checkbox uniform label">
-		Allunga entrambi i lati
-	</text>
 	<check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Scatto" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">
@@ -208,6 +205,7 @@
 				<combo_box.item label="Paga l&apos;oggetto" name="Payobject"/>
 				<combo_box.item label="Apri" name="Open"/>
 				<combo_box.item label="Ingrandisci" name="Zoom"/>
+				<combo_box.item label="Nessuno" name="None"/>
 			</combo_box>
 			<check_box label="In vendita:" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
@@ -415,82 +413,7 @@
 			<spinner label="Densità in 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restituzione" name="Physics Restitution"/>
 		</panel>
-		<panel label="Texture" name="Texture">
-			<panel.string name="string repeats per meter">
-				Ripetizioni per metro
-			</panel.string>
-			<panel.string name="string repeats per face">
-				Ripetizioni per faccia
-			</panel.string>
-			<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere un&apos;immagine"/>
-			<color_swatch label="Colore" 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="Massima luminosità" name="checkbox fullbright"/>
-			<text name="tex gen">
-				Applicazione
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_box.item label="Default" name="Default"/>
-				<combo_box.item label="Planare" name="Planar"/>
-			</combo_box>
-			<text name="label shininess">
-				Brillantezza
-			</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 bumpiness">
-				Rilievo
-			</text>
-			<combo_box name="combobox bumpiness">
-				<combo_box.item label="Nessuna" name="None"/>
-				<combo_box.item label="Luminoso" name="Brightness"/>
-				<combo_box.item label="Scuro" name="Darkness"/>
-				<combo_box.item label="Venature del legno" name="woodgrain"/>
-				<combo_box.item label="Corteccia" name="bark"/>
-				<combo_box.item label="Mattoni" name="bricks"/>
-				<combo_box.item label="Scacchi" name="checker"/>
-				<combo_box.item label="Cemento" name="concrete"/>
-				<combo_box.item label="Mattonella incrostata" name="crustytile"/>
-				<combo_box.item label="Mosaico in pietra" name="cutstone"/>
-				<combo_box.item label="Dischi" name="discs"/>
-				<combo_box.item label="Ghiaia" name="gravel"/>
-				<combo_box.item label="Sassi" name="petridish"/>
-				<combo_box.item label="Listoni" name="siding"/>
-				<combo_box.item label="Mattonelle in pietra" name="stonetile"/>
-				<combo_box.item label="Stucco" name="stucco"/>
-				<combo_box.item label="Cerchi rialzati" name="suction"/>
-				<combo_box.item label="Trama" name="weave"/>
-			</combo_box>
-			<spinner label="Orizzontale (U)" name="TexScaleU"/>
-			<check_box label="Inverti" name="checkbox flip s"/>
-			<spinner label="Verticale (V)" name="TexScaleV"/>
-			<check_box label="Inverti" name="checkbox flip t"/>
-			<spinner label="Rotazione˚" name="TexRot"/>
-			<button label="Applica" label_selected="Applica" name="button apply"/>
-			<text name="tex offset">
-				Bilanciamento della texture
-			</text>
-			<spinner label="Orizzontale (U)" name="TexOffsetU"/>
-			<spinner label="Verticale (V)" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					Multimediale
-				</text>
-				<button name="add_media" tool_tip="Aggiungi media"/>
-				<button name="delete_media" tool_tip="Cancella questa media texture"/>
-				<button name="edit_media" tool_tip="Modifica questo media"/>
-				<button label="Alllinea" label_selected="Allinea media" name="button align" tool_tip="Allinea texture del media (il caricamento deve prima essere completato)"/>
-			</panel>
-		</panel>
+		<panel label="Texture" name="Texture"/>
 		<panel label="Contenuto" name="Contents">
 			<button label="Nuovo Script" label_selected="Nuovo script" name="button new script"/>
 			<button label="Permessi" name="button permissions"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 1f6a09deaa..b5f5dcd1b9 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Controlli fotocamera..." name="Camera Controls"/>
 		<menu label="Spostamento" name="Movement">
 			<menu_item_call label="Siedi" name="Sit Down Here"/>
+			<menu_item_call label="Alzati" name="Stand up"/>
 			<menu_item_check label="Vola" name="Fly"/>
 			<menu_item_check label="Corri sempre" name="Always Run"/>
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
@@ -273,7 +274,6 @@
 			<menu_item_check label="Mostra info sulla texture" name="Show Texture Info"/>
 			<menu_item_check label="Mostra colore sotto il cursore" name="Show Color Under Cursor"/>
 			<menu_item_check label="Mostra memoria" name="Show Memory"/>
-			<menu_item_check label="Mostra info mem privata" name="Show Private Mem Info"/>
 			<menu_item_check label="Mostra aggiornamenti agli oggetti" name="Show Updates"/>
 		</menu>
 		<menu label="Forza un errore" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index e0c1403491..c85fda7fbb 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -1569,6 +1569,30 @@ Eccede il [MAX_AGENTS] [LIST_TYPE] limite di [NUM_EXCESS].
 	<notification name="ProblemAddingEstateManagerBanned">
 		Impossibile aggiungere il residente espulso alla lista dei gestori delle proprietà.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Impossibile aggiunere il gestore della proprietà immobiliare [AGENT] all’elenco degli espulsi.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; si trova già nell’elenco dei Gruppi ammessi.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] è gia nel tuo elenco [LIST_TYPE].
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] è gia nel tuo elenco [LIST_TYPE].
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] è stato aggiunto all’elenco [LIST_TYPE] di [ESTATE].
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] è stato aggiunto all’elenco [LIST_TYPE] di [ESTATE].
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] è stato rimosso dall’elenco [LIST_TYPE] di [ESTATE].
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] è stato rimosso dall’elenco [LIST_TYPE] di [ESTATE].
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Impossibile cambiare l&apos;aspetto fisico finchè gli abiti e i vestiti non sono caricati.
 	</notification>
@@ -1876,7 +1900,7 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/>
 	</notification>
 	<notification label="Seleziona la proprietà" name="EstateBannedAgentRemove">
-		Rimuovi questo residente dalla lista dei residenti bloccati nell&apos;accesso solo a questa proprietà oppure per [ALL_ESTATES]?
+		Rimuovi questo Residente dall’elenco degli espulsi solo per questa proprietà immobiliare oppure per [ALL_ESTATES]?
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà" yestext="Questa proprietà"/>
 	</notification>
 	<notification label="Seleziona la proprietà" name="EstateManagerAdd">
@@ -3168,16 +3192,22 @@ Clicca su Accetta per unirti alla chat oppure su Declina per declinare l&apos;in
 		Collegamento a [VOICE_CHANNEL_NAME] non riuscito, riprova più tardi.  Verrai ora ricollegato alla chat vocale nei dintorni.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Almeno una delle manipolazioni vocali alle quali sei iscritto è scaduta.
-[[URL] Fai clic qui] per rinnovare l&apos;abbonamento.
+		Almeno una delle manipolazioni vocali alle quali sei iscritto è scaduta. 
+[[URL] Fai clic qui] per rinnovare l&apos;abbonamento. 
+
+Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		Poiché la manipolazione vocale attiva è scaduta, sono state applicate le tue impostazioni normali.
-[[URL] Fai clic qui] per rinnovare l&apos;abbonamento.
+		Poiché la manipolazione vocale attiva è scaduta, sono state applicate le tue impostazioni normali. 
+[[URL] Fai clic qui] per rinnovare l&apos;abbonamento. 
+
+Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Almeno una delle tue manipolazioni vocali scadrà tra meno di [INTERVAL] giorni.
-[[URL] Fai clic qui] per rinnovare l&apos;abbonamento.
+		Almeno una delle tue manipolazioni vocali scadrà tra meno di [INTERVAL] giorni. 
+[[URL] Fai clic qui] per rinnovare l&apos;abbonamento. 
+
+Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Sono disponibili nuove manipolazioni vocali.
@@ -3229,6 +3259,9 @@ Per sicurezza, verranno bloccati per alcuni secondi.
 	<notification name="SnapshotToComputerFailed">
 		Salvataggio istantanea in [PATH] non riuscito: Il disco è pieno. Sono necessari [NEED_MEMORY] KB ma sono disponibili solo [FREE_MEMORY] KB .
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Salvataggio istantanea in [PATH] non riuscito: La cartella non esiste.
+	</notification>
 	<notification name="PresetNotSaved">
 		Errore durante il salvataggio del valore predefinito [NAME].
 	</notification>
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index 6c1777163c..228bebd92a 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=it</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=it
+	</panel.string>
+	<panel.string name="sign_up_url">
+		http://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Nome utente" name="username_combo" tool_tip="Il nome utente che hai scelto durante la registrazione, come roby12 o Stella Solare"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Accedi" name="connect_btn"/>
 			<check_box label="Ricordami" name="remember_check"/>
-			<text name="forgot_password_text">Password dimenticata</text>
+			<text name="forgot_password_text">
+				Password dimenticata
+			</text>
 			<combo_box label="Seleziona griglia" name="server_combo"/>
+			<text name="sign_up_text">
+				Registrati
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_login_first.xml b/indra/newview/skins/default/xui/it/panel_login_first.xml
index 6f120a17fc..5b04fd411a 100644
--- a/indra/newview/skins/default/xui/it/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/it/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=it
 	</panel.string>
+	<panel.string name="sign_up_url">
+		http://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						Password dimenticata
 					</text>
+					<text name="sign_up_text">
+						Registrati
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_access.xml b/indra/newview/skins/default/xui/it/panel_region_access.xml
new file mode 100644
index 0000000000..06ab2b40e7
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="ACCESSO" name="Access">
+	<tab_container name="tabs">
+		<panel label="GESTORI DELLE PROPRIETÀ IMMOBILIARI" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Gestori delle proprietà immobiliari
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Nome" name="name"/>
+			</name_list>
+			<button label="Aggiungi..." name="add_estate_manager_btn"/>
+			<button label="Rimuovi..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="AMMESSO" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="Cerca agenti ammessi" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Sempre ammesso:
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Nome" name="name"/>
+			</name_list>
+			<button label="Aggiungi..." name="add_allowed_avatar_btn"/>
+			<button label="Rimuovi..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="GRUPPI AMMESSI" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="Cerca gruppi consentiti" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Gruppi sempre consentiti:
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Nome" name="name"/>
+			</name_list>
+			<button label="Aggiungi..." name="add_allowed_group_btn"/>
+			<button label="Rimuovi..." name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="ESPULSI" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Cerca agenti espulsi" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Sempre espulsi:
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Nome" name="name"/>
+				<columns label="Ultima data di accesso" name="last_login_date"/>
+				<columns label="Data espulsione" name="ban_date"/>
+				<columns label="Espulso da" name="bannedby"/>
+			</name_list>
+			<button label="Aggiungi..." name="add_banned_avatar_btn"/>
+			<button label="Rimuovi..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
index 3983d25111..b4422e4c60 100644
--- a/indra/newview/skins/default/xui/it/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(sconosciuto)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Consenti solo residenti e gruppi elencati qui sotto" name="estate_restricted_access"/>
+		<radio_item label="Consenti accesso solo ai residenti e ai gruppi elencati nella scheda di Accesso" name="estate_restricted_access"/>
 		<radio_item label="Chiunque può visitare" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="È necessario avere più di 18 anni" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
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 aabefd7d3c..72a89c77ab 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Profilo dell&apos;oggetto">
-	<panel.string name="text deed continued">Cessione</panel.string>
-	<panel.string name="text deed">Cessione</panel.string>
-	<panel.string name="text modify info 1">Tu puoi modificare questo oggetto</panel.string>
-	<panel.string name="text modify info 2">Tu puoi modificare questi oggetti</panel.string>
-	<panel.string name="text modify info 3">Non puoi modificare questo oggetto</panel.string>
-	<panel.string name="text modify info 4">Non puoi modificare questi oggetti</panel.string>
-	<panel.string name="text modify info 5">Questo oggetto non può essere modificato attraverso il confine di una regione</panel.string>
-	<panel.string name="text modify info 6">Questi oggetti non possono essere modificati attraverso il confine di una regione</panel.string>
-	<panel.string name="text modify warning">Questo oggetto ha parti collegate</panel.string>
-	<panel.string name="Cost Default">Prezzo: L$</panel.string>
-	<panel.string name="Cost Total">Prezzo totale: L$</panel.string>
-	<panel.string name="Cost Per Unit">Prezzo per: L$</panel.string>
-	<panel.string name="Cost Mixed">Prezzo misto</panel.string>
-	<panel.string name="Sale Mixed">Vendita mista</panel.string>
+	<panel.string name="text deed continued">
+		Cessione
+	</panel.string>
+	<panel.string name="text deed">
+		Cessione
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Tu puoi modificare questo oggetto
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Tu puoi modificare questi oggetti
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Non puoi modificare questo oggetto
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Non puoi modificare questi oggetti
+	</panel.string>
+	<panel.string name="text modify info 5">
+		Questo oggetto non può essere modificato attraverso il confine di una regione
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Questi oggetti non possono essere modificati attraverso il confine di una regione
+	</panel.string>
+	<panel.string name="text modify warning">
+		Questo oggetto ha parti collegate
+	</panel.string>
+	<panel.string name="Cost Default">
+		Prezzo: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Prezzo totale: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Prezzo per: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Prezzo misto
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Vendita mista
+	</panel.string>
 	<text name="title" value="Profilo dell&apos;oggetto"/>
 	<text name="where" value="(in Second Life)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Nome:</text>
-		<text name="Description:">Descrizione:</text>
-		<text name="CreatorNameLabel">Ideatore:</text>
-		<text name="Owner:">Proprietario:</text>
-		<text name="Group_label">Gruppo:</text>
+		<text name="Name:">
+			Nome:
+		</text>
+		<text name="Description:">
+			Descrizione:
+		</text>
+		<text name="CreatorNameLabel">
+			Ideatore:
+		</text>
+		<text name="Owner:">
+			Proprietario:
+		</text>
+		<text name="Group_label">
+			Gruppo:
+		</text>
 		<button name="button set group" tool_tip="Scegli un gruppo con cui condividere i diritti relativi all&apos;oggetto"/>
 		<name_box initial_value="Caricamento in corso..." name="Group Name Proxy"/>
 		<button label="Cessione" label_selected="Cessione" name="button deed" tool_tip="Con una cessione si trasferisce il bene con i diritti al proprietario successivo Gli oggetti in proprietà condivisa di gruppo possono essere ceduti soltanto da un funzionario del gruppo."/>
-		<text name="label click action">Fai clic per:</text>
+		<text name="label click action">
+			Fai clic per:
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Tocca (predefinito)" name="Touch/grab(default)"/>
 			<combo_box.item label="Siediti sull&apos;oggetto" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
 			<combo_box.item label="Ingrandisci" name="Zoom"/>
+			<combo_box.item label="Nessuno" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Tu puoi modificare questo oggetto</text>
-			<text name="Anyone can:">Chiunque:</text>
+			<text name="perm_modify">
+				Tu puoi modificare questo oggetto
+			</text>
+			<text name="Anyone can:">
+				Chiunque:
+			</text>
 			<check_box label="Copia" name="checkbox allow everyone copy"/>
 			<check_box label="Sposta" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Gruppo:</text>
+			<text name="GroupLabel">
+				Gruppo:
+			</text>
 			<check_box label="Condividi" name="checkbox share with group" tool_tip="Consenti a tutti i membri del gruppo selezionato di condividere i tuoi diritti di modifica di questo oggetto. Per attivare le restrizioni per ruolo devi prima effettuare la cessione."/>
-			<text name="NextOwnerLabel">Proprietario successivo:</text>
+			<text name="NextOwnerLabel">
+				Proprietario successivo:
+			</text>
 			<check_box label="Modifica" name="checkbox next owner can modify"/>
 			<check_box label="Copia" name="checkbox next owner can copy"/>
 			<check_box label="Trasferisci" name="checkbox next owner can transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Prezzo: L$" name="Edit Cost"/>
 		<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti alle persone di vedere questo oggetto nei risultati della ricerca"/>
-		<text name="pathfinding_attributes_label">Attributi pathfinding:</text>
-		<text name="B:">B:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			Attributi pathfinding:
+		</text>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Apri" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index ad74e16170..00f9adee5e 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -2213,6 +2213,18 @@ Se continui a ricevere questo messaggio, contatta l&apos;assistenza Second Life
 	<string name="RegionInfoListTypeBannedAgents">
 		Sempre esclusi:
 	</string>
+	<string name="RegionInfoAllEstates">
+		tutte le proprietà immobiliari
+	</string>
+	<string name="RegionInfoManagedEstates">
+		proprietà immobiliari che gestisci
+	</string>
+	<string name="RegionInfoThisEstate">
+		questa proprietà immobiliare
+	</string>
+	<string name="AndNMore">
+		e [EXTRA_COUNT] ancora
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Memoria dello script del lotto
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index e9aa287f2c..21c8d90b01 100644
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_auction" title="リンデンランドの販売開始">
 	<floater.string name="already for sale">
-		売り出し中の区画は、オークションに出品できません。
+		販売中の区画をオークションに出品することはできません。
 	</floater.string>
-	<check_box initial_value="true" label="黄色の選択フェンスを含める" name="fence_check"/>
+	<check_box initial_value="true" label="黄色のセレクションフェンスを含める" name="fence_check"/>
 	<button label="スナップショット" label_selected="スナップショット" name="snapshot_btn"/>
 	<button label="誰にでも販売" label_selected="誰にでも販売" name="sell_to_anyone_btn"/>
 	<button label="設定をクリア" label_selected="設定をクリア" name="reset_parcel_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index eeaa361649..7125e729aa 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -73,9 +73,6 @@
 	<button label="リンク" name="link_btn"/>
 	<button label="リンクを外す" name="unlink_btn"/>
 	<check_box label="両側を引き伸ばす" name="checkbox uniform"/>
-	<text label="両側を延ばす" name="checkbox uniform label">
-		両側を延ばす
-	</text>
 	<check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="スナップ" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラの種類を選択">
@@ -207,6 +204,7 @@
 				<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 				<combo_box.item label="開く" name="Open"/>
 				<combo_box.item label="ズームする" name="Zoom"/>
+				<combo_box.item label="なし" name="None"/>
 			</combo_box>
 			<check_box label="販売対象：" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
@@ -414,82 +412,7 @@
 			<spinner label="密度（100 kg/m^3）" name="Physics Density"/>
 			<spinner label="復元" name="Physics Restitution"/>
 		</panel>
-		<panel label="材質" name="Texture">
-			<panel.string name="string repeats per meter">
-				メートルごとに繰り返す
-			</panel.string>
-			<panel.string name="string repeats per face">
-				面ごとに繰り返す
-			</panel.string>
-			<texture_picker label="テクスチャ" name="texture control" tool_tip="写真をクリックして選択します"/>
-			<color_swatch label="色" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<text name="color trans">
-				透過度 %
-			</text>
-			<text name="glow label">
-				グロー
-			</text>
-			<check_box label="明るさ全開" name="checkbox fullbright"/>
-			<text name="tex gen">
-				マッピング
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_box.item label="デフォルト" name="Default"/>
-				<combo_box.item label="平面" name="Planar"/>
-			</combo_box>
-			<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 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>
-			<spinner label="水平（U）" name="TexScaleU"/>
-			<check_box label="反転" name="checkbox flip s"/>
-			<spinner label="垂直（V）" name="TexScaleV"/>
-			<check_box label="反転" name="checkbox flip t"/>
-			<spinner label="回転˚" name="TexRot"/>
-			<button label="適用" label_selected="適用" name="button apply"/>
-			<text name="tex offset">
-				テクスチャのズレ
-			</text>
-			<spinner label="水平（U）" name="TexOffsetU"/>
-			<spinner label="垂直（V）" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					メディア
-				</text>
-				<button name="add_media" tool_tip="メディアを追加します"/>
-				<button name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
-				<button name="edit_media" tool_tip="このメディアを編集します"/>
-				<button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃えます（最初に読み込む必要があります）"/>
-			</panel>
-		</panel>
+		<panel label="材質" name="Texture"/>
 		<panel label="中身" name="Contents">
 			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script"/>
 			<button label="権限" name="button permissions"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 18a0bfce49..5c3c5d1aff 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="カメラコントロール..." name="Camera Controls"/>
 		<menu label="ムーブメント" name="Movement">
 			<menu_item_call label="座る" name="Sit Down Here"/>
+			<menu_item_call label="立ち上がる" name="Stand up"/>
 			<menu_item_check label="飛ぶ" name="Fly"/>
 			<menu_item_check label="常に走る" name="Always Run"/>
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
@@ -278,7 +279,6 @@
 			<menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
 			<menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
 			<menu_item_check label="メモリを表示：" name="Show Memory"/>
-			<menu_item_check label="プライベートメモリ情報を表示" name="Show Private Mem Info"/>
 			<menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates"/>
 		</menu>
 		<menu label="エラー実行" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index c032e0d1ba..2b2461df9f 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1599,6 +1599,30 @@ SHA1 フィンガープリント： [MD5_DIGEST]
 	<notification name="ProblemAddingEstateManagerBanned">
 		追放された住人を不動産管理者リストに追加できません。
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		禁止リストに不動産マネージャー [AGENT] を追加できません。
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; はすでに許可されたグループのリストに追加されています。
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] はすでにあなたの [LIST_TYPE] リストに追加されています。
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] はすでにあなたの [LIST_TYPE] リストに追加されています。
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] が [ESTATE] の [LIST_TYPE] リストに追加されました。
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] が [ESTATE] の [LIST_TYPE] リストに追加されました。
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] が [ESTATE] の [LIST_TYPE] リストから削除されました。
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] が [ESTATE] の [LIST_TYPE] リストから削除されました。
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		衣類およびシェイプが読み込まれるまでは、容姿の変更はできません。
 	</notification>
@@ -1907,7 +1931,7 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
 	</notification>
 	<notification label="不動産を選択" name="EstateBannedAgentRemove">
-		この住人が、この不動産限定、または [ALL_ESTATES] にアクセスできるように、禁止リストから削除しますか？
+		この住人をこの不動産の立入禁止リストからのみ削除しますか？それとも [ALL_ESTATES] の立入禁止リストから削除しますか？
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
 	</notification>
 	<notification label="不動産を選択" name="EstateManagerAdd">
@@ -3209,13 +3233,22 @@ M キーを押して変更します。
 		[VOICE_CHANNEL_NAME] への接続に失敗しました。あとで再度お試しください。  「近くのボイスチャット」に再接続されます。
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。期限を延長・更新するには[[URL]こちらをクリック]してください。
+		ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。
+期限を延長・更新するには [[URL] Click here] をクリックしてください。
+
+プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。期限を延長・更新するには[[URL]こちらをクリック]してください。
+		ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
+期限を延長・更新するには [[URL] Click here] をクリックしてください。
+
+プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		ボイスモーフィング効果の1つまたは複数の有効期限が[INTERVAL]日以内に終了します。期限を延長・更新するには[[URL]こちらをクリック]してください。
+		ボイスモーフィング効果の1つまたは複数の有効期限が [INTERVAL] 日以内に終了します。
+期限を延長・更新するには [[URL] Click here] をクリックしてください。
+
+プレミアム会員の方は、 [[PREMIUM_URL] click here] をクリックしてボイスモーフィング特典をお受け取りください。
 	</notification>
 	<notification name="VoiceEffectsNew">
 		新しいボイスモーフィング効果が登場！
@@ -3267,6 +3300,9 @@ M キーを押して変更します。
 	<notification name="SnapshotToComputerFailed">
 		スナップショットを [PATH] に保存できませんでした:ディスクの空き容量が不足しています。[NEED_MEMORY]KB が必要ですが、[FREE_MEMORY]KB しかありません。
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		スナップショットを [PATH] に保存できませんでした:ディレクトリは存在しません。
+	</notification>
 	<notification name="PresetNotSaved">
 		プリセット [NAME] の保存エラー。
 	</notification>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index 5f2007e0da..86e7e9dac4 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=ja</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=ja
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="ユーザー名" name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="ログイン" name="connect_btn"/>
 			<check_box label="記憶する" name="remember_check"/>
-			<text name="forgot_password_text">パスワードを忘れた場合</text>
+			<text name="forgot_password_text">
+				パスワードを忘れた場合
+			</text>
 			<combo_box label="グリッドを選択" name="server_combo"/>
+			<text name="sign_up_text">
+				登録
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login_first.xml b/indra/newview/skins/default/xui/ja/panel_login_first.xml
index d350e2f9a2..644cee25f2 100644
--- a/indra/newview/skins/default/xui/ja/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=ja
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						パスワードを忘れた場合
 					</text>
+					<text name="sign_up_text">
+						登録
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_access.xml b/indra/newview/skins/default/xui/ja/panel_region_access.xml
new file mode 100644
index 0000000000..c0612dd150
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="アクセス" name="Access">
+	<tab_container name="tabs">
+		<panel label="不動産マネージャー" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				不動産マネージャー:
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="名前" name="name"/>
+			</name_list>
+			<button label="追加..." name="add_estate_manager_btn"/>
+			<button label="削除…" name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="許可" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="許可されたエージェントを検索" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				常に許可：
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="名前" name="name"/>
+			</name_list>
+			<button label="追加..." name="add_allowed_avatar_btn"/>
+			<button label="削除…" name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="許可されたグループ" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="許可されたグループを検索" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				常に許可されたグループ：
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="名前" name="name"/>
+			</name_list>
+			<button label="追加..." name="add_allowed_group_btn"/>
+			<button label="削除…" name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="禁止" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="禁止されたエージェントを検索" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				常に禁止：
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="名前" name="name"/>
+				<columns label="最後にログインした日" name="last_login_date"/>
+				<columns label="禁止された日付" name="ban_date"/>
+				<columns label="禁止した人：" name="bannedby"/>
+			</name_list>
+			<button label="追加..." name="add_banned_avatar_btn"/>
+			<button label="削除…" name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 77c7406952..6464a65feb 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		（不明）
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="下記の住人とグループのみ許可する" name="estate_restricted_access"/>
+		<radio_item label="アクセスタブに記載された住人とグループのみ許可する" name="estate_restricted_access"/>
 		<radio_item label="誰でも訪問可" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="18 歳以上である必要があります" name="limit_age_verified" tool_tip="この不動産（エステート）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
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 858307800b..9c70a1172f 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="オブジェクトのプロフィール">
-	<panel.string name="text deed continued">譲渡</panel.string>
-	<panel.string name="text deed">譲渡</panel.string>
-	<panel.string name="text modify info 1">このオブジェクトを修正できます</panel.string>
-	<panel.string name="text modify info 2">これらのオブジェクトを修正できます</panel.string>
-	<panel.string name="text modify info 3">このオブジェクトを修正できません</panel.string>
-	<panel.string name="text modify info 4">これらのオブジェクトを修正できません</panel.string>
-	<panel.string name="text modify info 5">地域（リージョン）の境界を越えてこのオブジェクトを修正できません</panel.string>
-	<panel.string name="text modify info 6">地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません</panel.string>
-	<panel.string name="text modify warning">このオブジェクトには、パーツがリンクされています</panel.string>
-	<panel.string name="Cost Default">価格： L$</panel.string>
-	<panel.string name="Cost Total">合計価格: L$</panel.string>
-	<panel.string name="Cost Per Unit">Price Per: L$</panel.string>
-	<panel.string name="Cost Mixed">Mixed Price</panel.string>
-	<panel.string name="Sale Mixed">Mixed Sale</panel.string>
+	<panel.string name="text deed continued">
+		譲渡
+	</panel.string>
+	<panel.string name="text deed">
+		譲渡
+	</panel.string>
+	<panel.string name="text modify info 1">
+		このオブジェクトを修正できます
+	</panel.string>
+	<panel.string name="text modify info 2">
+		これらのオブジェクトを修正できます
+	</panel.string>
+	<panel.string name="text modify info 3">
+		このオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify info 4">
+		これらのオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify info 5">
+		地域（リージョン）の境界を越えてこのオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify info 6">
+		地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify warning">
+		このオブジェクトには、パーツがリンクされています
+	</panel.string>
+	<panel.string name="Cost Default">
+		価格： L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		合計価格: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Price Per: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Mixed Price
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Mixed Sale
+	</panel.string>
 	<text name="title" value="オブジェクトのプロフィール"/>
 	<text name="where" value="（インワールド）"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">名前：</text>
-		<text name="Description:">説明：</text>
-		<text name="CreatorNameLabel">制作者：</text>
-		<text name="Owner:">所有者：</text>
-		<text name="Group_label">グループ：</text>
+		<text name="Name:">
+			名前：
+		</text>
+		<text name="Description:">
+			説明：
+		</text>
+		<text name="CreatorNameLabel">
+			制作者：
+		</text>
+		<text name="Owner:">
+			所有者：
+		</text>
+		<text name="Group_label">
+			グループ：
+		</text>
 		<button name="button set group" tool_tip="このオブジェクト権限を共有するグループを選択します"/>
 		<name_box initial_value="ローディング..." name="Group Name Proxy"/>
 		<button label="譲渡" label_selected="譲渡" name="button deed" tool_tip="このアイテムを譲渡すると「次の所有者」の権限が適用されます。 グループ共有オブジェクトは、グループのオフィサーが譲渡できます。"/>
-		<text name="label click action">クリックで：</text>
+		<text name="label click action">
+			クリックで：
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
 			<combo_box.item label="オブジェクトに座る" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
 			<combo_box.item label="ズーム" name="Zoom"/>
+			<combo_box.item label="なし" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">このオブジェクトを修正できます</text>
-			<text name="Anyone can:">全員：</text>
+			<text name="perm_modify">
+				このオブジェクトを修正できます
+			</text>
+			<text name="Anyone can:">
+				全員：
+			</text>
 			<check_box label="コピー" name="checkbox allow everyone copy"/>
 			<check_box label="移動" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">グループ：</text>
+			<text name="GroupLabel">
+				グループ：
+			</text>
 			<check_box label="共有" name="checkbox share with group" tool_tip="設定したグループのメンバー全員にこのオブジェクトの修正権限を与えます。 譲渡しない限り、役割制限を有効にはできません。"/>
-			<text name="NextOwnerLabel">次の所有者：</text>
+			<text name="NextOwnerLabel">
+				次の所有者：
+			</text>
 			<check_box label="修正" name="checkbox next owner can modify"/>
 			<check_box label="コピー" name="checkbox next owner can copy"/>
 			<check_box label="再販・プレゼント" name="checkbox next owner can transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販できます"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="価格： L$" name="Edit Cost"/>
 		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
-		<text name="pathfinding_attributes_label">パスファインディング属性:</text>
-		<text name="B:">B.</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			パスファインディング属性:
+		</text>
+		<text name="B:">
+			B.
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="開く" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 5ca7ddd92c..422bb0764a 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -2227,6 +2227,18 @@ support@secondlife.com にお問い合わせください。
 	<string name="RegionInfoListTypeBannedAgents">
 		常に禁止
 	</string>
+	<string name="RegionInfoAllEstates">
+		すべての不動産
+	</string>
+	<string name="RegionInfoManagedEstates">
+		管理されている不動産
+	</string>
+	<string name="RegionInfoThisEstate">
+		この不動産
+	</string>
+	<string name="AndNMore">
+		および [EXTRA_COUNT] つの不動産
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		区画スクリプトメモリ
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml
index 074f7bf001..92b983169d 100644
--- a/indra/newview/skins/default/xui/pt/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pt/floater_auction.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="INICIAR VENDA DE TERRENO LINDEN START">
+<floater name="floater_auction" title="INICIAR VENDA DE TERRENO LINDEN">
 	<floater.string name="already for sale">
-		Você não pode leiloar terrenos que já estão configurados para venda.
+		Você não pode leiloar terrenos que já estão para venda.
 	</floater.string>
-	<check_box initial_value="true" label="Incluir marcador de seleção amarelo" name="fence_check"/>
+	<check_box initial_value="true" label="Incluir uma cerca de seleção amarela" name="fence_check"/>
 	<button label="Foto" label_selected="Foto" name="snapshot_btn"/>
 	<button label="Vender a qualquer um" label_selected="Vender a qualquer um" name="sell_to_anyone_btn"/>
-	<button label="Clear Settings" label_selected="Limpar configurações" name="reset_parcel_btn"/>
-	<button label="Iniciar Leilão" label_selected="Iniciar Leilão" name="start_auction_btn"/>
+	<button label="Limpar configurações" label_selected="Limpar configurações" name="reset_parcel_btn"/>
+	<button label="Iniciar leilão" label_selected="Iniciar leilão" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 356063a94f..20f0a009e7 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -73,9 +73,6 @@
 	<button label="Link" name="link_btn"/>
 	<button label="Desconectar links" name="unlink_btn"/>
 	<check_box label="Esticar ambos lados" name="checkbox uniform"/>
-	<text label="Esticar ambos lados" name="checkbox uniform label">
-		Esticar ambos lados
-	</text>
 	<check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Ajustar" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado">
@@ -201,6 +198,7 @@
 				<combo_box.item label="Pagar objeto" name="Payobject"/>
 				<combo_box.item label="Abrir" name="Open"/>
 				<combo_box.item label="Zoom" name="Zoom"/>
+				<combo_box.item label="Nenhum" name="None"/>
 			</combo_box>
 			<check_box label="À venda" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
@@ -408,82 +406,7 @@
 			<spinner label="Densidade em 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restituição" name="Physics Restitution"/>
 		</panel>
-		<panel label="Textura" name="Texture">
-			<panel.string name="string repeats per meter">
-				Repetir por Metro
-			</panel.string>
-			<panel.string name="string repeats per face">
-				Repetir por Face
-			</panel.string>
-			<texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
-			<color_swatch label="Cor" name="colorswatch" tool_tip="Selecionar a cor"/>
-			<text name="color trans" width="100">
-				Transparência %
-			</text>
-			<text name="glow label">
-				Brilho
-			</text>
-			<check_box label="Claridade" name="checkbox fullbright"/>
-			<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>
-			<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 bumpiness">
-				Ondulação
-			</text>
-			<combo_box name="combobox bumpiness" width="100">
-				<combo_box.item label="Nenhum" name="None"/>
-				<combo_box.item label="Claridade" name="Brightness"/>
-				<combo_box.item label="Escuridão" name="Darkness"/>
-				<combo_box.item label="Granulação" name="woodgrain"/>
-				<combo_box.item label="Casca" name="bark"/>
-				<combo_box.item label="Tijolos" name="bricks"/>
-				<combo_box.item label="Caixa" name="checker"/>
-				<combo_box.item label="Concreto" name="concrete"/>
-				<combo_box.item label="Encaroçado" name="crustytile"/>
-				<combo_box.item label="Pedra Cortante" name="cutstone"/>
-				<combo_box.item label="Discos" name="discs"/>
-				<combo_box.item label="Cascalho" name="gravel"/>
-				<combo_box.item label="Pedrisco" name="petridish"/>
-				<combo_box.item label="Revestimento" name="siding"/>
-				<combo_box.item label="Empedrado" name="stonetile"/>
-				<combo_box.item label="Grafiato" name="stucco"/>
-				<combo_box.item label="Sulcos" name="suction"/>
-				<combo_box.item label="Weave" name="weave"/>
-			</combo_box>
-			<spinner label="Horizontal (U)" name="TexScaleU"/>
-			<check_box label="Inverter" name="checkbox flip s"/>
-			<spinner label="Vertical (V)" name="TexScaleV"/>
-			<check_box label="Inverter" name="checkbox flip t"/>
-			<spinner label="Rotação˚" name="TexRot"/>
-			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
-			<text name="tex offset">
-				Offset de textura
-			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU"/>
-			<spinner label="Vertical (V)" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					Mídia
-				</text>
-				<button name="add_media" tool_tip="Adicionar mídia"/>
-				<button name="delete_media" tool_tip="Excluir esta textura de mídia"/>
-				<button name="edit_media" tool_tip="Editar esta mídia"/>
-				<button label="Alinhar" label_selected="Alinhar mídias" name="button align" tool_tip="Alinhar textura da mídia (após carregar mídia)"/>
-			</panel>
-		</panel>
+		<panel label="Textura" name="Texture"/>
 		<panel label="Conteúdo" name="Contents">
 			<button label="Novo script" label_selected="Novo script" name="button new script"/>
 			<button label="Autorizações" name="button permissions"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index a5d0c33969..bb68064b73 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Controles da câmera..." name="Camera Controls"/>
 		<menu label="Movimentos" name="Movement">
 			<menu_item_call label="Sentar" name="Sit Down Here"/>
+			<menu_item_call label="Ficar de pé" name="Stand up"/>
 			<menu_item_check label="Voar" name="Fly"/>
 			<menu_item_check label="Correr sempre" name="Always Run"/>
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
@@ -273,7 +274,6 @@
 			<menu_item_check label="Mostrar info da textura" name="Show Texture Info"/>
 			<menu_item_check label="Mostrar cor sob o cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="Mostrar memória" name="Show Memory"/>
-			<menu_item_check label="Exibir informações de memória privadas" name="Show Private Mem Info"/>
 			<menu_item_check label="Mostrar mudanças a objetos" name="Show Updates"/>
 		</menu>
 		<menu label="Force an Error" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index a7759e1b04..10b2c52877 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -1561,6 +1561,30 @@ Ultrapassa o limite de [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
 	<notification name="ProblemAddingEstateManagerBanned">
 		Não foi possível adicionar residentes banidos à lista de gerentes de propriedades.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Não foi possível adicionar o gerente [AGENT] à lista de banimento.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; já está na lista de Grupos permitidos.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] já está na sua [LIST_TYPE] lista.
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] já está na sua [LIST_TYPE] lista.
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] foi adicionado na [LIST_TYPE] lista de [ESTATE].
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] foi adicionado na [LIST_TYPE] lista de [ESTATE].
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] foi removido da [LIST_TYPE] lista de [ESTATE].
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] foi removido da [LIST_TYPE] lista de [ESTATE].
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Não é possível alterar a aparência até que as roupas e formas estejam carregadas.
 	</notification>
@@ -1864,7 +1888,7 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
 	</notification>
 	<notification label="Selecione a propriedade" name="EstateBannedAgentRemove">
-		Remover este residente da lista de banidos para acesso a esta propriedade apenas ou para [ALL_ESTATES]?
+		Remover este Residente da lista de banimento para acessar este estado somente ou para [ALL_ESTATES]?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
 	</notification>
 	<notification label="Selecione a propriedade" name="EstateManagerAdd">
@@ -3153,16 +3177,22 @@ Clique em Aceitar para atender ou em Recusar para recusar este convite.  Clique
 		Falha de conexão com [VOICE_CHANNEL_NAME]. Tente novamente mais tarde.   Agora você será reconectado ao bate-papo local.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Um ou mais serviços de distorção de voz que você assinou veceu.
-[[URL] Clique aqui] para renovar o serviço.
+		Um ou mais serviços de distorção de voz que você assinou venceu. 
+[[URL] Clique aqui] para renovar o serviço. 
+
+Se você é um Membro Premium, [[PREMIUM_URL] clique aqui] para receber o seu app de distorção de voz.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		A Distorção de voz ativa expirou. Suas configurações de voz padrão foram ativadas.
-[[URL] Clique aqui] para renovar o serviço.
+		A Distorção de voz ativa expirou. Suas configurações de voz padrão foram ativadas. 
+[[URL] Clique aqui] para renovar o serviço. 
+
+Se você é um Membro Premium, [[PREMIUM_URL] clique aqui] para receber o seu app de distorção de voz.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Uma ou mais das suas distorções de voz tem vencimento em menos de [INTERVAL] dias.
-[[URL] Clique aqui] para renovar o serviço.
+		Uma ou mais das suas distorções de voz tem vencimento em menos de [INTERVAL] dias. 
+[[URL] Clique aqui] para renovar o serviço. 
+
+Se você é um Membro Premium, [[PREMIUM_URL] clique aqui] para receber o seu app de distorção de voz.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Novas Distorções de voz!
@@ -3214,6 +3244,9 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
 	<notification name="SnapshotToComputerFailed">
 		Falha ao salvar fotografia em [PATH]: Disco cheio. [NEED_MEMORY]KB é necessário, mas somente [FREE_MEMORY]KB está livre.
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Falha ao salvar fotografia em [PATH]: O diretório não existe.
+	</notification>
 	<notification name="PresetNotSaved">
 		Erro ao salvar predefinição [NAME].
 	</notification>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index ffcf72b1b4..ffe637b3c1 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php?lang=pt</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=pt
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Nome de usuário" name="username_combo" tool_tip="O nome de usuário que você escolheu ao fazer seu cadastro, como zecazc12 ou Magia Solar"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Login" name="connect_btn"/>
 			<check_box label="Lembrar-me" name="remember_check"/>
-			<text name="forgot_password_text">Senha esquecida</text>
+			<text name="forgot_password_text">
+				Senha esquecida
+			</text>
 			<combo_box label="Selecionar grade" name="server_combo"/>
+			<text name="sign_up_text">
+				Cadastre-se
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_login_first.xml b/indra/newview/skins/default/xui/pt/panel_login_first.xml
index 6e4ef65bea..86c61163bc 100644
--- a/indra/newview/skins/default/xui/pt/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=pt
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						Senha esquecida
 					</text>
+					<text name="sign_up_text">
+						Cadastre-se
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_access.xml b/indra/newview/skins/default/xui/pt/panel_region_access.xml
new file mode 100644
index 0000000000..cc2136a459
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Acesso" name="Access">
+	<tab_container name="tabs">
+		<panel label="GERENTES" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Gerentes:
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Nome" name="name"/>
+			</name_list>
+			<button label="Adicionar..." name="add_estate_manager_btn"/>
+			<button label="Remover..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="PERMITIDO" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="Buscar agentes permitidos" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Sempre permitido:
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Nome" name="name"/>
+			</name_list>
+			<button label="Adicionar..." name="add_allowed_avatar_btn"/>
+			<button label="Remover..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="GRUPOS PERMITIDOS" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="Buscar grupos permitidos" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Grupos sempre permitidos:
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Nome" name="name"/>
+			</name_list>
+			<button label="Adicionar..." name="add_allowed_group_btn"/>
+			<button label="Remover..." name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="BANIDO" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Buscar agentes banidos" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Sempre banido:
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Nome" name="name"/>
+				<columns label="Último acesso" name="last_login_date"/>
+				<columns label="Data do banimento" name="ban_date"/>
+				<columns label="Banido por" name="bannedby"/>
+			</name_list>
+			<button label="Adicionar..." name="add_banned_avatar_btn"/>
+			<button label="Remover..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 8b405f601a..ac864ebb4b 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(desconhecido)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Permitir somente os residentes e os grupos listados abaixo" name="estate_restricted_access"/>
+		<radio_item label="Permitir somente residentes e grupos listados na aba Acesso" name="estate_restricted_access"/>
 		<radio_item label="Qualquer um pode visitar" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Deve ser maior de 18 anos" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar esta propriedade. Consulte o [SUPPORT_SITE] para obter mais informações."/>
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 bbfaa4a4f5..ed609dfc3d 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Perfil do objeto">
-	<panel.string name="text deed continued">Doar</panel.string>
-	<panel.string name="text deed">Doar</panel.string>
-	<panel.string name="text modify info 1">Você pode modificar este objeto</panel.string>
-	<panel.string name="text modify info 2">Você pode modificar estes objetos</panel.string>
-	<panel.string name="text modify info 3">Você não pode modificar este objeto</panel.string>
-	<panel.string name="text modify info 4">Você não pode modificar estes objetos</panel.string>
-	<panel.string name="text modify info 5">Não é possível modificar este objeto através de uma demarcação da região</panel.string>
-	<panel.string name="text modify info 6">Não é possível modificar estes objetos através de uma demarcação da região</panel.string>
-	<panel.string name="text modify warning">O objeto contém links ligando suas partes</panel.string>
-	<panel.string name="Cost Default">Preço: L$</panel.string>
-	<panel.string name="Cost Total">Preço total: L$</panel.string>
-	<panel.string name="Cost Per Unit">Preço unitário: L$</panel.string>
-	<panel.string name="Cost Mixed">Preço misto</panel.string>
-	<panel.string name="Sale Mixed">Venda mista</panel.string>
+	<panel.string name="text deed continued">
+		Doar
+	</panel.string>
+	<panel.string name="text deed">
+		Doar
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Você pode modificar este objeto
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Você pode modificar estes objetos
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Você não pode modificar este objeto
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Você não pode modificar estes objetos
+	</panel.string>
+	<panel.string name="text modify info 5">
+		Não é possível modificar este objeto através de uma demarcação da região
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Não é possível modificar estes objetos através de uma demarcação da região
+	</panel.string>
+	<panel.string name="text modify warning">
+		O objeto contém links ligando suas partes
+	</panel.string>
+	<panel.string name="Cost Default">
+		Preço: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Preço total: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Preço unitário: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Preço misto
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Venda mista
+	</panel.string>
 	<text name="title" value="Perfil do objeto"/>
 	<text name="where" value="(Inworld)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Nome:</text>
-		<text name="Description:">Descrição:</text>
-		<text name="CreatorNameLabel">Criador:</text>
-		<text name="Owner:">Proprietário:</text>
-		<text name="Group_label">Grupo:</text>
+		<text name="Name:">
+			Nome:
+		</text>
+		<text name="Description:">
+			Descrição:
+		</text>
+		<text name="CreatorNameLabel">
+			Criador:
+		</text>
+		<text name="Owner:">
+			Proprietário:
+		</text>
+		<text name="Group_label">
+			Grupo:
+		</text>
 		<button name="button set group" tool_tip="Selecione o grupo que terá acesso à autorização do objeto"/>
 		<name_box initial_value="Carregando..." name="Group Name Proxy"/>
 		<button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono. Objetos de grupos podem ser doados por um oficial do grupo."/>
-		<text name="label click action">Clique para:</text>
+		<text name="label click action">
+			Clique para:
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Tocar (padrão)" name="Touch/grab(default)"/>
 			<combo_box.item label="Sentar em objeto" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<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.item label="Nenhum" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Você pode modificar este objeto</text>
-			<text name="Anyone can:">Todos:</text>
+			<text name="perm_modify">
+				Você pode modificar este objeto
+			</text>
+			<text name="Anyone can:">
+				Todos:
+			</text>
 			<check_box label="Copiar" name="checkbox allow everyone copy"/>
 			<check_box label="Movimentar" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Grupo:</text>
+			<text name="GroupLabel">
+				Grupo:
+			</text>
 			<check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenham o seu nível de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
-			<text name="NextOwnerLabel">Próximo proprietário:</text>
+			<text name="NextOwnerLabel">
+				Próximo proprietário:
+			</text>
 			<check_box label="Modificar" name="checkbox next owner can modify"/>
 			<check_box label="Copiar" name="checkbox next owner can copy"/>
 			<check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Preço: L$" name="Edit Cost"/>
 		<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
-		<text name="pathfinding_attributes_label">Atributos do pathfinding:</text>
-		<text name="B:">B:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			Atributos do pathfinding:
+		</text>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Abrir" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index ee048e28e3..b2b5243531 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -2173,6 +2173,18 @@ Se você continuar a receber essa mensagem, entre em contato com o suporte do Se
 	<string name="RegionInfoListTypeBannedAgents">
 		Sempre banido
 	</string>
+	<string name="RegionInfoAllEstates">
+		todos os terrenos
+	</string>
+	<string name="RegionInfoManagedEstates">
+		administre terrenos
+	</string>
+	<string name="RegionInfoThisEstate">
+		este terreno
+	</string>
+	<string name="AndNMore">
+		e [EXTRA_COUNT] mais
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Memória de scripts no lote
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml
index 105c75c919..e6cc700024 100644
--- a/indra/newview/skins/default/xui/ru/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ru/floater_auction.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="НАЧАТЬ ПРОДАЖУ ЗЕМЛИ ЛИНДЕНОВ">
+<floater name="floater_auction" title="НАЧАТЬ ПРОДАЖУ ЗЕМЛИ LINDEN">
 	<floater.string name="already for sale">
 		Нельзя выставить на аукцион участки, которые уже продаются.
 	</floater.string>
 	<check_box initial_value="true" label="Включая желтую ограду вокруг выбранного участка" name="fence_check"/>
-	<button label="Снимок" label_selected="Снимок" name="snapshot_btn"/>
+	<button label="Моментальный снимок" label_selected="Моментальный снимок" name="snapshot_btn"/>
 	<button label="Купить может каждый" label_selected="Купить может каждый" name="sell_to_anyone_btn"/>
 	<button label="Очистить настройки" label_selected="Очистить настройки" name="reset_parcel_btn"/>
 	<button label="Начать аукцион" label_selected="Начать аукцион" name="start_auction_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
index a67745534c..be75210fe0 100644
--- a/indra/newview/skins/default/xui/ru/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tools.xml
@@ -201,6 +201,7 @@
 				<combo_box.item label="Заплатить за объект" name="Payobject"/>
 				<combo_box.item label="Открыть" name="Open"/>
 				<combo_box.item label="Увеличение" name="Zoom"/>
+				<combo_box.item label="Нет" name="None"/>
 			</combo_box>
 			<check_box label="Для продажи:" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 8a13197657..a2c45f0e9a 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Управление камерой..." name="Camera Controls"/>
 		<menu label="Движение" name="Movement">
 			<menu_item_call label="Сесть" name="Sit Down Here"/>
+			<menu_item_call label="Встать" name="Stand up"/>
 			<menu_item_check label="Полет" name="Fly"/>
 			<menu_item_check label="Всегда бегать" name="Always Run"/>
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
@@ -275,7 +276,6 @@
 			<menu_item_check label="Показать матрицы" name="Show Matrices"/>
 			<menu_item_check label="Показать цвет под курсором" name="Show Color Under Cursor"/>
 			<menu_item_check label="Показать память" name="Show Memory"/>
-			<menu_item_check label="Показать закрытые данные о памяти" name="Show Private Mem Info"/>
 			<menu_item_check label="Показать изменения объектов" name="Show Updates"/>
 		</menu>
 		<menu label="Принудительно вызвать ошибку" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 8f0fec9607..f3e510720c 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -1569,6 +1569,30 @@
 	<notification name="ProblemAddingEstateManagerBanned">
 		Невозможно добавить заблокированного жителя в список менеджеров землевладения.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Невозможно добавить заблокированного жителя в список менеджеров землевладения [AGENT].
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;\[GROUP]&lt;/nolink&gt; уже находится в списке допущенных групп.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] уже находится на вашем [LIST_TYPE] листе.
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] уже находится на вашем [LIST_TYPE] листе.
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT] был добавлен в [LIST_TYPE] лист [ESTATE].
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT] был добавлен в [LIST_TYPE] лист [ESTATE].
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT] был удален из [LIST_TYPE] листа [ESTATE].
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT] был удален из [LIST_TYPE] листа [ESTATE].
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Нельзя изменять внешность, пока загружаются одежда и фигура.
 	</notification>
@@ -1872,7 +1896,7 @@
 		<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Для всех землевладений" yestext="Для этого землевладения"/>
 	</notification>
 	<notification label="Выбрать землевладение" name="EstateBannedAgentRemove">
-		Удалить этого жителя из списка запрета доступа только для этого землевладения или для [ALL_ESTATES]?
+		Удалить этого жителя из списка заблокированного доступа только для этого землевладения или для [ALL_ESTATES]?
 		<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Для всех землевладений" yestext="Для этого землевладения"/>
 	</notification>
 	<notification label="Выбрать землевладение" name="EstateManagerAdd">
@@ -3164,16 +3188,22 @@
 		Не удалось подключиться к [VOICE_CHANNEL_NAME], повторите попытку позже.  Будет установлено подключение к локальному голосовому чату.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Истек срок действия одного или нескольких типов изменения голоса, на которые вы подписаны.
-[[URL] Щелкните здесь], чтобы обновить подписку.
+		Истек срок действия подписки на один или несколько типов анимационного изменения голоса. 
+[[URL] Щелкните здесь], чтобы обновить подписку. 
+
+Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		Истек срок действия активного типа изменения голоса, применены настройки вашего обычного голоса.
-[[URL] Щелкните здесь], чтобы обновить подписку.
+		Истек срок действия анимационного изменения голоса, действуют настройки вашего обычного голоса. 
+[[URL] Щелкните здесь], чтобы обновить подписку. 
+
+Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Срок действия одного или нескольких ваших типов изменения голоса истекает через [INTERVAL] дней или раньше.
-[[URL] Щелкните здесь], чтобы обновить подписку.
+		Срок действия одного или нескольких ваших типов анимационного изменения голоса истекает через [INTERVAL] дней или раньше. 
+[[URL] Щелкните здесь], чтобы обновить подписку. 
+
+Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Появились новые типы изменения голоса!
@@ -3225,6 +3255,9 @@
 	<notification name="SnapshotToComputerFailed">
 		Не удалось сохранить моментальный снимок на [PATH]: Диск переполнен. Необходимо [NEED_MEMORY] Кбайт, но доступно только  [FREE_MEMORY] Кбайт.
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Не удалось сохранить моментальный снимок на [PATH]: Каталог не существует.
+	</notification>
 	<notification name="PresetNotSaved">
 		Ошибка при сохранении пресета [NAME].
 	</notification>
diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 2e0ae89b28..14107286e5 100644
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Имя пользователя" name="username_combo" tool_tip="Имя пользователя, которое вы выбрали при регистрации, например, «bobsmith12» или «Steller Sunshine»"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Войти" name="connect_btn"/>
 			<check_box label="Запомнить меня" name="remember_check"/>
-			<text name="forgot_password_text">Забыли пароль?</text>
+			<text name="forgot_password_text">
+				Забыли пароль?
+			</text>
 			<combo_box label="Выберите сетку" name="server_combo"/>
+			<text name="sign_up_text">
+				Регистрация
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_login_first.xml b/indra/newview/skins/default/xui/ru/panel_login_first.xml
index bb4875373a..5db81ea7ca 100644
--- a/indra/newview/skins/default/xui/ru/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						Забытый пароль
 					</text>
+					<text name="sign_up_text">
+						Регистрация
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_access.xml b/indra/newview/skins/default/xui/ru/panel_region_access.xml
new file mode 100644
index 0000000000..48adfbcd95
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Доступ" name="Access">
+	<tab_container name="tabs">
+		<panel label="МЕНЕДЖЕРЫ ЗЕМЛЕВЛАДЕНИЯ" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Менеджеры землевладения:
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Имя" name="name"/>
+			</name_list>
+			<button label="Добавить..." name="add_estate_manager_btn"/>
+			<button label="Удалить..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="РАЗРЕШЕННЫЕ" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="Поиск допущенных агентов" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Разрешено всегда:
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Имя" name="name"/>
+			</name_list>
+			<button label="Добавить..." name="add_allowed_avatar_btn"/>
+			<button label="Удалить..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="ДОПУЩЕННЫЕ ГРУППЫ" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="Поиск допущенных групп" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Допуск групп всегда разрешен:
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Имя" name="name"/>
+			</name_list>
+			<button label="Добавить..." name="add_allowed_group_btn"/>
+			<button label="Удалить..." name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="ЗАБЛОКИРОВАНЫ" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Поиск заблокированных агентов" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Всегда заблокированы:
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Имя" name="name"/>
+				<columns label="Дата последнего входа" name="last_login_date"/>
+				<columns label="Дата блокировки" name="ban_date"/>
+				<columns label="Заблокированы по инициативе" name="bannedby"/>
+			</name_list>
+			<button label="Добавить..." name="add_banned_avatar_btn"/>
+			<button label="Удалить..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
index be93edf730..5789058b3b 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(неизвестно)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Разрешено только нижеперечисленным жителям и группам" name="estate_restricted_access"/>
+		<radio_item label="Разрешено только жителям и группам, перечисленным на вкладке доступа" name="estate_restricted_access"/>
 		<radio_item label="Доступ открыт для всех" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="Должен быть 18 и старше" name="limit_age_verified" tool_tip="Доступ к этому землевладению имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
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 4059a800f0..d7f96cab1f 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Профиль объекта">
-	<panel.string name="text deed continued">Сделка</panel.string>
-	<panel.string name="text deed">Сделка</panel.string>
-	<panel.string name="text modify info 1">Этот объект можно изменять</panel.string>
-	<panel.string name="text modify info 2">Эти объекты можно изменять</panel.string>
-	<panel.string name="text modify info 3">Этот объект нельзя изменять</panel.string>
-	<panel.string name="text modify info 4">Эти объекты нельзя изменять</panel.string>
-	<panel.string name="text modify info 5">Этот объект нельзя изменять через границу региона</panel.string>
-	<panel.string name="text modify info 6">Эти объекты нельзя изменять через границу региона</panel.string>
-	<panel.string name="text modify warning">Этот объект содержит объединенные части</panel.string>
-	<panel.string name="Cost Default">Цена: L$</panel.string>
-	<panel.string name="Cost Total">Итоговая цена: L$</panel.string>
-	<panel.string name="Cost Per Unit">Цена за: L$</panel.string>
-	<panel.string name="Cost Mixed">Смешанная цена</panel.string>
-	<panel.string name="Sale Mixed">Смешанная продажа</panel.string>
+	<panel.string name="text deed continued">
+		Сделка
+	</panel.string>
+	<panel.string name="text deed">
+		Сделка
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Этот объект можно изменять
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Эти объекты можно изменять
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Этот объект нельзя изменять
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Эти объекты нельзя изменять
+	</panel.string>
+	<panel.string name="text modify info 5">
+		Этот объект нельзя изменять через границу региона
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Эти объекты нельзя изменять через границу региона
+	</panel.string>
+	<panel.string name="text modify warning">
+		Этот объект содержит объединенные части
+	</panel.string>
+	<panel.string name="Cost Default">
+		Цена: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Итоговая цена: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Цена за: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Смешанная цена
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Смешанная продажа
+	</panel.string>
 	<text name="title" value="Профиль объекта"/>
 	<text name="where" value="(в мире)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Название:</text>
-		<text name="Description:">Описание:</text>
-		<text name="CreatorNameLabel">Создатель:</text>
-		<text name="Owner:">Владелец:</text>
-		<text name="Group_label">Группа:</text>
+		<text name="Name:">
+			Название:
+		</text>
+		<text name="Description:">
+			Описание:
+		</text>
+		<text name="CreatorNameLabel">
+			Создатель:
+		</text>
+		<text name="Owner:">
+			Владелец:
+		</text>
+		<text name="Group_label">
+			Группа:
+		</text>
 		<button name="button set group" tool_tip="Выберите группу для передачи ей прав доступа к объекту"/>
 		<name_box initial_value="Загрузка..." name="Group Name Proxy"/>
 		<button label="Сделка" label_selected="Сделка" name="button deed" tool_tip="В результате сделки объект передается группе, при этом права на него будут соответствовать правам следующего владельца. Переданный группе объект может передаваться должностным лицом группы."/>
-		<text name="label click action">Действие по щелчку:</text>
+		<text name="label click action">
+			Действие по щелчку:
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Коснуться (по умолчанию)" name="Touch/grab(default)"/>
 			<combo_box.item label="Сесть на объект" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
 			<combo_box.item label="Приблизить" name="Zoom"/>
+			<combo_box.item label="Нет" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Этот объект можно изменять</text>
-			<text name="Anyone can:">Все:</text>
+			<text name="perm_modify">
+				Этот объект можно изменять
+			</text>
+			<text name="Anyone can:">
+				Все:
+			</text>
 			<check_box label="Копировать" name="checkbox allow everyone copy"/>
 			<check_box label="Переместить" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Группа:</text>
+			<text name="GroupLabel">
+				Группа:
+			</text>
 			<check_box label="Поделиться" name="checkbox share with group" tool_tip="Позволить всем участникам выбранной группы получить установленные вам права на этот объект. Для включения ролевых ограничений необходимо произвести сделку."/>
-			<text name="NextOwnerLabel">Следующий владелец:</text>
+			<text name="NextOwnerLabel">
+				Следующий владелец:
+			</text>
 			<check_box label="Изменять" name="checkbox next owner can modify"/>
 			<check_box label="Копировать" name="checkbox next owner can copy"/>
 			<check_box label="Передать" name="checkbox next owner can transfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Цена: L$" name="Edit Cost"/>
 		<check_box label="Показать в результатах поиска" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
-		<text name="pathfinding_attributes_label">Атрибуты поиска пути:</text>
-		<text name="B:">Н:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">В:</text>
-		<text name="N:">С:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			Атрибуты поиска пути:
+		</text>
+		<text name="B:">
+			Н:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			В:
+		</text>
+		<text name="N:">
+			С:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Открыть" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 95225da7d0..c623fd4586 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -2226,6 +2226,18 @@ support@secondlife.com.
 	<string name="RegionInfoListTypeBannedAgents">
 		Всегда заблокированы
 	</string>
+	<string name="RegionInfoAllEstates">
+		все землевладения
+	</string>
+	<string name="RegionInfoManagedEstates">
+		управляемые землевладения
+	</string>
+	<string name="RegionInfoThisEstate">
+		это землевладение
+	</string>
+	<string name="AndNMore">
+		и \[EXTRA_COUNT] более
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Память под скрипты на участке
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_auction.xml b/indra/newview/skins/default/xui/tr/floater_auction.xml
index 3c945a9c96..dccf47d819 100644
--- a/indra/newview/skins/default/xui/tr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/tr/floater_auction.xml
@@ -3,8 +3,8 @@
 	<floater.string name="already for sale">
 		Zaten satışa çıkarılmış olan parselleri açık artırmaya sunamazsınız.
 	</floater.string>
-	<check_box initial_value="true" label="Sarı seçim çiti dahil edilsin" name="fence_check"/>
-	<button label="Anlık Görüntü" label_selected="Anlık Görüntü" name="snapshot_btn"/>
+	<check_box initial_value="true" label="Sarı seçim çitini dahil et" name="fence_check"/>
+	<button label="Anlık görüntü" label_selected="Anlık görüntü" name="snapshot_btn"/>
 	<button label="Herkese Sat" label_selected="Herkese Sat" name="sell_to_anyone_btn"/>
 	<button label="Ayarları Temizle" label_selected="Ayarları Temizle" name="reset_parcel_btn"/>
 	<button label="Açık Artırmayı Başlat" label_selected="Açık Artırmayı Başlat" name="start_auction_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
index 56df06f83b..55f0e6a279 100644
--- a/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -201,6 +201,7 @@
 				<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.item label="Yok" name="None"/>
 			</combo_box>
 			<check_box label="Satılık:" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index bc2f08db42..2cb8c3f906 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="Kamera Denetimleri..." name="Camera Controls"/>
 		<menu label="Hareket" name="Movement">
 			<menu_item_call label="Otur" name="Sit Down Here"/>
+			<menu_item_call label="Kalk" name="Stand up"/>
 			<menu_item_check label="Uç" name="Fly"/>
 			<menu_item_check label="Daima Koş" name="Always Run"/>
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
@@ -276,7 +277,6 @@
 			<menu_item_check label="Matrisleri Göster" name="Show Matrices"/>
 			<menu_item_check label="İmlecin Altındaki Rengi Göster" name="Show Color Under Cursor"/>
 			<menu_item_check label="Belleği Göster" name="Show Memory"/>
-			<menu_item_check label="Özel Bellek Bilgisini Göster" name="Show Private Mem Info"/>
 			<menu_item_check label="Nesneler İçin Güncelleştirmeleri Göster" name="Show Updates"/>
 		</menu>
 		<menu label="Bir Hatayı Zorla" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index d09d485a14..22bb9b8640 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -1570,6 +1570,30 @@ Lütfen sadece bir nesne seçin ve tekrar deneyin.
 	<notification name="ProblemAddingEstateManagerBanned">
 		Engellenmiş sakin, gayrimenkul yöneticisi listesine eklenemez.
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		Gayrimenkul yöneticisi [AGENT] engellenen listesine eklenemiyor.
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt; zaten İzin Verilen Gruplar listesinde yer alıyor.
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT] zaten [LIST_TYPE] listenizde yer alıyor.
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT] zaten [LIST_TYPE] listenizde yer alıyor.
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT], [ESTATE] [LIST_TYPE] listesine eklendi.
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT], [ESTATE] [LIST_TYPE] listesine eklendi.
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT], [ESTATE] [LIST_TYPE] listesinden kaldırıldı.
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT], [ESTATE] [LIST_TYPE] listesinden kaldırıldı.
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		Giysi ve şekil yüklenene kadar görünüm değiştirilemez.
 	</notification>
@@ -1873,7 +1897,7 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
 		<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
 	</notification>
 	<notification label="Gayrimenkul seç" name="EstateBannedAgentRemove">
-		Bu Sakin sadece bu gayrimenkul için mi yasaklı listesinden çıkarılsın, yoksa [ALL_ESTATES] için mi?
+		Bu Sakin sadece bu gayrimenkul için mi yoksa [ALL_ESTATES] için mi erişim yasağı listesinden çıkarılsın?
 		<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
 	</notification>
 	<notification label="Gayrimenkul seç" name="EstateManagerAdd">
@@ -3164,16 +3188,22 @@ Sohbete katılmak için Kabul Et&apos;i, daveti geri çevirmek için ise Reddet&
 		[VOICE_CHANNEL_NAME] ile bağlantı kurulamadı, lütfen daha sonra tekrar deneyin. Şimdi Yakındaki bir Sesli Sohbete yeniden bağlanılacaksınız.
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		Abone olduğunuz Ses Şekillerinden birinin ya da daha fazlasının süresi dolmuş.
-Aboneliğinizi yenilemek için [[URL] burayı tıklatın].
+		Abone olduğunuz Ses Dönüşümlerinden birinin ya da daha fazlasının süresi dolmuş. 
+Aboneliğinizi yenilemek için [[URL] buraya tıklayın]. 
+
+Özel Üye iseniz, ses dönüştürme özelliğini almak için [[PREMIUM_URL] buraya tıklayın].
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		Etkin Ses Şeklinin süresi dolmuş, normal ses ayarlarınız uygulandı.
-Aboneliğinizi yenilemek için [[URL] burayı tıklatın].
+		Etkin Ses Dönüşümünün süresi dolmuş, normal ses ayarlarınız uygulandı. 
+Aboneliğinizi yenilemek için [[URL] buraya tıklayın]. 
+
+Özel Üye iseniz, ses dönüştürme özelliğini almak için [[PREMIUM_URL] buraya tıklayın].
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		Abone olduğunuz Ses Şekillerinden birinin ya da daha fazlasının süresi [INTERVAL] gün içinde dolacak.
-Aboneliğinizi yenilemek için [[URL] burayı tıklatın].
+		Ses Dönüşümlerinizden birinin ya da daha fazlasının süresi [INTERVAL] günden daha az bir zamanda dolacak. 
+Aboneliğinizi yenilemek için [[URL] buraya tıklayın]. 
+
+Özel Üye iseniz, ses dönüştürme özelliğini almak için [[PREMIUM_URL] buraya tıklayın].
 	</notification>
 	<notification name="VoiceEffectsNew">
 		Yeni Ses Şekilleri kullanılabilir!
@@ -3225,6 +3255,9 @@ Güvenliğiniz için birkaç saniye engellenecek.
 	<notification name="SnapshotToComputerFailed">
 		Anlık görüntü [PATH] yoluna kaydedilemedi: Disk dolu. [NEED_MEMORY]KB gerekli ancak yalnızca [FREE_MEMORY]KB boş.
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		Anlık görüntü [PATH] yoluna kaydedilemedi: Dizin mevcut değil.
+	</notification>
 	<notification name="PresetNotSaved">
 		Ön ayar ([NAME]) kaydedilirken hata oluştu.
 	</notification>
diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml
index 8b320ce9aa..e9fec9783f 100644
--- a/indra/newview/skins/default/xui/tr/panel_login.xml
+++ b/indra/newview/skins/default/xui/tr/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="Kullanıcı Adı" name="username_combo" tool_tip="Kaydolduğunuzda seçtiğiniz kullanıcı adı, örn. mustafayalcin12 veya Faruk Gungoren"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="Oturum Aç" name="connect_btn"/>
 			<check_box label="Beni hatırla" name="remember_check"/>
-			<text name="forgot_password_text">Parolamı unuttum</text>
+			<text name="forgot_password_text">
+				Parolamı unuttum
+			</text>
 			<combo_box label="Ağ seç" name="server_combo"/>
+			<text name="sign_up_text">
+				Kaydol
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_login_first.xml b/indra/newview/skins/default/xui/tr/panel_login_first.xml
index 622edd0a8d..1fc80c2b97 100644
--- a/indra/newview/skins/default/xui/tr/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/tr/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						Parolamı unuttum
 					</text>
+					<text name="sign_up_text">
+						Kaydol
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_access.xml b/indra/newview/skins/default/xui/tr/panel_region_access.xml
new file mode 100644
index 0000000000..57e721bc04
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Erişim" name="Access">
+	<tab_container name="tabs">
+		<panel label="GAYRİMENKUL YÖNETİCİLERİ" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				Gayrimenkul Yöneticileri:
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="Ad" name="name"/>
+			</name_list>
+			<button label="Ekle..." name="add_estate_manager_btn"/>
+			<button label="Kaldır..." name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="İZİN VERİLEN" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="İzin verilen aracıları ara" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				Her zaman izin verilen:
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="Ad" name="name"/>
+			</name_list>
+			<button label="Ekle..." name="add_allowed_avatar_btn"/>
+			<button label="Kaldır..." name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="İZİN VERİLEN GRUPLAR" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="İzin verilen grupları ara" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				Her zaman izin verilen gruplar:
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="Ad" name="name"/>
+			</name_list>
+			<button label="Ekle..." name="add_allowed_group_btn"/>
+			<button label="Kaldır..." name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="ENGELLENEN" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="Engellenen aracıları ara" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				Her zaman engellenen:
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="Ad" name="name"/>
+				<columns label="Son oturum açma tarihi" name="last_login_date"/>
+				<columns label="Engellenme tarihi" name="ban_date"/>
+				<columns label="Engelleyen" name="bannedby"/>
+			</name_list>
+			<button label="Ekle..." name="add_banned_avatar_btn"/>
+			<button label="Kaldır..." name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
index fc8dab9c69..ad5553c582 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		(bilinmiyor)
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="Yalnızca aşağıda listelenen sakinlere ve gruplara izin ver" name="estate_restricted_access"/>
+		<radio_item label="Sadece Erişim sekmesinde listelenen sakinlere ve gruplara izin ver" name="estate_restricted_access"/>
 		<radio_item label="Herkes ziyaret edebilir" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="18 yaşından büyük olmalıdır" name="limit_age_verified" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için 18 veya üzeri bir yaşta olmaları gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
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 ddb4bbf160..d3d3d4e0f5 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="Nesne Profili">
-	<panel.string name="text deed continued">Devret</panel.string>
-	<panel.string name="text deed">Devret</panel.string>
-	<panel.string name="text modify info 1">Bu nesneyi değiştirebilirsiniz</panel.string>
-	<panel.string name="text modify info 2">Bu nesneleri değiştirebilirsiniz</panel.string>
-	<panel.string name="text modify info 3">Bu nesneyi değiştiremezsiniz</panel.string>
-	<panel.string name="text modify info 4">Bu nesneleri değiştiremezsiniz</panel.string>
-	<panel.string name="text modify info 5">Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz</panel.string>
-	<panel.string name="text modify info 6">Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz</panel.string>
-	<panel.string name="text modify warning">Bu nesne bağlantılı parçalara sahip</panel.string>
-	<panel.string name="Cost Default">Fiyat: L$</panel.string>
-	<panel.string name="Cost Total">Toplam Fiyat: L$</panel.string>
-	<panel.string name="Cost Per Unit">Birim Fiyatı: L$</panel.string>
-	<panel.string name="Cost Mixed">Karma Fiyat</panel.string>
-	<panel.string name="Sale Mixed">Karma Satış</panel.string>
+	<panel.string name="text deed continued">
+		Devret
+	</panel.string>
+	<panel.string name="text deed">
+		Devret
+	</panel.string>
+	<panel.string name="text modify info 1">
+		Bu nesneyi değiştirebilirsiniz
+	</panel.string>
+	<panel.string name="text modify info 2">
+		Bu nesneleri değiştirebilirsiniz
+	</panel.string>
+	<panel.string name="text modify info 3">
+		Bu nesneyi değiştiremezsiniz
+	</panel.string>
+	<panel.string name="text modify info 4">
+		Bu nesneleri değiştiremezsiniz
+	</panel.string>
+	<panel.string name="text modify info 5">
+		Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz
+	</panel.string>
+	<panel.string name="text modify warning">
+		Bu nesne bağlantılı parçalara sahip
+	</panel.string>
+	<panel.string name="Cost Default">
+		Fiyat: L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		Toplam Fiyat: L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		Birim Fiyatı: L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		Karma Fiyat
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		Karma Satış
+	</panel.string>
 	<text name="title" value="Nesne Profili"/>
 	<text name="where" value="(SL Dünyası)"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">Ad:</text>
-		<text name="Description:">Açıklama:</text>
-		<text name="CreatorNameLabel">Oluşturan:</text>
-		<text name="Owner:">Sahip:</text>
-		<text name="Group_label">Grup:</text>
+		<text name="Name:">
+			Ad:
+		</text>
+		<text name="Description:">
+			Açıklama:
+		</text>
+		<text name="CreatorNameLabel">
+			Oluşturan:
+		</text>
+		<text name="Owner:">
+			Sahip:
+		</text>
+		<text name="Group_label">
+			Grup:
+		</text>
 		<button name="button set group" tool_tip="Bu nesnenin izinlerini paylaşmak için bir grup seçin"/>
 		<name_box initial_value="Yükleniyor..." name="Group Name Proxy"/>
 		<button label="Devret" label_selected="Devret" name="button deed" tool_tip="Bu nesne devredilerek verildiğinde, nesnenin sonraki sahibi için izinler geçerli olur. Grup içerisinde paylaşılan nesneler bir grup yetkilisi tarafından devredilebilir."/>
-		<text name="label click action">Şu eylem için tıklayın:</text>
+		<text name="label click action">
+			Şu eylem için tıklayın:
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="Dokun (varsayılan)" name="Touch/grab(default)"/>
 			<combo_box.item label="Nesnenin üzerine otur" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<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.item label="Yok" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">Bu nesneyi değiştirebilirsiniz</text>
-			<text name="Anyone can:">Herkes:</text>
+			<text name="perm_modify">
+				Bu nesneyi değiştirebilirsiniz
+			</text>
+			<text name="Anyone can:">
+				Herkes:
+			</text>
 			<check_box label="Kopyala" name="checkbox allow everyone copy"/>
 			<check_box label="Hareket Et" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">Grup:</text>
+			<text name="GroupLabel">
+				Grup:
+			</text>
 			<check_box label="Paylaş" name="checkbox share with group" tool_tip="Ayarlanan grubun tüm üyelerinin, bu nesne için değiştirme izinlerinizi paylaşmasına izin verir. Rol kısıtlamalarını etkinleştirmek için Devretme yapmalısınız."/>
-			<text name="NextOwnerLabel">Sonraki sahip:</text>
+			<text name="NextOwnerLabel">
+				Sonraki sahip:
+			</text>
 			<check_box label="Değiştir" name="checkbox next owner can modify"/>
 			<check_box label="Kopyala" name="checkbox next owner can copy"/>
 			<check_box label="Aktar" name="checkbox next owner can transfer" tool_tip="Sonraki sahibi bu nesneyi verebilir veya tekrar satabilir"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="Fiyat: L$" name="Edit Cost"/>
 		<check_box label="Aramada göster" name="search_check" tool_tip="Kişiler arama sonuçlarında bu nesneyi görebilsin"/>
-		<text name="pathfinding_attributes_label">Yol bulma özellikleri:</text>
-		<text name="B:">B:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			Yol bulma özellikleri:
+		</text>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="Aç" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 6850c67df3..c32f37a1ee 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -2226,6 +2226,18 @@ Bu mesaj size gelmeye devam ederse lütfen http://support.secondlife.com adresin
 	<string name="RegionInfoListTypeBannedAgents">
 		Her zaman engellenen
 	</string>
+	<string name="RegionInfoAllEstates">
+		tüm gayrimenkuller
+	</string>
+	<string name="RegionInfoManagedEstates">
+		yönetilen gayrimenkuller
+	</string>
+	<string name="RegionInfoThisEstate">
+		bu gayrimenkul
+	</string>
+	<string name="AndNMore">
+		ve [EXTRA_COUNT] tane daha
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		Parsel Komut Dosyası Belleği
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
index 1b589a92cc..0ab94160c2 100644
--- a/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/indra/newview/skins/default/xui/zh/floater_auction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="開始 Linden 土地出售">
+<floater name="floater_auction" title="開始Linden土地出售">
 	<floater.string name="already for sale">
 		出售中的地段無法進行拍賣。
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 175e2bf7a4..1545e1b3b4 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -201,6 +201,7 @@
 				<combo_box.item label="支付物件" name="Payobject"/>
 				<combo_box.item label="打開" name="Open"/>
 				<combo_box.item label="縮放" name="Zoom"/>
+				<combo_box.item label="無" name="None"/>
 			</combo_box>
 			<check_box label="出售中：" name="checkbox for sale"/>
 			<spinner label="L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 58deb5a139..500e954089 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -12,6 +12,7 @@
 		<menu_item_call label="攝影機控制…" name="Camera Controls"/>
 		<menu label="動作" name="Movement">
 			<menu_item_call label="坐下" name="Sit Down Here"/>
+			<menu_item_call label="起立" name="Stand up"/>
 			<menu_item_check label="飛行" name="Fly"/>
 			<menu_item_check label="以跑代步" name="Always Run"/>
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
@@ -276,7 +277,6 @@
 			<menu_item_check label="顯示矩陣" name="Show Matrices"/>
 			<menu_item_check label="游標下顯示顏色" name="Show Color Under Cursor"/>
 			<menu_item_check label="顯示記憶體" name="Show Memory"/>
-			<menu_item_check label="顯示私區記憶體資訊" name="Show Private Mem Info"/>
 			<menu_item_check label="顯示更新到物件" name="Show Updates"/>
 		</menu>
 		<menu label="強制錯誤" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index c418ce72cc..2e7333ac3c 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1563,6 +1563,30 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ProblemAddingEstateManagerBanned">
 		無法把被封鎖的居民加入領地的管理人名單。
 	</notification>
+	<notification name="ProblemBanningEstateManager">
+		無法將領地管理人[AGENT]加入封鎖名單。
+	</notification>
+	<notification name="GroupIsAlreadyInList">
+		&lt;nolink&gt;[GROUP]&lt;/nolink&gt;已在獲准群組名單中。
+	</notification>
+	<notification name="AgentIsAlreadyInList">
+		[AGENT]已在你的[LIST_TYPE]名單。
+	</notification>
+	<notification name="AgentsAreAlreadyInList">
+		[AGENT]已在你的[LIST_TYPE]名單。
+	</notification>
+	<notification name="AgentWasAddedToList">
+		[AGENT]已新增到[ESTATE]的[LIST_TYPE]名單。
+	</notification>
+	<notification name="AgentsWereAddedToList">
+		[AGENT]已新增到[ESTATE]的[LIST_TYPE]名單。
+	</notification>
+	<notification name="AgentWasRemovedFromList">
+		[AGENT]已從[ESTATE]的[LIST_TYPE]名單中被移除。
+	</notification>
+	<notification name="AgentsWereRemovedFromList">
+		[AGENT]已從[ESTATE]的[LIST_TYPE]名單中被移除。
+	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		無法變更外觀，直到服裝與體形下載完畢。
 	</notification>
@@ -3162,14 +3186,20 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="VoiceEffectsExpired">
 		至少一個你訂用的變聲效果已經過期。
 [[URL] 點按這裡] 繼續訂用。
+
+付費用戶請[[PREMIUM_URL] 點按這裡]領取免費變聲工具。
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
 		使用中的變聲效果已經過期，已用你平時的聲音設定取代。
-[[URL] 點按這裡] 繼續訂用。
+[[URL] 點按這裡]繼續訂用。
+
+付費用戶請[[PREMIUM_URL] 點按這裡]領取免費變聲工具。
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
 		至少一個你訂用的變聲效果將在 [INTERVAL] 天後到期。
-[[URL] 點按這裡] 繼續訂用。
+[[URL] 點按這裡]繼續訂用。
+
+付費用戶請[[PREMIUM_URL] 點按這裡]領取免費變聲工具。
 	</notification>
 	<notification name="VoiceEffectsNew">
 		新的變聲效果上市了！
@@ -3221,6 +3251,9 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="SnapshotToComputerFailed">
 		將快照儲存於[PATH]時失敗：磁碟已滿。 需要[NEED_MEMORY]KB的空間，但只剩[FREE_MEMORY]KB空間。
 	</notification>
+	<notification name="SnapshotToLocalDirNotExist">
+		將快照儲存於[PATH]時失敗：目錄不存在。
+	</notification>
 	<notification name="PresetNotSaved">
 		儲存預設名稱[NAME]時出錯。
 	</notification>
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
index 5292e5fc38..59618972af 100644
--- a/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="panel_login">
-	<panel.string name="forgot_password_url">http://secondlife.com/account/request.php</panel.string>
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</panel.string>
+	<panel.string name="sign_up_url">
+		https://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
 			<combo_box label="使用者名稱" name="username_combo" tool_tip="使用者名稱是你註冊時所挑選的，例如 bobsmith12 或 Steller Sunshine"/>
@@ -11,8 +16,13 @@
 			</combo_box>
 			<button label="登入" name="connect_btn"/>
 			<check_box label="記得我" name="remember_check"/>
-			<text name="forgot_password_text">忘記密碼</text>
+			<text name="forgot_password_text">
+				忘記密碼
+			</text>
 			<combo_box label="選擇模擬世界" name="server_combo"/>
+			<text name="sign_up_text">
+				註冊
+			</text>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_login_first.xml b/indra/newview/skins/default/xui/zh/panel_login_first.xml
index a8af615b7c..4d72fcdd03 100644
--- a/indra/newview/skins/default/xui/zh/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login_first.xml
@@ -3,6 +3,9 @@
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
+	<panel.string name="sign_up_url">
+		http://join.secondlife.com/
+	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
 			<layout_stack name="widget_stack">
@@ -14,6 +17,9 @@
 					<text name="forgot_password_text">
 						忘記密碼
 					</text>
+					<text name="sign_up_text">
+						註冊
+					</text>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_access.xml b/indra/newview/skins/default/xui/zh/panel_region_access.xml
new file mode 100644
index 0000000000..7842d26321
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_region_access.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="出入許可" name="Access">
+	<tab_container name="tabs">
+		<panel label="領地管理員" name="estate_managers_panel">
+			<text name="estate_manager_label">
+				領地管理員：
+			</text>
+			<name_list name="estate_manager_name_list">
+				<columns label="名稱" name="name"/>
+			</name_list>
+			<button label="新增…" name="add_estate_manager_btn"/>
+			<button label="移除…" name="remove_estate_manager_btn"/>
+		</panel>
+		<panel label="獲准" name="allowed_panel">
+			<panel label="top_panel" name="allowed_search_panel">
+				<filter_editor label="搜尋獲准的用戶" name="allowed_search_input"/>
+			</panel>
+			<text name="allow_resident_label">
+				永遠准許：
+			</text>
+			<name_list name="allowed_avatar_name_list">
+				<columns label="名稱" name="name"/>
+			</name_list>
+			<button label="新增…" name="add_allowed_avatar_btn"/>
+			<button label="移除…" name="remove_allowed_avatar_btn"/>
+		</panel>
+		<panel label="准許的群組" name="allowed_groups_panel">
+			<panel label="top_panel" name="allowed_group_search_panel">
+				<filter_editor label="搜尋獲准的群組" name="allowed_group_search_input"/>
+			</panel>
+			<text name="allow_group_label">
+				永遠准許的群組：
+			</text>
+			<name_list name="allowed_group_name_list">
+				<columns label="名稱" name="name"/>
+			</name_list>
+			<button label="新增…" name="add_allowed_group_btn"/>
+			<button label="移除…" name="remove_allowed_group_btn"/>
+		</panel>
+		<panel label="禁入的" name="banned_panel">
+			<panel label="top_panel" name="banned_search_panel">
+				<filter_editor label="搜尋禁入的用戶" name="banned_search_input"/>
+			</panel>
+			<text name="ban_resident_label">
+				永遠禁入：
+			</text>
+			<name_list name="banned_avatar_name_list">
+				<columns label="名稱" name="name"/>
+				<columns label="上次登入日期" name="last_login_date"/>
+				<columns label="遭禁日期" name="ban_date"/>
+				<columns label="封鎖者：" name="bannedby"/>
+			</name_list>
+			<button label="新增…" name="add_banned_avatar_btn"/>
+			<button label="移除…" name="remove_banned_avatar_btn"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index 3825e7ab23..b25f6975c9 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -16,7 +16,7 @@
 		（未知）
 	</text>
 	<radio_group name="externally_visible_radio">
-		<radio_item label="只允許下列的居民和群組" name="estate_restricted_access"/>
+		<radio_item label="只允許名列於「准入」頁籤的居民和群組" name="estate_restricted_access"/>
 		<radio_item label="任何人都可造訪" name="estate_public_access"/>
 	</radio_group>
 	<check_box label="必須滿18歲" name="limit_age_verified" tool_tip="居民必須年滿 18 歲才能進入這領地。 參閱 [SUPPORT_SITE] 獲取進一步資訊。"/>
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 0884f1789b..8cb2721fce 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -1,31 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="物件檔案">
-	<panel.string name="text deed continued">讓渡</panel.string>
-	<panel.string name="text deed">讓渡</panel.string>
-	<panel.string name="text modify info 1">你能修改這個物件</panel.string>
-	<panel.string name="text modify info 2">你能修改這些物件</panel.string>
-	<panel.string name="text modify info 3">你不能修改這個物件</panel.string>
-	<panel.string name="text modify info 4">你不能修改這些物件</panel.string>
-	<panel.string name="text modify info 5">無法跨地區修改這個物件</panel.string>
-	<panel.string name="text modify info 6">無法跨地區修改這些物件</panel.string>
-	<panel.string name="text modify warning">這個物件含有聯結的部分</panel.string>
-	<panel.string name="Cost Default">價格： L$</panel.string>
-	<panel.string name="Cost Total">總價格：L$</panel.string>
-	<panel.string name="Cost Per Unit">單價：L$</panel.string>
-	<panel.string name="Cost Mixed">混合價格</panel.string>
-	<panel.string name="Sale Mixed">混合銷售</panel.string>
+	<panel.string name="text deed continued">
+		讓渡
+	</panel.string>
+	<panel.string name="text deed">
+		讓渡
+	</panel.string>
+	<panel.string name="text modify info 1">
+		你能修改這個物件
+	</panel.string>
+	<panel.string name="text modify info 2">
+		你能修改這些物件
+	</panel.string>
+	<panel.string name="text modify info 3">
+		你不能修改這個物件
+	</panel.string>
+	<panel.string name="text modify info 4">
+		你不能修改這些物件
+	</panel.string>
+	<panel.string name="text modify info 5">
+		無法跨地區修改這個物件
+	</panel.string>
+	<panel.string name="text modify info 6">
+		無法跨地區修改這些物件
+	</panel.string>
+	<panel.string name="text modify warning">
+		這個物件含有聯結的部分
+	</panel.string>
+	<panel.string name="Cost Default">
+		價格： L$
+	</panel.string>
+	<panel.string name="Cost Total">
+		總價格：L$
+	</panel.string>
+	<panel.string name="Cost Per Unit">
+		單價：L$
+	</panel.string>
+	<panel.string name="Cost Mixed">
+		混合價格
+	</panel.string>
+	<panel.string name="Sale Mixed">
+		混合銷售
+	</panel.string>
 	<text name="title" value="物件檔案"/>
 	<text name="where" value="（在虛擬世界）"/>
 	<panel label="" name="properties_panel">
-		<text name="Name:">名稱：</text>
-		<text name="Description:">描述：</text>
-		<text name="CreatorNameLabel">創造者：</text>
-		<text name="Owner:">所有人：</text>
-		<text name="Group_label">群組：</text>
+		<text name="Name:">
+			名稱：
+		</text>
+		<text name="Description:">
+			描述：
+		</text>
+		<text name="CreatorNameLabel">
+			創造者：
+		</text>
+		<text name="Owner:">
+			所有人：
+		</text>
+		<text name="Group_label">
+			群組：
+		</text>
 		<button name="button set group" tool_tip="選擇一個群組以分享這物件的權限"/>
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
 		<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="「讓渡」會把這物件贈送出去並賦予「下一個所有人」權限。 群組所分享的物件可由群組職員加以讓渡。"/>
-		<text name="label click action">點按以：</text>
+		<text name="label click action">
+			點按以：
+		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="觸碰（預設）" name="Touch/grab(default)"/>
 			<combo_box.item label="坐在物件上" name="Sitonobject"/>
@@ -33,15 +73,24 @@
 			<combo_box.item label="支付物件" name="Payobject"/>
 			<combo_box.item label="打開" name="Open"/>
 			<combo_box.item label="縮放" name="Zoom"/>
+			<combo_box.item label="無" name="None"/>
 		</combo_box>
 		<panel name="perms_inv">
-			<text name="perm_modify">你能修改這個物件</text>
-			<text name="Anyone can:">任何人：</text>
+			<text name="perm_modify">
+				你能修改這個物件
+			</text>
+			<text name="Anyone can:">
+				任何人：
+			</text>
 			<check_box label="恚庨" name="checkbox allow everyone copy"/>
 			<check_box label="移動" name="checkbox allow everyone move"/>
-			<text name="GroupLabel">群組：</text>
+			<text name="GroupLabel">
+				群組：
+			</text>
 			<check_box label="分享" name="checkbox share with group" tool_tip="允許此群組所有成員共享你修改此物件的權限。 你必須讓渡才能啟動角色限制。"/>
-			<text name="NextOwnerLabel">下一個所有人：</text>
+			<text name="NextOwnerLabel">
+				下一個所有人：
+			</text>
 			<check_box label="修改" name="checkbox next owner can modify"/>
 			<check_box label="恚庨" name="checkbox next owner can copy"/>
 			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個所有人可贈送或轉售這個物件"/>
@@ -54,13 +103,27 @@
 		</combo_box>
 		<spinner label="價格： L$" name="Edit Cost"/>
 		<check_box label="顯示在搜尋中" name="search_check" tool_tip="讓其他人可以在搜尋結果中察看到此物件"/>
-		<text name="pathfinding_attributes_label">尋徑屬性：</text>
-		<text name="B:">B:</text>
-		<text name="O:">O:</text>
-		<text name="G:">G:</text>
-		<text name="E:">E:</text>
-		<text name="N:">N:</text>
-		<text name="F:">F:</text>
+		<text name="pathfinding_attributes_label">
+			尋徑屬性：
+		</text>
+		<text name="B:">
+			B:
+		</text>
+		<text name="O:">
+			O:
+		</text>
+		<text name="G:">
+			G:
+		</text>
+		<text name="E:">
+			E:
+		</text>
+		<text name="N:">
+			N:
+		</text>
+		<text name="F:">
+			F:
+		</text>
 	</panel>
 	<panel name="button_panel">
 		<button label="打開" name="open_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index e4f9c5d433..930db19e69 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -2222,6 +2222,18 @@ http://secondlife.com/support 求助解決問題。
 	<string name="RegionInfoListTypeBannedAgents">
 		永遠封鎖
 	</string>
+	<string name="RegionInfoAllEstates">
+		全部領地
+	</string>
+	<string name="RegionInfoManagedEstates">
+		受管領地
+	</string>
+	<string name="RegionInfoThisEstate">
+		這個領地
+	</string>
+	<string name="AndNMore">
+		及其他[EXTRA_COUNT]個
+	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		地段腳本記憶體
 	</string>
-- 
cgit v1.2.3


From de52689954f575914cc91745808fa6cd6ece021a Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Fri, 14 Sep 2018 08:14:05 +0300
Subject: SL-1956 added support for temporary bans to parcel ban list

---
 .../skins/default/xui/en/floater_about_land.xml    |  28 +++++-
 .../skins/default/xui/en/floater_ban_duration.xml  | 100 +++++++++++++++++++++
 2 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_ban_duration.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 535af317d9..841b11e3bc 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -21,6 +21,14 @@
       name="maturity_icon_adult">
       "Parcel_R_Dark"
     </floater.string>
+    <floater.string
+     name="Hours">
+        [HOURS] hrs.
+    </floater.string>
+    <floater.string
+     name="Hour">
+        hr.
+    </floater.string>
     <floater.string
      name="Minutes">
         [MINUTES] min.
@@ -37,6 +45,10 @@
      name="Remaining">
         remaining
     </floater.string>
+    <floater.string
+     name="Always">
+        Always
+    </floater.string>
     <tab_container
      follows="all"
      halign="left"
@@ -2063,19 +2075,29 @@ Only large parcels can be listed in search.
              name="BanCheck"
              top="0"
              width="200">
-                Always banned ([COUNT], max [MAX])
+                Banned ([COUNT], max [MAX])
             </text>
             <name_list
              column_padding="0"
              follows="top|bottom"
-             heading_height="14"
+             heading_height="16"
              height="125"
              layout="topleft"
              left="0"
              multi_select="true"
+             draw_heading="true"
              name="BannedList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="230" />
+             width="230">
+             <columns
+              label="Name"
+              name="name"
+              width="160" />
+             <columns
+              label="Duration"
+              name="duration"
+              width="70" />
+            </name_list>
             <button
              follows="bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
new file mode 100644
index 0000000000..2d9e69f7c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_close="true"
+ height="150"
+ layout="topleft"
+ name="ban_duration"
+ title="Ban duration"
+ single_instance="true"
+ width="180">
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    layout="topleft"
+    left="15"
+    name="duration_textbox"
+    top="10"
+    width="75">
+        Ban duration:
+   </text>
+
+   <radio_group
+    draw_border="false"
+    enabled="true"
+    follows="left|top"
+    height="40"
+    left="20"
+    mouse_opaque="true"
+    name="ban_duration_radio"
+    tab_stop="true"
+    width="200">
+       <radio_item
+        type="string"
+        follows="left|top"
+        height="20"
+        width="200"
+        label="Always"
+        name="always_radio">
+            Always
+       </radio_item>
+       <radio_item
+        type="string"
+        follows="left|top"
+        height="20"
+        width="200"
+        label="Temporary"
+        name="temporary_radio">
+            Temporary
+       </radio_item>
+   </radio_group>
+
+   <spinner
+    allow_text_entry="true"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="1"
+    max_val="8766"
+    min_val="1"
+    initial_val="1"
+    name="ban_hours"
+    top_delta="50"
+    left="40"
+    width="40"/>
+   <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="15"
+    left_delta="50"
+    name="hours_textbox"
+    top_delta="5"
+    width="75">
+        hours.
+   </text>
+    
+   <button
+    follows="left|top"
+    height="23"
+    label="Ok"
+    left="15"
+    name="ok_btn"
+    top_delta="30"
+    width="75">
+   </button>
+   <button
+    follows="left|top"
+    height="23"
+    label="Cancel"
+    left_pad="0"
+    name="cancel_btn"
+    top_delta="0"
+    width="75">
+   </button>
+</floater>
-- 
cgit v1.2.3


From 8525ad02a4745878a95b8077e0d5a33b7f55dda5 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 21:39:36 +0300
Subject: SL-9691 Ban duration floater - Added validation of input values to
 the 'hours' field

---
 indra/newview/skins/default/xui/en/floater_ban_duration.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_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
index 2d9e69f7c7..b0c961c3c9 100644
--- a/indra/newview/skins/default/xui/en/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -55,7 +55,7 @@
    </radio_group>
 
    <spinner
-    allow_text_entry="true"
+    allow_digits_only="true"
     decimal_digits="0"
     follows="left|top"
     height="20"
-- 
cgit v1.2.3


From e903a52ed630ddc31369fee3d1694a3191c5042a Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 21:46:55 +0300
Subject: SL-9694 Ban duration floater - Increased spinner width

---
 indra/newview/skins/default/xui/en/floater_ban_duration.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_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
index b0c961c3c9..5562f28877 100644
--- a/indra/newview/skins/default/xui/en/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -66,13 +66,13 @@
     name="ban_hours"
     top_delta="50"
     left="40"
-    width="40"/>
+    width="60"/>
    <text
     type="string"
     length="1"
     follows="left|top"
     height="15"
-    left_delta="50"
+    left_delta="70"
     name="hours_textbox"
     top_delta="5"
     width="75">
-- 
cgit v1.2.3


From b13b56af315b7041b81ca43985a9790a5a01e1bc Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 24 Sep 2018 21:50:19 +0300
Subject: SL-9695 About Land floater - Column width adjustment

---
 indra/newview/skins/default/xui/en/floater_about_land.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_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 841b11e3bc..d04e738b22 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2092,11 +2092,11 @@ Only large parcels can be listed in search.
              <columns
               label="Name"
               name="name"
-              width="160" />
+              width="155" />
              <columns
               label="Duration"
               name="duration"
-              width="70" />
+              width="75" />
             </name_list>
             <button
              follows="bottom"
-- 
cgit v1.2.3