Removed some spurious newlines that I introduced into CMakeLists.txt.

author: Logan Dethrow <log@lindenlab.com> 2011-09-09 14:20:19 -0400
committer: Logan Dethrow <log@lindenlab.com> 2011-09-09 14:20:19 -0400
commit: 8a952e42e97cfb286192aba0fbfc43986912cd29 (patch)
tree: 6aa00aad42189239aa81972328e057afc215bf7d /indra/newview/skins
parent: c47b398b75fcdbb479ad9ad2765014c5fa338df7 (diff)
parent: 89b9800579a37fbbdfca7789716a2d012d96cfa5 (diff)
493 files changed, 12555 insertions, 10726 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 973df6998a..31b6fc77f5 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -133,6 +133,15 @@
      name="AvatarListItemIconVoiceLeftColor"
      reference="AvatarListItemIconOfflineColor" />
     <color
+     name="BadgeImageColor"
+     value="1.0 0.40 0.0 1.0" />
+    <color
+     name="BadgeBorderColor"
+     value="0.9 0.9 0.9 1.0" />
+    <color
+     name="BadgeLabelColor"
+     reference="White" />
+    <color
      name="ButtonBorderColor"
      reference="Unused?" />
     <color
@@ -500,22 +509,22 @@
 	  reference="DkGray2" />
     <color
      name="MultiSliderDisabledThumbColor"
-     reference="Unused?" />
+     reference="Black" />
     <color
      name="MultiSliderThumbCenterColor"
-     reference="Unused?" />
+     reference="White" />
     <color
      name="MultiSliderThumbCenterSelectedColor"
-     reference="Unused?" />
+     reference="Green" />
     <color
      name="MultiSliderThumbOutlineColor"
      reference="Unused?" />
     <color
      name="MultiSliderTrackColor"
-     reference="Unused?" />
+     reference="LtGray" />
     <color
      name="MultiSliderTriangleColor"
-     reference="Unused?" />
+     reference="Yellow" />
   <!--
     <color
       name="NameTagBackground"
@@ -760,7 +769,7 @@
     <color
      name="MenuBarProjectBgColor"
      reference="MdBlue" />
-
+  
     <color
       name="MeshImportTableNormalColor"
       value="1 1 1 1"/>
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gift.png b/indra/newview/skins/default/textures/icons/Inv_Gift.png
new file mode 100644
index 0000000000..5afe85d72d
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Gift.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
new file mode 100644
index 0000000000..be58114aa1
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
new file mode 100644
index 0000000000..e6b9480ab1
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
new file mode 100644
index 0000000000..ffda2e92d4
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
new file mode 100644
index 0000000000..6b5911014f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
new file mode 100644
index 0000000000..0e60b417b0
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_On_Selected.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
new file mode 100644
index 0000000000..9c26b92e73
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
new file mode 100644
index 0000000000..3b5d462975
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
new file mode 100644
index 0000000000..f85be047b0
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
new file mode 100644
index 0000000000..cd4e482216
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
new file mode 100644
index 0000000000..d212a871ce
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
new file mode 100644
index 0000000000..e5b6023e36
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
new file mode 100644
index 0000000000..e1911a092f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
new file mode 100644
index 0000000000..9e59f7843a
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
new file mode 100644
index 0000000000..51e8bff646
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
new file mode 100644
index 0000000000..300e2e69e1
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
new file mode 100644
index 0000000000..32fb236381
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
new file mode 100644
index 0000000000..827f343b1e
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
new file mode 100644
index 0000000000..956e02b14d
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
new file mode 100644
index 0000000000..434caeda8b
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
new file mode 100644
index 0000000000..064687ed0f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
new file mode 100644
index 0000000000..5465650d0c
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
new file mode 100644
index 0000000000..ca2e8def97
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
new file mode 100644
index 0000000000..bc236c8b98
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
new file mode 100644
index 0000000000..624e556376
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
new file mode 100644
index 0000000000..5769803b3f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
new file mode 100644
index 0000000000..92d4bfb020
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
new file mode 100644
index 0000000000..6d43eb3a9f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
new file mode 100644
index 0000000000..766d063c99
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
new file mode 100644
index 0000000000..dfe7f68b72
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index cc7cce99c9..799cd907dc 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
 This file contains metadata about how to load, display, and scale textures for rendering in the UI.
 Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
 to them by filename (relative to textures directory).
@@ -72,8 +72,11 @@ with the same filename but different name
   <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
   <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
+  <texture name="Badge_Background" file_name="widgets/Badge_Background.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+  <texture name="Badge_Border" file_name="widgets/Badge_Border.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+
   <texture name="Blank" file_name="Blank.png" preload="false" />
-	
+
   <texture name="BreadCrumbBtn_Left_Disabled" file_name="widgets/BreadCrumbBtn_Left_Disabled.png" preload="false"/>
   <texture name="BreadCrumbBtn_Left_Off" file_name="widgets/BreadCrumbBtn_Left_Off.png" preload="false"/>
   <texture name="BreadCrumbBtn_Left_Over" file_name="widgets/BreadCrumbBtn_Left_Over.png" preload="false"/>
@@ -88,7 +91,6 @@ with the same filename but different name
   <texture name="BreadCrumbBtn_Right_Off" file_name="widgets/BreadCrumbBtn_Right_Off.png" preload="false"/>
   <texture name="BreadCrumbBtn_Right_Over" file_name="widgets/BreadCrumbBtn_Right_Over.png" preload="false"/>
   <texture name="BreadCrumbBtn_Right_Press" file_name="widgets/BreadCrumbBtn_Right_Press.png" preload="false"/>
- 
 
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
@@ -266,6 +268,8 @@ with the same filename but different name
 
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
+  <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
+  <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
 
   <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
 
@@ -349,6 +353,23 @@ with the same filename but different name
   <texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
   <texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
 
+  <texture name="OutboxPush_Disabled" file_name="icons/OutboxPush_Disabled.png" preload="true" />
+  <texture name="OutboxPush_Off" file_name="icons/OutboxPush_Off.png" preload="true" />
+  <texture name="OutboxPush_On" file_name="icons/OutboxPush_On.png" preload="true" />
+  <texture name="OutboxPush_On_Over" file_name="icons/OutboxPush_On_Over.png" preload="true" />
+  <texture name="OutboxPush_Over" file_name="icons/OutboxPush_Over.png" preload="true" />
+  <texture name="OutboxPush_Press" file_name="icons/OutboxPush_Press.png" preload="true" />
+  <texture name="OutboxPush_Progress_1" file_name="icons/OutboxPush_Progress_1.png" preload="true" />
+  <texture name="OutboxPush_Progress_2" file_name="icons/OutboxPush_Progress_2.png" preload="true" />
+  <texture name="OutboxPush_Progress_3" file_name="icons/OutboxPush_Progress_3.png" preload="true" />
+  <texture name="OutboxPush_Progress_4" file_name="icons/OutboxPush_Progress_4.png" preload="true" />
+  <texture name="OutboxPush_Progress_5" file_name="icons/OutboxPush_Progress_5.png" preload="true" />
+  <texture name="OutboxPush_Progress_6" file_name="icons/OutboxPush_Progress_6.png" preload="true" />
+  <texture name="OutboxPush_Selected" file_name="icons/OutboxPush_Selected.png" preload="true" />
+  <texture name="OutboxPush_Selected_Disabled" file_name="icons/OutboxPush_Selected_Disabled.png" preload="true" />
+  <texture name="OutboxPush_Selected_Over" file_name="icons/OutboxPush_Selected_Over.png" preload="true" />
+  <texture name="OutboxPush_Selected_Press" file_name="icons/OutboxPush_Selected_Press.png" preload="true" />
+
   <texture name="PanOrbit_Off" file_name="bottomtray/PanOrbit_Off.png" preload="false" />
 
   <texture name="Parcel_Exp_Color" file_name="icons/Parcel_Exp_Color.png" preload="false" />
@@ -369,6 +390,10 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOff_Dark" file_name="icons/Parcel_SeeAVsOff_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOn_Dark" file_name="icons/Parcel_SeeAVsOn_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOff_Light" file_name="icons/Parcel_SeeAVsOff_Light.png" preload="false" />
+ <texture name="Parcel_SeeAVsOn_Light" file_name="icons/Parcel_SeeAVsOn_Light.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
@@ -496,6 +521,15 @@ with the same filename but different name
   <texture name="StopReload_Off" file_name="icons/StopReload_Off.png" preload="false" />
   <texture name="StopReload_Over" file_name="icons/StopReload_Over.png" preload="false" />
 
+  <texture name="Sync_Disabled" file_name="icons/Sync_Disabled.png" preload="true" />
+  <texture name="Sync_Enabled" file_name="icons/Sync_Enabled.png" preload="true" />
+  <texture name="Sync_Progress_1" file_name="icons/Sync_Progress_1.png" preload="true" />
+  <texture name="Sync_Progress_2" file_name="icons/Sync_Progress_2.png" preload="true" />
+  <texture name="Sync_Progress_3" file_name="icons/Sync_Progress_3.png" preload="true" />
+  <texture name="Sync_Progress_4" file_name="icons/Sync_Progress_4.png" preload="true" />
+  <texture name="Sync_Progress_5" file_name="icons/Sync_Progress_5.png" preload="true" />
+  <texture name="Sync_Progress_6" file_name="icons/Sync_Progress_6.png" preload="true" />
+
   <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
   <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
   <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" />
@@ -649,6 +683,7 @@ with the same filename but different name
 
   <texture name="inv_folder_mesh.tga"/>
   <texture name="inv_item_mesh.tga"/>
+
   <texture name="lag_status_critical.tga" />
   <texture name="lag_status_good.tga" />
   <texture name="lag_status_warning.tga" />
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png
new file mode 100644
index 0000000000..5089c30312
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Badge_Background.png
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background_New.png b/indra/newview/skins/default/textures/widgets/Badge_Background_New.png
new file mode 100644
index 0000000000..9f114f2e4a
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Badge_Background_New.png
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png
new file mode 100644
index 0000000000..4b086a63fb
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Badge_Border.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
new file mode 100644
index 0000000000..e603c44384
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
new file mode 100644
index 0000000000..fbc164123f
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
diff --git a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
deleted file mode 100644
index ffae3d788f..0000000000
--- a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="DAG CYKLUS OPSÆTNING">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Dag cyklus" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<multi_slider label="" name="WLTimeSlider"/>
-			<multi_slider label="" name="WLDayCycleKeys"/>
-			<text name="WL12am">
-				00:00
-			</text>
-			<text name="WL3am">
-				03:00
-			</text>
-			<text name="WL6am">
-				06:00
-			</text>
-			<text name="WL9amHash">
-				09:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				00:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Tilføj key" label_selected="Tilføj key" name="WLAddKey"/>
-			<button label="Slet key" label_selected="Slet key" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Key-frame indstillinger:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Key tid:
-			</text>
-			<spinner label="Timer" name="WLCurKeyHour"/>
-			<spinner label="Min." name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Key fast indstilling:
-			</text>
-			<combo_box label="Faste" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Cycluslængde:
-			</text>
-			<spinner label="Timer" name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Sek." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Vis :
-			</text>
-			<button label="Afspil" label_selected="Afspil" name="WLAnimSky"/>
-			<button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Benyt estate tid" label_selected="Gå til estate tid" name="WLUseLindenTime"/>
-			<button label="Gem test-dag" label_selected="Gem test-dag" name="WLSaveDayCycle"/>
-			<button label="Hent test-dag" label_selected="Hent test-dag" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_env_settings.xml b/indra/newview/skins/default/xui/da/floater_env_settings.xml
deleted file mode 100644
index a6fbc05734..0000000000
--- a/indra/newview/skins/default/xui/da/floater_env_settings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="REDIGERING AF OMGIVELSER">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Tid på 
-dagen
-	</text>
-	<text name="EnvTimeText2">
-		00:00
-	</text>
-	<slider label="" name="EnvTimeSlider"/>
-	<text name="EnvCloudText">
-		Skydække
-	</text>
-	<slider label="" name="EnvCloudSlider"/>
-	<text name="EnvWaterColorText">
-		Farve på 
-vand
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger"/>
-	<text name="EnvWaterFogText">
-		Tåge på 
-vand
-	</text>
-	<slider label="" name="EnvWaterFogSlider"/>
-	<button label="Benyt tid fra estate" name="EnvUseEstateTimeButton"/>
-	<button label="Avanceret himmel" name="EnvAdvancedSkyButton"/>
-	<button label="Avanceret vand" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index 016e5af378..f7eda56e48 100644
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="DEBUG INDSTILLINGER">
 	<radio_group name="boolean_combo">
-		<radio_item label="SANDT" name="TRUE" value="sand"/>
-		<radio_item label="FALSK" name="FALSE" value=""/>
+		<radio_item label="SANDT" name="TRUE" />
+		<radio_item label="FALSK" name="FALSE" />
 	</radio_group>
 	<color_swatch label="Farve" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/da/floater_water.xml b/indra/newview/skins/default/xui/da/floater_water.xml
deleted file mode 100644
index aedd1b442c..0000000000
--- a/indra/newview/skins/default/xui/da/floater_water.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="AVANCERET OPSÆTNING AF VAND">
-	<text name="KeyFramePresetsText">
-		Vand opsætninger:
-	</text>
-	<button label="Ny" label_selected="Ny" name="WaterNewPreset"/>
-	<button label="Gem" label_selected="Gem" name="WaterSavePreset"/>
-	<button label="Slet" label_selected="Slet" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="INDSTILLINGER" name="Settings">
-			<text name="BHText">
-				Vandtåge farve
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Klik for at åbne farvevælger"/>
-			<text name="WaterFogDensText">
-				Tåge tæthedskarakteristik
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<slider label="" name="WaterFogDensity"/>
-			<text name="WaterUnderWaterFogModText">
-				Tilretning undervandståge
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<slider label="" name="WaterUnderWaterFogMod"/>
-			<text name="BDensText">
-				Lille bølge reflektionsskala
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<slider label="" name="WaterNormalScaleX"/>
-			<slider label="" name="WaterNormalScaleY"/>
-			<slider label="" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Spredningsskala
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<slider label="" name="WaterFresnelScale"/>
-			<text name="FresnelOffsetText">
-				Spredning offset
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<slider label="" name="WaterFresnelOffset"/>
-			<text name="DensMultText">
-				Lysbrydning fra oven
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<slider label="" name="WaterScaleAbove"/>
-			<text name="WaterScaleBelowText">
-				Lysbrydning fra neden
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<slider label="" name="WaterScaleBelow"/>
-			<text name="MaxAltText">
-				Udviskning
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-			<slider label="" name="WaterBlurMult"/>
-		</panel>
-		<panel label="BILLEDE" name="Waves">
-			<text name="BHText">
-				Retning for store bølger
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave1DirX"/>
-			<slider label="" name="WaterWave1DirY"/>
-			<text name="BHText2">
-				Retning for små bølger
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave2DirX"/>
-			<slider label="" name="WaterWave2DirY"/>
-			<text name="BHText3">
-				Tekstur map
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-			<texture_picker label="" name="WaterNormalMap"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_windlight_options.xml b/indra/newview/skins/default/xui/da/floater_windlight_options.xml
deleted file mode 100644
index 56f94b24e9..0000000000
--- a/indra/newview/skins/default/xui/da/floater_windlight_options.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="AVANCERET OPSÆTNING FOR HIMMEL">
-	<text name="KeyFramePresetsText">
-		Faste indstillinger:
-	</text>
-	<button label="Ny" label_selected="Ny" name="WLNewPreset" />
-	<button label="Gem" label_selected="Gem" name="WLSavePreset" />
-	<button label="Slet" label_selected="Slet" name="WLDeletePreset" />
-	<button label="Dags cyklus" label_selected="Dags cyklus" name="WLDayCycleMenuButton" />
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFÆRE" name="Atmosphere">
-			<text name="BHText">
-				Blå - horisont
-			</text>
-			<button label="?" name="WLBlueHorizonHelp" />
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<slider label="" name="WLBlueHorizonR" />
-			<slider label="" name="WLBlueHorizonG" />
-			<slider label="" name="WLBlueHorizonB" />
-			<slider label="" name="WLBlueHorizonI" />
-			<text name="BDensText">
-				Dis - horisont
-			</text>
-			<button label="?" name="WLHazeHorizonHelp" />
-			<slider label="" name="WLHazeHorizon" />
-			<text name="BDensText2">
-				Blå - tæthed
-			</text>
-			<button label="?" name="WLBlueDensityHelp" />
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<slider label="" name="WLBlueDensityR" />
-			<slider label="" name="WLBlueDensityG" />
-			<slider label="" name="WLBlueDensityB" />
-			<slider label="" name="WLBlueDensityI" />
-			<text name="HDText">
-				Dis - intensitet
-			</text>
-			<button label="?" name="WLHazeDensityHelp" />
-			<slider label="" name="WLHazeDensity" />
-			<text name="DensMultText">
-				Densitet faktor
-			</text>
-			<button label="?" name="WLDensityMultHelp" />
-			<slider label="" name="WLDensityMult" />
-			<text name="WLDistanceMultText">
-				Distance faktor
-			</text>
-			<button label="?" name="WLDistanceMultHelp" />
-			<slider label="" name="WLDistanceMult" />
-			<text name="MaxAltText">
-				Maximum højde
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp" />
-			<slider label="" name="WLMaxAltitude" />
-		</panel>
-		<panel label="LYS" name="Lighting">
-			<text name="SLCText">
-				Sol/Måne farve
-			</text>
-			<button label="?" name="WLSunlightColorHelp" />
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLSunlightR" />
-			<slider label="" name="WLSunlightG" />
-			<slider label="" name="WLSunlightB" />
-			<slider label="" name="WLSunlightI" />
-			<text name="TODText">
-				Sol/Måne position
-			</text>
-			<button label="?" name="WLTimeOfDayHelp" />
-			<slider label="" name="WLSunAngle" />
-			<text name="WLAmbientText">
-				Omgivende
-			</text>
-			<button label="?" name="WLAmbientHelp" />
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<slider label="" name="WLAmbientR" />
-			<slider label="" name="WLAmbientG" />
-			<slider label="" name="WLAmbientB" />
-			<slider label="" name="WLAmbientI" />
-			<text name="WLEastAngleText">
-				Øst vinkel
-			</text>
-			<button label="?" name="WLEastAngleHelp" />
-			<slider label="" name="WLEastAngle" />
-			<text name="SunGlowText">
-				Sol glød
-			</text>
-			<button label="?" name="WLSunGlowHelp" />
-			<slider label="Fokus " name="WLGlowB" />
-			<slider label="Størr. " name="WLGlowR" />
-			<text name="SceneGammaText">
-				Lysintensitet (gamma)
-			</text>
-			<button label="?" name="WLSceneGammaHelp" />
-			<slider label="" name="WLGamma" />
-			<text name="WLStarText">
-				Stjerne intensitet
-			</text>
-			<button label="?" name="WLStarBrightnessHelp" />
-			<slider label="" name="WLStarAlpha" />
-		</panel>
-		<panel label="SKYER" name="Clouds">
-			<text name="WLCloudColorText">
-				Farve på skyer
-			</text>
-			<button label="?" name="WLCloudColorHelp" />
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLCloudColorR" />
-			<slider label="" name="WLCloudColorG" />
-			<slider label="" name="WLCloudColorB" />
-			<slider label="" name="WLCloudColorI" />
-			<text name="WLCloudColorText2">
-				Skyer XY/Tæthed
-			</text>
-			<button label="?" name="WLCloudDensityHelp" />
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				T
-			</text>
-			<slider label="" name="WLCloudX" />
-			<slider label="" name="WLCloudY" />
-			<slider label="" name="WLCloudDensity" />
-			<text name="WLCloudCoverageText">
-				Skydække
-			</text>
-			<button label="?" name="WLCloudCoverageHelp" />
-			<slider label="" name="WLCloudCoverage" />
-			<text name="WLCloudScaleText">
-				Skystørrelse
-			</text>
-			<button label="?" name="WLCloudScaleHelp" />
-			<slider label="" name="WLCloudScale" />
-			<text name="WLCloudDetailText">
-				Sky detaljer(XY/tæthed)
-			</text>
-			<button label="?" name="WLCloudDetailHelp" />
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				T
-			</text>
-			<slider label="" name="WLCloudDetailX" />
-			<slider label="" name="WLCloudDetailY" />
-			<slider label="" name="WLCloudDetailDensity" />
-			<text name="WLCloudScrollXText">
-				Sky drift X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp" />
-			<check_box label="Lås" name="WLCloudLockX" />
-			<slider label="" name="WLCloudScrollX" />
-			<text name="WLCloudScrollYText">
-				Sky drift Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp" />
-			<check_box label="Lås" name="WLCloudLockY" />
-			<slider label="" name="WLCloudScrollY" />
-			<check_box label="Benyt simple skyer" name="DrawClassicClouds" />
-			<button label="?" name="WLClassicCloudsHelp" />
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index d352312d15..c2f7d26dc9 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -140,7 +140,6 @@
 		<menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/>
 		<menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/>
 		<menu_item_check label="Lydløse fotos til disk" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Komprimér fotos til disk" name="CompressSnapshotsToDisk"/>
 		<menu label="Værktøjer til ydelse" name="Performance Tools">
 			<menu_item_call label="Lag meter" name="Lag Meter"/>
 			<menu_item_check label="Statistik bjælke" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 4c0fbd280b..3ccdfc036a 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -454,6 +454,7 @@ Købsprisen for dette land er ikke refunderet til ejeren. Hvis en dedikeret parv
 Dediker disse [AREA] m² land til gruppen &apos;[GROUP_NAME]&apos;?
 	</notification>
 	<notification name="ErrorMessage">
+		[ERROR_MESSAGE]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AvatarMovedDesired">
@@ -1334,7 +1335,7 @@ Prøv igen om lidt.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Et object med navnet &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ejet af [NAME_SLURL] har givet dig denne [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Behold"/>
 			<button name="Discard" text="Smid væk"/>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
index fd287b1a0a..3036f30240 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Gem valgte" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annullér" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index 925492b2d7..66a128cd13 100644
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -66,16 +66,16 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Verd
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Vis billeder, grupper og anden beboer information"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Åben session med privat besked (IM)"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Kald" name="call_btn" tool_tip="Opkald til denne beboer"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Del" name="share_btn" tool_tip="Del en genstand fra beholdning"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportér" name="teleport_btn" tool_tip="Tilbyd teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml
index fe8ca69f34..c555f2fb09 100644
--- a/indra/newview/skins/default/xui/da/panel_places.xml
+++ b/indra/newview/skins/default/xui/da/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Vis flere valg"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="Profil" name="profile_btn" tool_tip="Vis profil for sted"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 68b861fe92..165d47c931 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1209,9 +1209,6 @@ Prøv venligst om lidt igen.
 	<string name="InvFolder My Inventory">
 		Min beholdning
 	</string>
-	<string name="InvFolder My Favorites">
-		Mine favoritter
-	</string>
 	<string name="InvFolder Library">
 		Bibliotek
 	</string>
@@ -1270,10 +1267,10 @@ Prøv venligst om lidt igen.
 		Bevægelser
 	</string>
 	<string name="InvFolder Favorite">
-		Favoritter
+		Mine favoritter
 	</string>
 	<string name="InvFolder favorite">
-		Favoritter
+		Mine favoritter
 	</string>
 	<string name="InvFolder Current Outfit">
 		Nuværende sæt
@@ -1838,7 +1835,7 @@ Prøv venligst om lidt igen.
 	<string name="RegionNoCovenantOtherOwner">
 		Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab.  Kontakt venligst estate ejeren for detaljer om salg.
 	</string>
-	<string name="covenant_last_modified" value="Sidst rettet:"/>
+	<string name="covenant_last_modified" value="Sidst rettet: "/>
 	<string name="none_text" value=" (ingen) "/>
 	<string name="never_text" value=" (aldrig) "/>
 	<string name="GroupOwned">
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index f0fa4386d2..c65dc5f41d 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -133,12 +133,12 @@
 				0
 			</text>
 			<button label="Land kaufen" label_selected="Land kaufen..." name="Buy Land..."/>
+			<button label="Linden-Verkauf" label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/>
 			<button label="Skriptinfo" name="Scripts..."/>
 			<button label="Für Gruppe kaufen" label_selected="Für Gruppe kaufen..." name="Buy For Group..."/>
 			<button label="Pass kaufen" label_selected="Pass kaufen..." name="Buy Pass..." tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land."/>
 			<button label="Land aufgeben" label_selected="Land aufgeben..." name="Abandon Land..."/>
 			<button label="Land in Besitz nehmen" label_selected="Land in Besitz nehmen..." name="Reclaim Land..."/>
-			<button label="Linden-Verkauf" label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/>
 		</panel>
 		<panel label="VERTRAG" name="land_covenant_panel">
 			<panel.string name="can_resell">
@@ -309,6 +309,9 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			<panel.string name="push_restrict_region_text">
 				Kein Stoßen (regional)
 			</panel.string>
+			<panel.string name="see_avs_text">
+				Auf dieser Parzelle Einwohner sehen und mit ihnen chatten
+			</panel.string>
 			<text name="allow_label">
 				Anderen Einwohnern gestatten:
 			</text>
@@ -371,6 +374,10 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
+			<text name="allow_label5">
+				Einwohnern auf anderen Parzellen Folgendes gestatten:
+			</text>
+			<check_box label="Avatare sehen" name="SeeAvatarsCheck" tool_tip="Gestattet sowohl Einwohnern auf anderen Parzellen, Einwohner auf dieser Parzelle zu sehen und mit ihnen zu chatten, als auch Ihnen, diese Einwohner auf anderen Parzellen zu sehen und mit ihnen zu chatten."/>
 			<text name="landing_point">
 				Landepunkt: [LANDING]
 			</text>
@@ -427,6 +434,11 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Sound:
 			</text>
 			<check_box label="Gesten- und Objektgeräusche auf diese Parzelle beschränken" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				Avatarsounds:
+			</text>
+			<check_box label="Jeder" name="all av sound check"/>
+			<check_box label="Gruppe" name="group av sound check"/>
 			<text name="Voice settings:">
 				Voice:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml
index e90eb2c00b..939fd5dee4 100644
--- a/indra/newview/skins/default/xui/de/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="RASTER-OPTIONEN">
-	<spinner label="Raster-Einheiten (Meter)" name="GridResolution"/>
-	<spinner label="Rastergröße (Meter)" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		Bildschirm
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Lokal
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Welt
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Referenz
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Anhang
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Rasteropazität">
+		Modus
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Wählen Sie das gewünschte Rasterlineal zum Positionieren des Objekts aus.">
+		<combo_box.item label="Globales Raster" name="World"/>
+		<combo_box.item label="Lokales Raster" name="Local"/>
+		<combo_box.item label="Referenzraster" name="Reference"/>
+	</combo_box>
+	<spinner label="Einheiten (m)" name="GridResolution"/>
+	<spinner label="Rastergröße (meter)" name="GridDrawSize"/>
 	<check_box label="An Untereinheiten ausrichten" name="GridSubUnit"/>
 	<check_box label="Überschneidungen anzeigen" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Raster-Deckkraft">
diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
deleted file mode 100644
index 8599737106..0000000000
--- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="TAGESZYKLUS-EDITOR">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Tageszyklus" name="Day Cycle">
-			<button label=" ?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				24:00
-			</text>
-			<text name="WL3am">
-				03:00
-			</text>
-			<text name="WL6am">
-				06:00
-			</text>
-			<text name="WL9amHash">
-				09:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				24:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Key hinzu" label_selected="Key hinzu" name="WLAddKey"/>
-			<button label="Key löschen" label_selected="Key löschen" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Keyframe-Einstellungen:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Key-Zeit:
-			</text>
-			<spinner label="Std." name="WLCurKeyHour"/>
-			<spinner label="Min." name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Key-Voreinstellung:
-			</text>
-			<combo_box label="Voreinstellung" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Einrasten:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Zykluslänge:
-			</text>
-			<spinner label="Std." name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Sek." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Vorschau:
-			</text>
-			<button label="Start" label_selected="Start" name="WLAnimSky"/>
-			<button label="Stopp" label_selected="Stopp" name="WLStopAnimSky"/>
-			<button label="Grundbesitzzeit verw" label_selected="Zur Grundbesitzzeit" name="WLUseLindenTime"/>
-			<button label="Testtag speichern" label_selected="Testtag speichern" name="WLSaveDayCycle"/>
-			<button label="Testtag laden" label_selected="Testtag laden" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..cc14ce640d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="UMGEB.VOREINST. LÖSCHEN">
+	<string name="title_water">
+		Wasser-Voreinstellung löschen
+	</string>
+	<string name="title_sky">
+		Himmel-Voreinstellung löschen
+	</string>
+	<string name="title_day_cycle">
+		Tageszyklus löschen
+	</string>
+	<string name="label_water">
+		Voreinstellung:
+	</string>
+	<string name="label_sky">
+		Voreinstellung:
+	</string>
+	<string name="label_day_cycle">
+		Tageszyklus:
+	</string>
+	<string name="msg_confirm_deletion">
+		Möchten Sie die ausgewählte Voreinstellung wirklich löschen?
+	</string>
+	<string name="msg_sky_is_referenced">
+		Eine Voreinstellung, auf die sich ein Tageszyklus bezieht, kann nicht gelöscht werden.
+	</string>
+	<string name="combo_label">
+		-Voreinstellung auswählen-
+	</string>
+	<text name="label">
+		Voreinstellung:
+	</text>
+	<button label="Löschen" name="delete"/>
+	<button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..8b29428c24
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="Tageszyklus bearbeiten">
+	<string name="title_new">
+		Neuen Tageszyklus erstellen
+	</string>
+	<string name="title_edit">
+		Tageszyklus bearbeiten
+	</string>
+	<string name="hint_new">
+		Geben Sie einen Namen für den Tageszyklus ein, passen Sie die Steuerungen an, um den Tageszyklus zu erstellen, und klicken Sie auf „Speichern“.
+	</string>
+	<string name="hint_edit">
+		Um den Tageszyklus zu bearbeiten, passen Sie die Steuerungen unten an und klicken Sie auf „Speichern“.
+	</string>
+	<string name="combo_label">
+		-Voreinstellung auswählen-
+	</string>
+	<text name="label">
+		Name der Voreinstellung:
+	</text>
+	<text name="note">
+		Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert.
+	</text>
+	<text name="hint_item1">
+		- Klicken Sie auf eine Registerkarte, um die Himmeleinstellungen und die Uhrzeit zu bearbeiten.
+	</text>
+	<text name="hint_item2">
+		- Klicken und ziehen Sie die Registerkarten, um die Übergangszeiten einzustellen.
+	</text>
+	<text name="hint_item3">
+		- Anhand des Scrubbers können Sie eine Vorschau Ihres Tageszyklus anzeigen.
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="Schlüssel hinzufügen" label_selected="Schlüssel hinzufügen" name="WLAddKey"/>
+		<button label="Schlüssel löschen" label_selected="Schlüssel löschen" name="WLDeleteKey"/>
+		<text name="WL12am">
+			0:00
+		</text>
+		<text name="WL3am">
+			3:00
+		</text>
+		<text name="WL6am">
+			6:00
+		</text>
+		<text name="WL9amHash">
+			9:00
+		</text>
+		<text name="WL12pmHash">
+			12:00
+		</text>
+		<text name="WL3pm">
+			15:00
+		</text>
+		<text name="WL6pm">
+			18:00
+		</text>
+		<text name="WL9pm">
+			21:00
+		</text>
+		<text name="WL12am2">
+			0:00
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		Himmeleinstellung:
+	</text>
+	<combo_box label="Voreinstellung" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		Uhrzeit:
+	</text>
+	<time name="time" value="6:00"/>
+	<check_box label="Zu meinem neuen Tageszyklus machen" name="make_default_cb"/>
+	<button label="Speichern" name="save"/>
+	<button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..ea4c5f7ebc
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="Himmel-Voreinstellung bearbeiten">
+	<string name="title_new">
+		Neue Himmel-Voreinstellung erstellen
+	</string>
+	<string name="title_edit">
+		Himmel-Voreinstellung bearbeiten
+	</string>
+	<string name="hint_new">
+		Geben Sie einen Namen für die Voreinstellung ein, passen Sie die Steuerungen an, um die Voreinstellung zu erstellen, und klicken Sie dann auf „Speichern“.
+	</string>
+	<string name="hint_edit">
+		Um Ihre Himmel-Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
+	</string>
+	<string name="combo_label">
+		-Voreinstellung auswählen-
+	</string>
+	<text name="hint">
+		Um Ihre Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
+	</text>
+	<text name="label">
+		Name der Voreinstellung:
+	</text>
+	<text name="note">
+		Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert.
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="ATMOSPHÄRE" name="Atmosphere">
+			<text name="BHText">
+				Blauer Horizont
+			</text>
+			<text name="BDensText">
+				Horizonttrübung
+			</text>
+			<text name="BDensText2">
+				Farbintensität
+			</text>
+			<text name="HDText">
+				Trübungsintensität
+			</text>
+			<text name="DensMultText">
+				Dichtemultiplikator
+			</text>
+			<text name="WLDistanceMultText">
+				Entfernungsmultiplikator
+			</text>
+			<text name="MaxAltText">
+				Max. Höhe
+			</text>
+		</panel>
+		<panel label="BELEUCHTUNG" name="Lighting">
+			<text name="SLCText">
+				Sonne/Mond-Farbe
+			</text>
+			<text name="WLAmbientText">
+				Umgebung
+			</text>
+			<text name="SunGlowText">
+				Sonnenleuchtkraft
+			</text>
+			<slider label="Fokus" name="WLGlowB"/>
+			<slider label="Größe" name="WLGlowR"/>
+			<text name="WLStarText">
+				Sternenleuchtkraft
+			</text>
+			<text name="SceneGammaText">
+				Gamma in Szene
+			</text>
+			<text name="TODText">
+				Sonne/Mond-Stand
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				0:00
+			</text>
+			<text name="WL6am">
+				3:00
+			</text>
+			<text name="WL12pmHash">
+				12:00
+			</text>
+			<text name="WL6pm">
+				18:00
+			</text>
+			<text name="WL12am2">
+				0:00
+			</text>
+			<time name="WLDayTime" value="6:00"/>
+			<text name="WLEastAngleText">
+				Ostausrichtung
+			</text>
+		</panel>
+		<panel label="WOLKEN" name="Clouds">
+			<text name="WLCloudColorText">
+				Wolkenfarbe
+			</text>
+			<text name="WLCloudColorText2">
+				Wolken-XY/Dichte
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				Wolkendichte
+			</text>
+			<text name="WLCloudScaleText">
+				Wolkenskalierung
+			</text>
+			<text name="WLCloudDetailText">
+				Wolkendetails (XY/Dichte)
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				Wolkenbewegung X
+			</text>
+			<check_box label="Sperren" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				Wolkenbewegung Y
+			</text>
+			<check_box label="Sperren" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="Diese Voreinstellung zu meiner neuen Himmeleinstellung machen" name="make_default_cb"/>
+	<button label="Speichern" name="save"/>
+	<button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..9b9d5e7d77
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="Wasser-Voreinstellung bearbeiten">
+	<string name="title_new">
+		Neue Wasser-Voreinstellung erstellen
+	</string>
+	<string name="title_edit">
+		Wasser-Voreinstellung bearbeiten
+	</string>
+	<string name="hint_new">
+		Geben Sie einen Namen für die Voreinstellung ein, passen Sie die Steuerungen an, um die Voreinstellung zu erstellen, und klicken Sie dann auf „Speichern“.
+	</string>
+	<string name="hint_edit">
+		Um Ihre Wasser-Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
+	</string>
+	<string name="combo_label">
+		-Voreinstellung auswählen-
+	</string>
+	<text name="hint">
+		Um Ihre Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“.
+	</text>
+	<text name="label">
+		Name der Voreinstellung:
+	</text>
+	<text name="note">
+		Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert.
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			Trübungsfarbe
+		</text>
+		<text name="water_fog_density_label">
+			Exponent für Trübungsdichte
+		</text>
+		<text name="underwater_fog_modifier_label">
+			Modifikator für Wassertrübung
+		</text>
+		<text name="BHText">
+			Richtung für große Wellen
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			Reflexionswellengröße
+		</text>
+		<text name="HDText">
+			Fresnel-Skalierung
+		</text>
+		<text name="FresnelOffsetText">
+			Fresnel-Versatz
+		</text>
+		<text name="BHText2">
+			Richtung für kleine Wellen
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			Brechungsstärke oben
+		</text>
+		<text name="WaterScaleBelowText">
+			Brechungsstärke unten
+		</text>
+		<text name="MaxAltText">
+			Mischungsmultiplikator
+		</text>
+		<text name="BHText3">
+			Normal-Map
+		</text>
+	</panel>
+	<check_box label="Diese Voreinstellung zu meiner neuen Wassereinstellung machen" name="make_default_cb"/>
+	<button label="Speichern" name="save"/>
+	<button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml
deleted file mode 100644
index 0c78909108..0000000000
--- a/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="UMWELT-EDITOR">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Tageszeit
-	</text>
-	<text name="EnvTimeText2">
-		12:00
-	</text>
-	<text name="EnvCloudText">
-		Wolkendecke
-	</text>
-	<text name="EnvWaterColorText">
-		Wasserfarbe
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
-	<text name="EnvWaterFogText">
-		Wasser-
-trübung
-	</text>
-	<button label="Grundbesitzzeit verw." name="EnvUseEstateTimeButton"/>
-	<button label="Himmel (erweitert)" name="EnvAdvancedSkyButton"/>
-	<button label="Wasser (erweitert)" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
new file mode 100644
index 0000000000..946416980a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="UMGEBUNGSEINSTELLUNGEN">
+	<text name="note">
+		Anhand der Optionen unten können Sie die Umgebungseinstellungen für Ihren Viewer anpassen.
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Regionseinstellungen verwenden" name="use_region_settings"/>
+		<radio_item label="Meine Umgebung anpassen" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			Hinweis: Ihre benutzerdefinierten Einstellungen sind für andere Benutzer nicht sichtbar.
+		</text>
+		<text name="water_settings_title">
+			Wassereinstellung
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Himmel / Tageszyklus
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Fester Himmel" name="my_sky_settings"/>
+			<radio_item label="Tageszyklus" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="OK" name="ok_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index 83c51132ee..330893c326 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -3,6 +3,9 @@
 	<string name="status_idle">
 		Inaktiv
 	</string>
+	<string name="status_parse_error">
+		DAE-Parsing-Fehler. Details siehe Protokoll.
+	</string>
 	<string name="status_reading_file">
 		Laden...
 	</string>
@@ -12,6 +15,9 @@
 	<string name="status_vertex_number_overflow">
 		Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen.
 	</string>
+	<string name="bad_element">
+		Fehler: ungültiges Element.
+	</string>
 	<string name="high">
 		Hoch
 	</string>
@@ -54,6 +60,9 @@
 	<string name="simplifying">
 		Vereinfachung läuft...
 	</string>
+	<string name="tbd">
+		noch nicht festgelegt
+	</string>
 	<text name="name_label">
 		Name:
 	</text>
@@ -74,23 +83,26 @@
 			Detailstufe: Niedrigste
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Ressourcenkosten: [COST]
-		</text>
-		<text name="physics cost">
-			Physikkosten: [COST]
-		</text>
-		<text name="upload fee">
-			Gebühr für Hochladen: --
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		ACHTUNG:
+	</text>
+	<text name="warning_message">
+		Sie können dieses Modell nicht auf die Second Life-Server hochladen. [[VURL] Weitere Infos], wie Sie das Hochladen von Netzmodellen freischalten können.
+	</text>
+	<text name="weights_text">
+		Herunterladen:
+Physik:
+Server:
+
+Prim-Äquivalenz:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Standardwerte" name="reset_btn" tool_tip="Standardwerte wiederherstellen"/>
-	<button label="Hochladen" name="ok_btn" tool_tip="An Simulator hochladen"/>
-	<button label="Abbrechen" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Detailstufe" name="lod_panel">
 			<text name="lod_table_header">
@@ -228,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0,0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Gebühr für Hochladen: [FEE] L$
+	</text>
+	<button label="Auf Standardwerte setzen" name="reset_btn" tool_tip="Auf Standardwerte setzen"/>
+	<button label="Gewichte und Gebühr berechnen" name="calculate_btn" tool_tip="Gewichte und Gebühr berechnen"/>
+	<button label="Hochladen" name="ok_btn" tool_tip="An Simulator hochladen"/>
+	<button label="Abbrechen" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_model_wizard.xml b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
index 2c7b45906e..7103757b40 100644
--- a/indra/newview/skins/default/xui/de/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="ASSISTENT ZUM HOCHLADEN VON MODELLEN">
 	<button label="5. Hochladen" name="upload_btn"/>
 	<button label="4. Überprüfen" name="review_btn"/>
-	<button label="3. Physik" name="physics2_btn"/>
 	<button label="3. Physik" name="physics_btn"/>
 	<button label="2. Optimieren" name="optimize_btn"/>
 	<button label="1. Datei auswählen" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Modell hochladen
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Modelldatei auswählen
 			</text>
 		</panel>
-		<text name="description">
-			Mit diesem Assistenten können Sie Netzmodelle in Second Life hochladen.  Geben Sie zuerst die Datei mit dem zu importierenden Modell an.  Second Life unterstützt COLLADA-Dateien (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Dateiname:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Fortgeschrittene Benutzer: Wenn Sie bereits mit Tools zur Erstellung von 3D-Inhalten vertraut sind, können Sie den erweiterten Uploader verwenden.
+			</text>
+			<button label="Auf Erweitert wechseln" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Hochzuladende Modelldatei auswählen
 			</text>
 			<button label="Durchsuchen..." label_selected="Durchsuchen..." name="browse"/>
+			<text name="support_collada_text">
+				Second Life unterstützt COLLADA-Dateien (.dae).
+			</text>
+			<text name="dimensions_label">
+				Abmessungen (m):
+			</text>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				ACHTUNG:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Sie können den letzten Schritt nicht abschließen (Modell auf Second Life-Server hochladen). [secondlife:///app/floater/learn_more Weitere Infos], wie Sie Ihr Konto zum Hochladen von Netzmodellen einrichten.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimieren
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Modell optimieren
 			</text>
 		</panel>
-		<text name="description">
-			Dieser Assistent hat Ihr Modell optimiert, um die Leistung zu erhöhen. Sie können die Optimierungsergebnisse unten ändern oder zum Fortfahren auf „Weiter“ klicken.
+		<text name="optimize_hint">
+			Wir haben das Modell auf Leistung optimiert. Sie können es bei Bedarf weiter anpassen.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Detailstufe generieren
+			</text>
 			<text name="high_detail_text">
 				Detailstufe generieren: Hoch
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Modellvorschau:
+			<text name="optimize_performance_text">
+				Leistung
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Hoch
+			<text name="optimize_faster_rendering_text">
+				Schnellere Darstellung
+Weniger Details
+Niedrigeres Prim-Gewicht
+			</text>
+			<text name="optimize_accuracy_text">
+				Genauigkeit
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Langsamere Darstellung
+Mehr Details
+Höheres Prim-Gewicht
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Geometrie neu berechnen" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Geometrievorschau
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="preview_lod_high">
+					Viel Details
 				</combo_item>
-				<combo_item name="medium">
-					Mittel
+				<combo_item name="preview_lod_medium">
+					Mittlere Details
 				</combo_item>
-				<combo_item name="low">
-					Niedrig
+				<combo_item name="preview_lod_low">
+					Wenig Details
 				</combo_item>
-				<combo_item name="lowest">
-					Niedrigste
+				<combo_item name="preview_lod_lowest">
+					Wenigste Details
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Ressourcenkosten:    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Physik
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Physik anpassen
 			</text>
 		</panel>
-		<text name="description">
-			Der Assistent erstellt eine physische Form, die die Interaktionen des Objekts mit anderen Objekten und Avataren bestimmt. Setzen Sie den Schieber auf die Detailstufe, die für Ihr Objekt am besten geeignet ist:
+		<text name="physics_hint">
+			Wir erstellen eine Form für die Außenhülle des Modells. Passen Sie die Detailstufe der Form wie für den beabsichtigten Zweck erforderlich an.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Ressourcenkosten:       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Leistung
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Physik
+			<text name="physics_faster_rendering_text">
+				Schnellere Darstellung
+Weniger Details
+Niedrigeres Prim-Gewicht
 			</text>
-		</panel>
-		<text name="description">
-			Überprüfen Sie die physische Form unten und klicken Sie dann auf „Weiter“.  Um die physische Form zu ändern, klicken Sie auf „Zurück“.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Modellvorschau:
+			<text name="physics_accuracy_text">
+				Genauigkeit
+			</text>
+			<text name="physics_slower_dendering_text">
+				Langsamere Darstellung
+Mehr Details
+Höheres Prim-Gewicht
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Hoch
+			<text name="physics_example_1">
+				Beispiele:
+Mobile Objekte
+Fliegende Objekte
+Fahrzeuge
+			</text>
+			<text name="physics_example_2">
+				Beispiele:
+Kleine statische Objekte
+Objekte mit weniger Details
+Einfache Möbel
+			</text>
+			<text name="physics_example_3">
+				Beispiele:
+Statische Objekte
+Objekte mit viel Details
+Gebäude
+			</text>
+			<button label="Physik neu berechnen" name="recalculate_physics_btn"/>
+			<button label="Neu berechnen..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Physikvorschau
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="preview_lod2_high">
+					Viel Details
 				</combo_item>
-				<combo_item name="medium">
-					Mittel
+				<combo_item name="preview_lod2_medium">
+					Mittlere Details
 				</combo_item>
-				<combo_item name="low">
-					Niedrig
+				<combo_item name="preview_lod2_low">
+					Wenig Details
 				</combo_item>
-				<combo_item name="lowest">
-					Niedrigste
+				<combo_item name="preview_lod2_lowest">
+					Wenigste Details
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Ressourcenkosten:       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Überprüfen
 			</text>
 		</panel>
-		<text name="description">
-			Überprüfen Sie die Details unten und klicken Sie dann auf „Hochladen“, um das Modell hochzuladen. Die Kosten werden von Ihrem L$-Kontostand abgezogen.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Modellvorschau:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Auswirkung auf Parzelle/Region: Prim-Äquivalenzwert [EQUIV]
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Hoch
-				</combo_item>
-				<combo_item name="medium">
-					Mittel
-				</combo_item>
-				<combo_item name="low">
-					Niedrig
-				</combo_item>
-				<combo_item name="lowest">
-					Niedrigste
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				Die für das Hochladen anfallende Gebühr in Höhe von [FEE] L$ wird von Ihrem Konto abgebucht.
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Durch Klicken auf „Hochladen“ bestätigen Sie, dass Sie die erforderlichen Rechte für das im Modell enthaltene Material besitzen.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Ressourcenkosten:         [COST]
-		</text>
-		<text name="physics cost">
-			Physikkosten:        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
 				Upload abgeschlossen
 			</text>
 		</panel>
-		<text name="description">
-			Herzlichen Glückwunsch! Ihr Modell wurde erfolgreich hochgeladen.  Sie finden das Modell im Objektordner Ihres Inventars.
+		<text name="model_uploaded_text">
+			Ihr Modell wurde hochgeladen.
+		</text>
+		<text name="inventory_text">
+			Sie finden das Modell im Objektordner Ihres Inventars.
+		</text>
+		<text name="charged_fee">
+			Von Ihrem Konto wurden [FEE] L$ abgebucht.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Zurück" name="back"/>
 	<button label="Weiter &gt;&gt;" name="next"/>
+	<button label="Gewichte und Gebühr berechnen &gt;&gt;" name="calculate"/>
+	<button label="Berechnen..." name="calculating"/>
 	<button label="Hochladen" name="upload" tool_tip="An Simulator hochladen"/>
 	<button label="Abbrechen" name="cancel"/>
 	<button label="Schließen" name="close"/>
@@ -193,6 +219,9 @@
 	<string name="status_idle">
 		Inaktiv
 	</string>
+	<string name="status_parse_error">
+		DAE-Parsing-Fehler. Details siehe Protokoll.
+	</string>
 	<string name="status_reading_file">
 		Laden...
 	</string>
@@ -202,6 +231,9 @@
 	<string name="status_vertex_number_overflow">
 		Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen.
 	</string>
+	<string name="bad_element">
+		Fehler: ungültiges Element.
+	</string>
 	<string name="high">
 		Hoch
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
index d44ad44aea..bd39bf2bce 100644
--- a/indra/newview/skins/default/xui/de/floater_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="SUCHEN">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Wird geladen...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 338b609343..49b133e10f 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Klicken und ziehen, um Land auszuwählen
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Bildschirm
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] Objekte ([PRIM_COUNT] Prims [PE_STRING]) ausgewählt
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Lokal
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Welt
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Referenz
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Anhang
+	<floater.string name="status_selectprimequiv">
+		, Prim-Äquivalenz [SEL_WEIGHT]
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
@@ -66,20 +57,12 @@
 	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
 	<button label="Link" name="link_btn" width="30"/>
 	<button label="Verknüpfung auflösen" name="unlink_btn" width="126"/>
-	<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt" left_pad="0">
-		þ: [COUNT]
-	</text>
 	<check_box label="" 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="An Raster ausrichten" name="checkbox snap to grid" top_pad="15"/>
-	<combo_box name="combobox grid mode" tool_tip="Wählen Sie ein Rasterlineal zum Positionieren des Objekts aus.">
-		<combo_box.item label="Globales Raster" name="World"/>
-		<combo_box.item label="Lokales Raster" name="Local"/>
-		<combo_box.item label="Referenzraster" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Einrasten" name="checkbox snap to grid" top_pad="15"/>
 	<button label="Optionen..." label_selected="Optionen..." name="Options..." tool_tip="Mehr Raster-Optionen anzeigen"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -119,23 +102,11 @@
 		Stärke
 	</text>
 	<button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land bearbeiten"/>
-	<text name="obj_count">
-		Objekte: [COUNT]
-	</text>
-	<text name="prim_count">
-		Primitive: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Verknüpfte Sätze: [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Kosten der gegenwärtig ausgewählten verknüpften Sätze als [Prims],[Komplexität der Physik]">
-		Kosten: [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Objekte: [COUNT]
+	<text name="selection_empty">
+		Nichts ausgewählt.
 	</text>
-	<text name="object_cost" tool_tip="Kosten der gegenwärtig ausgewählten Objekte als [Prims] / [Komplexität der Physik]">
-		Kosten: [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Physikgewicht [PHYS_WEIGHT], Darstellungskosten [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Allgemein" name="General">
@@ -356,7 +327,6 @@
 				<combo_box.item label="Torus" name="Torus"/>
 				<combo_box.item label="Fläche" name="Plane"/>
 				<combo_box.item label="Zylinder" name="Cylinder"/>
-				<combo_box.item label="Netz" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Eigenschaften" name="Features">
@@ -408,7 +378,7 @@
 			</combo_box>
 			<spinner label="Schwerkraft" name="Physics Gravity"/>
 			<spinner label="Reibung" name="Physics Friction"/>
-			<spinner label="Dichte" name="Physics Density"/>
+			<spinner label="Dichte in 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
 		<panel label="Textur" name="Texture">
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 21031cd556..3dc0fc2322 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Neu!)
 	</string>
+	<string name="effect_Arena">
+		Arena
+	</string>
+	<string name="effect_Beast">
+		Bestie
+	</string>
+	<string name="effect_Buff">
+		Muskulös
+	</string>
+	<string name="effect_Buzz">
+		Buzz
+	</string>
+	<string name="effect_Camille">
+		Camille
+	</string>
+	<string name="effect_Creepy">
+		Unheimlich
+	</string>
+	<string name="effect_CreepyBot">
+		UnheimlicherBot
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		TieferBot
+	</string>
+	<string name="effect_Demon">
+		Dämon
+	</string>
+	<string name="effect_Flirty">
+		Kokett
+	</string>
+	<string name="effect_Foxy">
+		Attraktiv
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Bonus_Halloween_2010
+	</string>
+	<string name="effect_Helium">
+		Helium
+	</string>
+	<string name="effect_Husky">
+		Rauchig
+	</string>
+	<string name="effect_Intercom">
+		Intercom
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Alptraum
+	</string>
+	<string name="effect_PopBot">
+		PopBot
+	</string>
+	<string name="effect_Rachel">
+		Rachel
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Roboter
+	</string>
+	<string name="effect_Roxanne">
+		Roxanne
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samantha
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Shorty
+	</string>
+	<string name="effect_Sneaky">
+		Hinterhältig
+	</string>
+	<string name="effect_Stallion">
+		Hengst
+	</string>
+	<string name="effect_Sultry">
+		Feurig
+	</string>
+	<string name="effect_Thunder">
+		Donner
+	</string>
+	<string name="effect_Vixen">
+		Erotisch
+	</string>
+	<string name="effect_WhinyBot">
+		JammernderBot
+	</string>
 	<text name="preview_text">
 		Zur Vorschau
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
deleted file mode 100644
index bb0dd9c75d..0000000000
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ERWEITERTER WASSER-EDITOR">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText" width="110">
-		Voreinstellungen:
-	</text>
-	<combo_box left_delta="110" name="WaterPresetsCombo"/>
-	<button label="Neu" label_selected="Neu" name="WaterNewPreset"/>
-	<button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/>
-	<button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="EINSTELLUNGEN" name="Settings">
-			<text name="BHText">
-				Wassertrübungsfarbe
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
-			<text name="WaterFogDensText">
-				Wassertrübungsdichte
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Wassertrübungs-Modifikator
-			</text>
-			<slider bottom_delta="-34" name="WaterUnderWaterFogMod"/>
-			<text name="BDensText">
-				Reflexionswellengröße
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel-Skalierung
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel-Versatz
-			</text>
-			<text name="DensMultText">
-				Brechungsstärke oben
-			</text>
-			<text name="WaterScaleBelowText">
-				Brechungsstärke unten
-			</text>
-			<text name="MaxAltText">
-				Mischungsmultiplikator
-			</text>
-		</panel>
-		<panel label="BILD" name="Waves">
-			<text name="BHText">
-				Richtung große Welle
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Richtung kleine Welle
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal-Map
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
deleted file mode 100644
index 5b59336f9d..0000000000
--- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ERWEITERTER HIMMEL-EDITOR">
-	<text name="KeyFramePresetsText">
-		Voreinstellungen:
-	</text>
-	<button label="Neu" label_selected="Neu" name="WLNewPreset"/>
-	<button label="Speichern" label_selected="Speichern" name="WLSavePreset"/>
-	<button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/>
-	<button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSPHÄRE" name="Atmosphere">
-			<text name="BHText">
-				Horizontfarbe
-			</text>
-			<button label=" ?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Horizonttrübung
-			</text>
-			<button label=" ?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Farbintensität
-			</text>
-			<button label=" ?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Trübungsintensität
-			</text>
-			<button label=" ?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Dichtemultiplikator
-			</text>
-			<button label=" ?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Entfernungsmultiplikator
-			</text>
-			<button label=" ?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Max. Höhe
-			</text>
-			<button label=" ?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="LICHT" name="Lighting">
-			<text name="SLCText">
-				Sonne/Mond-Farbe
-			</text>
-			<button label=" ?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Sonne/Mond-Stand
-			</text>
-			<button label=" ?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Umgebung
-			</text>
-			<button label=" ?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ostausrichtung
-			</text>
-			<button label=" ?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Sonnenleuchtkraft
-			</text>
-			<button label=" ?" name="WLSunGlowHelp"/>
-			<slider label="Fokus " name="WLGlowB"/>
-			<slider label="Größe    " name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma in Szene
-			</text>
-			<button label=" ?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Sternenleuchtkraft
-			</text>
-			<button label=" ?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="WOLKEN" name="Clouds">
-			<text name="WLCloudColorText">
-				Wolkenfarbe
-			</text>
-			<button label=" ?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Wolken-XY/Dichte
-			</text>
-			<button label=" ?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Wolkendichte
-			</text>
-			<button label=" ?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Wolkenskalierung
-			</text>
-			<button label=" ?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Wolkendetails (XY/Dichte)
-			</text>
-			<button label=" ?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Wolkenbewegung X
-			</text>
-			<button label=" ?" name="WLCloudScrollXHelp"/>
-			<check_box label="Fest" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Wolkenbewegung Y
-			</text>
-			<button label=" ?" name="WLCloudScrollYHelp"/>
-			<check_box label="Fest" name="WLCloudLockY"/>
-			<check_box label="Klassische Wolken" name="DrawClassicClouds"/>
-			<button label=" ?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index a373e15338..d932234cd1 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -18,7 +18,7 @@
 		<menu_item_call label="Servicebedingungen anzeigen" name="TOS"/>
 		<menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/>
 		<menu_item_call label="Test Medienbrowser" name="Web Browser Test"/>
-		<menu_item_call label="Test Webinhalt-Floater" name="Web Content Floater Test"/>
+		<menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"/>
 		<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
 		<menu_item_call label="Benachrichtigungs-Konsole anzeigen" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
index 0f252ab46d..a001544f3e 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
+<toggleable_menu name="menu_group_plus">
 	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
 	<menu_item_check label="Nach Name sortieren" name="sort_name"/>
 	<menu_item_check label="Nach Entfernung sortieren" name="sort_distance"/>
 	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Karte anzeigen" name="view_map"/>
 	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 05f9f94c8a..e010844206 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="Meine Gruppen" name="My Groups"/>
 		<menu_item_check label="Chat in der Nähe" name="Nearby Chat"/>
 		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_check label="Stimme in der Nähe" name="Nearby Voice"/>
 	</menu>
 	<menu label="Welt" name="World">
 		<menu_item_check label="Minikarte" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="Mittag" name="Noon"/>
 			<menu_item_call label="Sonnenuntergang" name="Sunset"/>
 			<menu_item_call label="Mitternacht" name="Midnight"/>
-			<menu_item_call label="Grundbesitzzeit" name="Revert to Region Default"/>
-			<menu_item_call label="Umwelt-Editor" name="Environment Editor"/>
+		</menu>
+		<menu label="Umgebungs-Editor" name="Enviroment Editor">
+			<menu_item_call label="Umgebungseinstellungen..." name="Enviroment Settings"/>
+			<menu label="Wasser-Voreinstellungen" name="Water Presets">
+				<menu_item_call label="Neue Voreinstellung..." name="new_water_preset"/>
+				<menu_item_call label="Voreinstellung bearbeiten..." name="edit_water_preset"/>
+				<menu_item_call label="Voreinstellung löschen..." name="delete_water_preset"/>
+			</menu>
+			<menu label="Himmel-Voreinstellungen" name="Sky Presets">
+				<menu_item_call label="Neue Voreinstellung..." name="new_sky_preset"/>
+				<menu_item_call label="Voreinstellung bearbeiten..." name="edit_sky_preset"/>
+				<menu_item_call label="Voreinstellung löschen..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="Tag-Voreinstellungen" name="Day Presets">
+				<menu_item_call label="Neue Voreinstellung..." name="new_day_preset"/>
+				<menu_item_call label="Voreinstellung bearbeiten..." name="edit_day_preset"/>
+				<menu_item_call label="Voreinstellung löschen..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="Bauen" name="BuildTools">
@@ -142,7 +159,6 @@
 		<menu_item_check label="Kamerabeschränkungen deaktivieren" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto (hohe Auflösung)" name="HighResSnapshot"/>
 		<menu_item_check label="Fotos auf Festplatte leise speichern" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Fotos auf Festplatte komprimieren" name="CompressSnapshotsToDisk"/>
 		<menu label="Performance Tools" name="Performance Tools">
 			<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
 			<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
index 80d4ff4d9f..dacf898b6a 100644
--- a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
+<toggleable_menu name="Gear Wearing">
 	<menu_item_call label="Outfit bearbeiten" name="edit"/>
 	<menu_item_call label="Ausziehen" name="takeoff"/>
-</menu>
+	<menu_item_call label="Outfitliste in Zwischenablage kopieren" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 75f26c6990..1971061096 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1565,6 +1565,11 @@ Versuchen Sie es später erneut.
 			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		Sie haben versucht, [OFFERS] Teleport-Angebote zu machen,
+womit Sie die Höchstgrenze von [LIMIT] überschreiten.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
 		Einwohner zu Ihrem Standort einladen?
 		<form name="form">
@@ -1986,6 +1991,10 @@ Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschl
 		Sind Sie sicher, dass Sie Ihren Reise-, Internet- und Suchverlauf löschen möchten?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		Möchten Sie Ihren Viewer-Cache wirklich leeren?
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		Sind Sie sicher, dass Sie Ihre Cookies löschen möchten?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/>
@@ -2011,48 +2020,30 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 		Die gespeicherte Voreinstellung überschreiben?
 		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		[SKY] löschen?
-		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
-	</notification>
 	<notification name="WLNoEditDefault">
 		Standardvoreinstellungen können nicht bearbeitet oder gelöscht werden.
 	</notification>
 	<notification name="WLMissingSky">
 		Diese Tageszyklusdatei verweist auf eine fehlende Himmel-Datei: [SKY].
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		Post-Processing-Effekt bereits vorhanden. Möchten Sie ihn überschreiben?
-		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
+	<notification name="WLRegionApplyFail">
+		Die Einstellungen konnten nicht auf die Region angewendet werden.  Verlassen Sie die Region und kehren Sie zurück, um das Problem zu beheben.  Angegebener Grund: [FAIL_REASON]
 	</notification>
-	<notification name="NewSkyPreset">
-		Wählen Sie einen Namen für den neuen Himmel.
-		<form name="form">
-			<input name="message">
-				Neue Voreinstellung
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Abbrechen"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		Voreinstellung bereits vorhanden!
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		Der letzte Schlüssel in diesem Tageszyklus kann nicht gelöscht werden, da ein Tageszyklus nicht leer sein kann.  Statt den letzten verbleibenden Schlüssel zu löschen, versuchen Sie stattdessen, ihn zu modifizieren und dann einen neuen zu erstellen.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		Wählen Sie einen Namen für die neue Wasservoreinstellung.
-		<form name="form">
-			<input name="message">
-				Neue Voreinstellung
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Abbrechen"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		Sie können diesem Tageszyklus keine Keyframes mehr hinzufügen.  Die Höchstzahl an Keyframes für Tageszyklen mit Umfang [SCOPE] beträgt [MAX].
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		Voreinstellung bereits vorhanden!
+	<notification name="EnvUpdateRate">
+		Sie können die Umgebungseinstellungen der Region nur alle [WAIT] Sekunden aktualisieren.  Warten Sie mindestens so lange und versuchen Sie es dann erneut.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		Standardvoreinstellungen können nicht bearbeitet oder gelöscht werden.
+	<notification name="PPSaveEffectAlert">
+		Post-Processing-Effekt bereits vorhanden. Möchten Sie ihn überschreiben?
+		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		Neue Chat-Sitzung mit [RECIPIENT] konnte nicht gestartet werden.
@@ -2081,13 +2072,14 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 		<usetemplate ignoretext="Die Kleidung, die während dem Bearbeiten meines Aussehens erstellt wird, sofort anziehen" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Sie müssen altersüberprüft sein, um diesen Bereich betreten zu können.  Möchten Sie auf der [SECOND_LIFE]-Webseite Ihr Alter verifizieren lassen?
+		Um auf Adult-Inhalte und –Bereiche in Second Life zuzugreifen, müssen Sie mindestens 18 Jahre alt sein. Bitte besuchen Sie die Altersüberprüfungsseite, um zu bestätigen, dass Sie mindestens 18 Jahre alt sind. 
+Hierzu wird Ihr Webbrowser geöffnet.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=de
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Ich habe mein Alter nicht verifizieren lassen" name="okcancelignore" notext="Nein" yestext="Ja"/>
+		<usetemplate ignoretext="Ich habe mein Alter nicht verifizieren lassen" name="okcancelignore" notext="Abbrechen" yestext="Zur Altersüberprüfung"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Um diesen Bereich besuchen zu können, müssen Ihre Zahlungsinformationen gespeichert sein.  Möchten Sie diese Einstellung auf der [SECOND_LIFE]-Webseite einrichten?
@@ -2343,6 +2335,9 @@ Fliegen ist hier nicht möglich.
 	<notification name="NoBuild">
 		In diesem Bereich ist das Bauen deaktiviert. Sie können keine Objekte bauen oder rezzen.
 	</notification>
+	<notification name="SeeAvatars">
+		Diese Parzelle verbirgt Avatare und Text-Chat vor einer anderen Parzelle.   Sie können Einwohner außerhalb dieser Parzelle weder sehen noch von ihnen gesehen werden.  Regulärer Text-Chat auf Kanal 0 ist ebenfalls blockiert.
+	</notification>
 	<notification name="ScriptsStopped">
 		Ein Administrator hat die Skriptausführung in dieser Region vorübergehend deaktiviert.
 	</notification>
@@ -2437,7 +2432,7 @@ Versuchen Sie es in einigen Minuten erneut.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Ein Objekt namens &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, das [NAME_SLURL] gehört, hat Ihnen folgende/n/s [OBJECTTYPE] übergeben:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Behalten"/>
 			<button name="Discard" text="Verwerfen"/>
@@ -2771,7 +2766,15 @@ Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
 		Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER] 
+
+Details finden Sie in der Protokolldatei.
+	</notification>
+	<notification name="MeshUploadPermError">
+		Fehler beim Anfordern der Berechtigungen zum Hochladen des Netzes
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Regionsfähigkeit „[CAPABILITY]“ konnte nicht abgerufen werden.
 	</notification>
 	<notification name="ShareItemsConfirmation">
 		Möchten Sie wirklich die folgenden Objekte:
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
index 3c56df763d..aafffc7ae3 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Auswahl speichern" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Abbrechen" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
index 632f414747..1af0492aa1 100644
--- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
@@ -46,8 +46,8 @@
 	</panel>
 	<panel name="save_revert_button_bar">
 		<layout_stack name="button_bar_ls">
-			<layout_panel name="save_btn_lp">
-				<button label="Speichern" name="save_btn"/>
+			<layout_panel name="save_btn_lp" width="61">
+				<button label="Speichern" name="save_btn" width="60" />
 			</layout_panel>
 			<layout_panel name="revert_btn_lp">
 				<button label="Änderungen rückgängig machen" name="revert_btn" tool_tip="Zur zuletzt gespeicherten Version zurückkehren"/>
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml
index 65a38ea342..ea3a938be9 100644
--- a/indra/newview/skins/default/xui/de/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_list.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/all/[SEARCH_TERM] Suche]."/>
+		<no_visible_tabs_text name="no_outfits_msg" value="Sie haben noch keine Outfits. Versuchen Sie es mit der [secondlife:///app/search/all/ ] Suche]."/>
+	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+		<menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 		<button name="trash_btn" tool_tip="Ausgewähltes Outfit löschen"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 004792bbf5..4e76147746 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -66,16 +66,16 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/>
+			<layout_panel name="share_btn_lp">
+				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
index 555fa56d57..4077fdab36 100644
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@@ -68,6 +68,8 @@
 						<text name="scripts_value" value="Ein"/>
 						<text name="damage_label" value="Schaden:"/>
 						<text name="damage_value" value="Aus"/>
+						<text name="see_avatars_label" value="Avatare sehen:"/>
+						<text name="see_avatars_value" value="Aus"/>
 						<button label="Über Land" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
index 36c77d4fe1..602ffff94d 100644
--- a/indra/newview/skins/default/xui/de/panel_places.xml
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="Profil" name="profile_btn" tool_tip="Ortsprofil anzeigen"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
index 0a596f2b25..8a5c175f2f 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		Cache:
+	</text>
+	<spinner label="Cache-Größe (64 – 9.984 MB)" name="cachesizespinner"/>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="Cache leeren" label_selected="Cache leeren" name="clear_cache"/>
+	<text name="Cache location">
+		Cache-Ordner:
+	</text>
+	<button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/>
+	<button label="Vorgabestandort" label_selected="Vorgabestandort" name="default_cache_location"/>
 	<text name="UI Size:">
 		UI-Größe:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index c118e4e4dd..1e6a03c99f 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -19,6 +19,7 @@
 	<check_box label="Aktiviert" name="enable_voice_check"/>
 	<check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="true"/>
 	<check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="true"/>
+	<check_box label="Sounds von Gesten abspielen" name="gesture_audio_play_btn" tool_tip="Markieren, um Sounds von Gesten zu hören" value="true"/>
 	<text name="voice_chat_settings">
 		Voice-Chat-Einstellungen
 	</text>
@@ -35,28 +36,5 @@
 	<button label="Taste festlegen" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Auf mittlere Maustaste zurücksetzen"/>
 	<button label="Eingabe-/Ausgabegeräte" name="device_settings_btn"/>
-	<panel label="Geräte-Einstellungen" name="device_settings_panel">
-		<panel.string name="default_text">
-			Standard
-		</panel.string>
-		<panel.string name="default system device">
-			Standardgerät
-		</panel.string>
-		<panel.string name="no device">
-			Kein Gerät
-		</panel.string>
-		<text name="Input">
-			Eingabe
-		</text>
-		<text name="My volume label">
-			Meine Lautstärke:
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler"/>
-		<text name="wait_text">
-			Bitte warten
-		</text>
-		<text name="Output">
-			Ausgabe
-		</text>
-	</panel>
+	<panel label="Geräte-Einstellungen" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml
new file mode 100644
index 0000000000..daadd30f62
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Umgebung" name="panel_env_info">
+	<text name="water_settings_title">
+		Wählen Sie die Wasser- und Himmel-/Tageszykluseinstellungen aus, die alle Besucher Ihrer Region sehen sollen.  Mehr Infos
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Second Life-Standard verwenden" name="use_sl_default_settings"/>
+		<radio_item label="Folgende Einstellungen verwenden" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Wassereinstellung
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Himmel / Tageszyklus
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Fester Himmel" name="my_sky_settings"/>
+			<radio_item label="Tageszyklus" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Voreinstellung auswählen-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="Anwenden" name="apply_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
index 01721791a7..7801be30e4 100644
--- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terrain" name="Terrain">
 	<text name="region_text_lbl">
 		Region:
@@ -6,25 +6,55 @@
 	<text name="region_text">
 		unbekannt
 	</text>
-	<spinner label="Wasserhöhe" name="water_height_spin" />
-	<button label="?" name="water_height_help" />
-	<spinner label="Obere Terraingrenze" name="terrain_raise_spin" />
-	<button label="?" name="terrain_raise_help" />
-	<spinner label="Untere Terraingrenze" name="terrain_lower_spin" />
-	<button label="?" name="terrain_lower_help" />
-	<check_box label="Grundbesitzsonne verwenden" name="use_estate_sun_check" />
-	<button label="?" name="use_estate_sun_help" />
-	<check_box label="Sonne fest" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="Phase" name="sun_hour_slider" />
-	<button label="Übernehmen" name="apply_btn" />
-	<button label="RAW-Terrain herunterladen..." name="download_raw_btn"
-	     tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter" />
-	<button label="?" name="download_raw_help" />
-	<button label="RAW-Terrain hochladen..." name="upload_raw_btn"
-	     tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter" />
-	<button label="?" name="upload_raw_help" />
-	<button label="Terrain formen" name="bake_terrain_btn"
-	     tool_tip="Das aktuelle Terrain zum Mittelpunkt für die oberen/unteren Terraingrenzen machen" />
-	<button label="?" name="bake_terrain_help" />
+	<spinner label="Wasserhöhe" name="water_height_spin"/>
+	<spinner label="Obere Terraingrenze" name="terrain_raise_spin"/>
+	<spinner label="Untere Terraingrenze" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 512x512)
+	</text>
+	<text name="height_text_lbl">
+		1 (niedrig)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Hoch)
+	</text>
+	<text name="height_text_lbl5">
+		Texturhöhenbereich
+	</text>
+	<text name="height_text_lbl10">
+		Diese Werte geben den Mischungsgrad für die obigen Texturen an.
+	</text>
+	<text name="height_text_lbl11">
+		In Metern gemessen. Der Wert „Niedrig“ ist die maximale Höhe von Textur 1, der Wert „Hoch“ die Mindesthöhe von Textur 4.
+	</text>
+	<text name="height_text_lbl6">
+		Nordwest
+	</text>
+	<text name="height_text_lbl7">
+		Nordost
+	</text>
+	<spinner label="Niedrig" name="height_start_spin_1"/>
+	<spinner label="Niedrig" name="height_start_spin_3"/>
+	<spinner label="Hoch" name="height_range_spin_1"/>
+	<spinner label="Hoch" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Südwest
+	</text>
+	<text name="height_text_lbl9">
+		Südost
+	</text>
+	<spinner label="Niedrig" name="height_start_spin_0"/>
+	<spinner label="Niedrig" name="height_start_spin_2"/>
+	<spinner label="Hoch" name="height_range_spin_0"/>
+	<spinner label="Hoch" name="height_range_spin_2"/>
+	<button label="RAW-Terrain herunterladen..." name="download_raw_btn" tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter"/>
+	<button label="RAW-Terrain hochladen..." name="upload_raw_btn" tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter"/>
+	<button label="Terrain formen" name="bake_terrain_btn" tool_tip="Das aktuelle Terrain zum Mittelpunkt für die oberen/unteren Terraingrenzen machen"/>
+	<button label="Übernehmen" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
index 990193574e..fa659040ea 100644
--- a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="LLScrollingPanelParamBase">
-	<slider label="[BESCHR]" name="param slider"/>
+	<slider label="[DESC]" name="param slider"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
index da20f7e214..b739b6197f 100644
--- a/indra/newview/skins/default/xui/de/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Standard
 	</panel.string>
+	<string name="name_no_device">
+		Kein Gerät
+	</string>
+	<string name="name_default_system_device">
+		Standardsystemgerät
+	</string>
 	<text name="Input">
 		Eingabe
 	</text>
+	<text name="Output">
+		Ausgabe
+	</text>
 	<text name="My volume label">
 		Meine Lautstärke:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Bitte warten
 	</text>
-	<text name="Output">
-		Ausgabe
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
index d817d1df90..3dd1bfb357 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sonstiges" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						Erhaltene Objekte ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						Erhaltene Objekte
+					</string>
+					<button label="Erhaltene Objekte" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] neu
+					</text>
+					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+						<text name="inbox_inventory_placeholder">
+							Einkäufe auf dem Marktplatz werden hierher geliefert.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+			<layout_panel name="outbox_layout_panel">
+				<panel label="" name="marketplace_outbox">
+					<button label="Händler-Outbox" name="outbox_btn"/>
+					<button label="" name="outbox_sync_btn" tool_tip="Zu meiner Marktplatz-Storefront verschieben"/>
+					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
+						<text name="outbox_inventory_placeholder">
+							Richtigen Sie ein Händlerkonto ein, um diese Funktion zu verwenden.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index d77b4a1e44..902f97efab 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -34,6 +34,9 @@
 	<string name="StartupInitializingVFS">
 		VFS wird initialisiert...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber.
+	</string>
 	<string name="ProgressRestoring">
 		Wird wiederhergestellt...
 	</string>
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime wurde initialisiert.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Regionsfähigkeiten anfordern...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Regionsfähigkeiten anfordern. Versuch [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Region-Handshake...
 	</string>
@@ -1192,6 +1201,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="InventoryNoTexture">
 		Sie haben keine Kopie dieser Textur in Ihrem Inventar.
 	</string>
+	<string name="InventoryInboxNoItems">
+		Objekte, die auf dem Marktplatz gekauft wurden, werden hierher geliefert.
+	</string>
+	<string name="InventoryOutboxNoItems">
+		Objekte hierher ziehen, um Sie in Ihrer Marktplatz-Storefront zum Verkauf anzubieten.
+	</string>
 	<string name="no_transfer" value=" (kein Transferieren)"/>
 	<string name="no_modify" value=" (kein Bearbeiten)"/>
 	<string name="no_copy" value=" (kein Kopieren)"/>
@@ -1238,9 +1253,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="InvFolder My Inventory">
 		Mein Inventar
 	</string>
-	<string name="InvFolder My Favorites">
-		Meine Favoriten
-	</string>
 	<string name="InvFolder Library">
 		Bibliothek
 	</string>
@@ -1299,10 +1311,10 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		Gesten
 	</string>
 	<string name="InvFolder Favorite">
-		Favoriten
+		Meine Favoriten
 	</string>
 	<string name="InvFolder favorite">
-		Favoriten
+		Meine Favoriten
 	</string>
 	<string name="InvFolder Current Outfit">
 		Aktuelles Outfit
@@ -1325,6 +1337,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="InvFolder All">
 		Alle
 	</string>
+	<string name="no_attachments">
+		Keine Anhänge getragen
+	</string>
 	<string name="Buy">
 		Kaufen
 	</string>
@@ -1634,6 +1649,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	</string>
 	<string name="SummaryForTheWeek" value="Zusammenfassung für diese Woche, beginnend am "/>
 	<string name="NextStipendDay" value=". Der nächste Stipendium-Tag ist "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="                      Gruppenanteil       Einzelanteil"/>
 	<string name="GroupColumn" value="Gruppe"/>
 	<string name="Balance">
@@ -1660,6 +1678,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="IMTeen">
 		Teen
 	</string>
+	<string name="Anyone">
+		jeder
+	</string>
 	<string name="RegionInfoError">
 		Fehler
 	</string>
@@ -1873,7 +1894,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="RegionNoCovenantOtherOwner">
 		Für diesen Grundbesitz liegt kein Vertrag vor. Das Land auf diesem Grundbesitz wird vom Grundbesitzer und nicht von Linden Lab verkauft.  Für Informationen zum Verkauf setzen Sie sich bitte mit dem Grundbesitzer in Verbindung.
 	</string>
-	<string name="covenant_last_modified" value="Zuletzt geändert:"/>
+	<string name="covenant_last_modified" value="Zuletzt geändert: "/>
 	<string name="none_text" value=" (keiner) "/>
 	<string name="never_text" value=" (nie) "/>
 	<string name="GroupOwned">
@@ -1882,6 +1903,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="Public">
 		Öffentlich
 	</string>
+	<string name="LocalSettings">
+		Lokale Einstellungen
+	</string>
+	<string name="RegionSettings">
+		Regionseinstellungen
+	</string>
 	<string name="ClassifiedClicksTxt">
 		Klicks: [TELEPORT] teleportieren, [MAP] Karte, [PROFILE] Profil
 	</string>
@@ -1954,6 +1981,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDebits">
 		Soll
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Inhalte
 	</string>
@@ -3727,6 +3757,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="LocationCtrlGeneralIconTooltip">
 		Generelle Region
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Aktualisierung
 	</string>
@@ -4152,6 +4185,87 @@ Missbrauchsbericht
 	<string name="Female - Wow">
 		Weiblich - Wow
 	</string>
+	<string name="/bow">
+		/verbeugen
+	</string>
+	<string name="/clap">
+		/klatschen
+	</string>
+	<string name="/count">
+		/zählen
+	</string>
+	<string name="/extinguish">
+		/löschen
+	</string>
+	<string name="/kmb">
+		/lmaa
+	</string>
+	<string name="/muscle">
+		/Muskel
+	</string>
+	<string name="/no">
+		/nein
+	</string>
+	<string name="/no!">
+		/nein!
+	</string>
+	<string name="/paper">
+		/Papier
+	</string>
+	<string name="/pointme">
+		/auf mich zeigen
+	</string>
+	<string name="/pointyou">
+		/auf dich zeigen
+	</string>
+	<string name="/rock">
+		/Stein
+	</string>
+	<string name="/scissor">
+		/Schere
+	</string>
+	<string name="/smoke">
+		/rauchen
+	</string>
+	<string name="/stretch">
+		/dehnen
+	</string>
+	<string name="/whistle">
+		/pfeifen
+	</string>
+	<string name="/yes">
+		/ja
+	</string>
+	<string name="/yes!">
+		/ja!
+	</string>
+	<string name="afk">
+		afk
+	</string>
+	<string name="dance1">
+		Tanzen1
+	</string>
+	<string name="dance2">
+		Tanzen2
+	</string>
+	<string name="dance3">
+		Tanzen3
+	</string>
+	<string name="dance4">
+		Tanzen4
+	</string>
+	<string name="dance5">
+		Tanzen5
+	</string>
+	<string name="dance6">
+		Tanzen6
+	</string>
+	<string name="dance7">
+		Tanzen7
+	</string>
+	<string name="dance8">
+		Tanzen8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index a8b3ce9c28..3dd394bac1 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -98,26 +98,80 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
       label="Credits" 
       help_topic="about_credits_tab"
       name="credits_panel">
+      <text
+          follows="top|left|right"
+          height="10"
+          layout="topleft"
+          left="5"
+          name="linden_intro"
+          top="10"
+          width="435"
+          wrap="true">
+Second Life is brought to you by the Lindens:
+      </text>
       <text_editor
        enabled="false" 
-       follows="left|top"
-       height="375"
+       follows="top|left"
+       height="98"
        bg_readonly_color="Transparent"
        left="5"
        text_color="LtGray"
        max_length="65536"
-       name="credits_editor"
-       top="5"
+       name="linden_names"
+       top_pad="10"
        width="435"
        word_wrap="true">
-Second Life is brought to you by Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain, and many others.
-
-Thank you to the following Residents for helping to ensure that this is the best version yet: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan, and many others.
-
-
-
-
-"The work goes on, the cause endures, the hope still lives, and the dreams shall never die" - Edward Kennedy
+Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+      </text_editor>
+      <text
+          follows="top|left"
+          height="10"
+          layout="topleft"
+          left="5"
+          name="contrib_intro"
+          top_pad="10"
+          width="435"
+          wrap="true">
+with open source contributions from:
+      </text>
+      <text_editor
+       enabled="false" 
+       follows="top|left"
+       height="98"
+       bg_readonly_color="Transparent"
+       left="5"
+       text_color="LtGray"
+       max_length="65536"
+       name="contrib_names"
+       top_pad="10"
+       width="435"
+       word_wrap="true">
+Dummy Name replaced at run time
+      </text_editor>
+      <text
+          follows="top|left"
+          height="10"
+          layout="topleft"
+          left="5"
+          name="trans_intro"
+          top_pad="10"
+          width="435"
+          wrap="true">
+and translations from:
+      </text>
+      <text_editor
+       enabled="false" 
+       follows="top|left"
+       height="98"
+       bg_readonly_color="Transparent"
+       left="5"
+       text_color="LtGray"
+       max_length="65536"
+       name="trans_names"
+       top_pad="10"
+       width="435"
+       word_wrap="true">
+Dummy Name replaced at run time
       </text_editor>
     </panel>
     <panel
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 6e985e0476..07cb4c12f5 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -414,7 +414,7 @@
              right="-10"
              name="Cancel Land Sale"
              left_pad="5"
-             top_pad="-15"
+             top_pad="7"
              width="180" />
             <text
              type="string"
@@ -488,6 +488,7 @@
              width="186">
                 0
             </text>
+
             <button
              enabled="false"
              follows="left|top"
@@ -495,9 +496,20 @@
              label="Buy Land"
              layout="topleft"
              left_delta="52"
+			 top_pad="5"
              name="Buy Land..."
-             top_pad="7"
              width="130" />
+			<button
+             enabled="false"
+             follows="left|top"
+             height="23"
+             label="Linden Sale"
+             layout="topleft"
+             left="10"
+             name="Linden Sale..."
+             tool_tip="Land must be owned, set content, and not already for auction."
+             top_pad="-23"
+             width="150" />
             <button
              enabled="true"
              follows="left|top"
@@ -545,18 +557,7 @@
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-50"
-             width="180" />
-            <button
-             enabled="false"
-             follows="left|top"
-             height="23"
-             label="Linden Sale"
-             layout="topleft"
-             left_delta="0"
-             name="Linden Sale..."
-             tool_tip="Land must be owned, set content, and not already for auction."
-             top_pad="2"
+             top_delta="-25"
              width="180" />
         </panel>
         <panel
@@ -1204,6 +1205,10 @@ Only large parcels can be listed in search.
              name="push_restrict_region_text">
                 No Pushing (Region Override)
             </panel.string>
+            <panel.string
+             name="see_avs_text">
+                 See and chat with residents on this parcel
+            </panel.string>
             <text
              type="string"
              length="1"
@@ -1313,7 +1318,7 @@ Only large parcels can be listed in search.
              name="check group scripts"
              top_delta="0"
              width="70" />
-            <text
+           <text
              type="string"
              text_color="white"
              length="1"
@@ -1514,10 +1519,32 @@ Only large parcels can be listed in search.
              type="string"
              length="1"
              follows="left|top"
+             text_color="white"
+             height="16"
+             layout="topleft"
+             left="230"
+             top="174"
+             name="allow_label5"
+             width="278">
+              Allow Residents on other parcels to:
+            </text>
+            <check_box
+             height="16"
+             label="See Avatars"
+             follows="top"
+             layout="topleft"
+             left="230"
+             name="SeeAvatarsCheck"
+             tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them."
+             width="120" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
              height="16"
              layout="topleft"
-             left="220"
-             top="180"
+             left="230"
+             top="230"
              text_color="white"
              name="landing_point"
              word_wrap="true"
@@ -1531,7 +1558,7 @@ Only large parcels can be listed in search.
              label_selected="Set"
              layout="topleft"
              name="Set"
-             right="-68"
+             left="230"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
              width="50" />
             <button
@@ -1543,7 +1570,6 @@ Only large parcels can be listed in search.
              left_pad="5"
              name="Clear"
              tool_tip="Clear the landing point"
-             right="-10"
              width="55" />
             <text
              type="string"
@@ -1552,7 +1578,7 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="220"
+             left="230"
              top_pad="10"
              name="Teleport Routing: "
              width="200">
@@ -1845,6 +1871,34 @@ Only large parcels can be listed in search.
              name="check sound local"
              left_pad="0"
              width="292" />
+          <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="Avatar Sounds:"
+             top_pad="10"
+             width="100">
+               Avatar Sounds:
+          </text>
+          <check_box
+             height="16"
+             label="Everyone"
+             layout="topleft"
+             left_pad="0"
+             name="all av sound check"
+             top_delta="0"
+             width="130" />
+          <check_box
+             height="16"
+             label="Group"
+             layout="topleft"
+             left_pad="0"
+             name="group av sound check"
+             top_delta="0"
+             width="70" />
             <text
              type="string"
              length="1"
@@ -2125,4 +2179,4 @@ Only large parcels can be listed in search.
              </panel>
         </panel>
     </tab_container>
-</floater>
+</floater>
+\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index 56230e912c..afb7917043 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -2,27 +2,84 @@
 <floater
  legacy_header_height="18"
  follows="right"
- height="170"
+ height="198"
  layout="topleft"
  name="build options floater"
  help_topic="build_options_floater"
  save_rect="true"
  title="GRID OPTIONS"
  width="264">
+ 	<floater.string
+     name="grid_screen_text">
+        Screen
+    </floater.string>
+    <floater.string
+     name="grid_local_text">
+        Local
+    </floater.string>
+    <floater.string
+     name="grid_world_text">
+        World
+    </floater.string>
+    <floater.string
+     name="grid_reference_text">
+        Reference
+    </floater.string>
+    <floater.string
+     name="grid_attachment_text">
+        Attachment
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     tool_tip="Grid opacity"
+     name="grid_mode_label"
+     top_pad="30"
+     width="123">
+        Mode
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_pad="9"
+     follows="left|top"
+     name="combobox grid mode"
+     tool_tip="Choose the type of grid ruler for positioning the object"
+     top_delta="-3"
+     width="108">
+      <combo_box.item
+       label="World grid"
+       name="World"
+       value="World" />
+      <combo_box.item
+       label="Local grid"
+       name="Local"
+       value="Local" />
+      <combo_box.item
+       label="Reference grid"
+       name="Reference"
+       value="Reference" />
+       <combo_box.commit_callback
+      function="GridOptions.gridMode"/>
+    </combo_box>
     <spinner
      control_name="GridResolution"
      follows="left|top"
      height="23"
      initial_value="1"
-     label="Grid Units (meters)"
-     label_width="160"
+     label="Units (meters)"
+     label_width="130"
      layout="topleft"
      left="10"
      max_val="5"
      min_val="0.01"
      name="GridResolution"
-     top="25"
-     width="230" />
+     top_pad="4"
+     width="200" />
     <spinner
      control_name="GridDrawSize"
      decimal_digits="1"
@@ -30,15 +87,15 @@
      height="23"
      increment="0.5"
      initial_value="5"
-     label="Grid Extents (meters)"
-     label_width="160"
+     label="Extents (meters)"
+     label_width="130"
      layout="topleft"
      left_delta="0"
      max_val="50"
      min_val="1"
      name="GridDrawSize"
      top_pad="0"
-     width="230" />
+     width="200" />
     <check_box
      control_name="GridSubUnit"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index ab81a86720..22cc058e46 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -208,7 +208,7 @@ supports [AMOUNT2] objects
      name="region_name_text"
      top_delta="0"
      use_ellipses="true"
-     width="155">
+     width="150">
         (unknown)
     </text>
     <icon
@@ -240,7 +240,8 @@ supports [AMOUNT2] objects
      left_delta="125"
      name="region_type_text"
      top_delta="0"
-     width="175">
+     use_ellipses="true"
+     width="170">
         (unknown)
     </text>
     <text
@@ -265,7 +266,8 @@ supports [AMOUNT2] objects
      left_delta="125"
      name="estate_name_text"
      top_delta="0"
-     width="175">
+     use_ellipses="true"
+     width="170">
         (unknown)
     </text>
     <text
@@ -290,7 +292,8 @@ supports [AMOUNT2] objects
      left_delta="125"
      name="estate_owner_text"
      top_delta="0"
-     width="175">
+     use_ellipses="true"
+     width="170">
         (unknown)
     </text>
     <text
@@ -348,11 +351,10 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="12"
      layout="topleft"
-     left="500"
      name="covenant_timestamp_text"
-     right="725"
+     right="-15"
      top="175"
-     width="275"
+     width="281"
      word_wrap="true" />
     <text_editor
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
deleted file mode 100644
index 65e2462ef8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,558 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="275"
- layout="topleft"
- name="Day Cycle Floater"
- help_topic="day_cycle_floater"
- save_rect="true"
- title="DAY CYCLE EDITOR"
- width="658">
-    <tab_container
-     follows="left|top"
-     height="255"
-     layout="topleft"
-     left="0"
-     name="Day Cycle Tabs"
-     tab_position="top"
-     top="20"
-     width="656">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="255"
-         label="Day Cycle"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         name="Day Cycle"
-         top="0"
-         width="654">
-            <multi_slider
-             can_edit_text="true"
-             control_name="WLTimeSlider"
-             decimal_digits="0"
-             draw_track="false"
-             follows="bottom"
-             height="10"
-             increment="0.0833333"
-             initial_value="0"
-             layout="topleft"
-             left="20"
-             max_sliders="20"
-             max_val="24"
-             name="WLTimeSlider"
-             show_text="false"
-             top="25"
-             use_triangle="true"
-             width="525" />
-            <multi_slider
-             can_edit_text="true"
-             control_name="WLDayCycleKeys"
-             decimal_digits="0"
-             follows="bottom"
-             height="10"
-             increment="0.0833333"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_sliders="20"
-             max_val="24"
-             name="WLDayCycleKeys"
-             show_text="false"
-             top_pad="15"
-             width="525" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left="8"
-             name="WL12am"
-             top="74"
-             width="55">
-                12am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL3am"
-             top_delta="0"
-             width="55">
-                3am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL6am"
-             top_delta="0"
-             width="55">
-                6am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL9amHash"
-             top_delta="0"
-             width="55">
-                9am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL12pmHash"
-             top_delta="0"
-             width="55">
-                12pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL3pm"
-             top_delta="0"
-             width="55">
-                3pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL6pm"
-             top_delta="0"
-             width="55">
-                6pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL9pm"
-             top_delta="0"
-             width="55">
-                9pm
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="WL12am2"
-             top_delta="0"
-             width="55">
-                12am
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left="20"
-             name="WL12amHash"
-             top="54"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL3amHash"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL6amHash"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL9amHash2"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL12pmHash2"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL3pmHash"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL6pmHash"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="11"
-             layout="topleft"
-             left_pad="59"
-             name="WL9pmHash"
-             top_delta="3"
-             width="6">
-                I
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="14"
-             layout="topleft"
-             left_pad="59"
-             name="WL12amHash2"
-             top_delta="-3"
-             width="6">
-                |
-            </text>
-            <button
-             height="20"
-             label="Add Key"
-             label_selected="Add Key"
-             layout="topleft"
-             left="555"
-             name="WLAddKey"
-             top="30"
-             width="96" />
-            <button
-             height="20"
-             label="Delete Key"
-             label_selected="Delete Key"
-             layout="topleft"
-             left_delta="0"
-             name="WLDeleteKey"
-             top_pad="5"
-             width="96" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="20"
-             name="WLCurKeyFrameText"
-             top="104"
-             width="235">
-                Key Frame Settings:
-            </text>
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="30"
-             name="WLCurKeyTimeText"
-             top="124"
-             width="105">
-                Key Time:
-            </text>
-            <spinner
-             control_name="WLCurKeyHour"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Hour"
-             label_width="35"
-             layout="topleft"
-             left_delta="20"
-             max_val="100"
-             name="WLCurKeyHour"
-             top_pad="4"
-             width="74" />
-            <spinner
-             control_name="WLCurKeyMin"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="5"
-             initial_value="0"
-             label="Min"
-             label_width="45"
-             layout="topleft"
-             left_pad="5"
-             max_val="55"
-             name="WLCurKeyMin"
-             top_delta="0"
-             width="85" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="30"
-             name="WLCurKeyTimeText2"
-             top="169"
-             width="185">
-                Key Preset:
-            </text>
-            <combo_box
-             height="18"
-             label="Preset"
-             layout="topleft"
-             left_delta="0"
-             name="WLKeyPresets"
-             top_pad="7"
-             width="205" />
-            <view_border
-             bevel_style="none"
-             follows="top|left"
-             height="115"
-             layout="topleft"
-             left="12"
-             top="101"
-             width="240" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_pad="15"
-             name="DayCycleText"
-             top="114"
-             width="120">
-                Snap:
-            </text>
-            <combo_box
-             enabled="false"
-             height="18"
-             label="5 min"
-             layout="topleft"
-             left_delta="0"
-             name="WLSnapOptions"
-             top_pad="7"
-             width="70" />
-            <text
-             type="string"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="DayCycleText2"
-             top_pad="17"
-             width="120">
-                Length of Cycle:
-            </text>
-            <spinner
-             control_name="WLLengthOfDayHour"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Hour"
-             label_width="33"
-             layout="topleft"
-             left_delta="-3"
-             max_val="100"
-             name="WLLengthOfDayHour"
-             top_pad="4"
-             width="74" />
-            <spinner
-             control_name="WLLengthOfDayMin"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="0"
-             label="Min"
-             label_width="25"
-             layout="topleft"
-             left_pad="2"
-             max_val="59"
-             name="WLLengthOfDayMin"
-             top_delta="0"
-             width="65" />
-            <spinner
-             control_name="WLLengthOfDaySec"
-             decimal_digits="0"
-             follows="left|top"
-             height="16"
-             increment="1"
-             initial_value="24"
-             label="Sec"
-             label_width="25"
-             layout="topleft"
-             left_pad="2"
-             max_val="59"
-             name="WLLengthOfDaySec"
-             top_delta="0"
-             width="65"/>
-            <text
-             type="string"
-             halign="right"
-             length="1"
-             border_visible="true"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-23"
-             name="DayCycleText3"
-             top="114"
-             width="85">
-                Preview :
-            </text>
-            <button
-             height="20"
-             label="Play"
-             label_selected="Play"
-             layout="topleft"
-             left="480"
-             name="WLAnimSky"
-             top_pad="5"
-             width="83" />
-            <button
-             height="20"
-             label="Stop!"
-             label_selected="Stop"
-             layout="topleft"
-             left_pad="4"
-             name="WLStopAnimSky"
-             top_delta="0"
-             width="83" />
-            <button
-             height="20"
-             label="Use Estate Time"
-             label_selected="Go to Estate Time"
-             layout="topleft"
-             left="480"
-             name="WLUseLindenTime"
-             top_pad="9"
-             width="170" />
-            <button
-             height="20"
-             label="Save Test Day"
-             label_selected="Save Test Day"
-             layout="topleft"
-             left_delta="0"
-             name="WLSaveDayCycle"
-             top_pad="9"
-             width="170" />
-            <button
-             height="20"
-             label="Load Test Day"
-             label_selected="Load Test Day"
-             layout="topleft"
-             left_delta="0"
-             name="WLLoadDayCycle"
-             top_pad="3"
-             width="170" />
-        </panel>
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..b5de4166f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="130"
+ help_topic=""
+ layout="topleft"
+ name="Delete Env Preset"
+ save_rect="true"
+ title="DELETE ENV PRESET"
+ width="550">
+
+    <string name="title_water">Delete Water Preset</string>
+    <string name="title_sky">Delete Sky Preset</string>
+    <string name="title_day_cycle">Delete Day Cycle</string>
+
+    <string name="label_water">Preset:</string>
+    <string name="label_sky">Preset:</string>
+    <string name="label_day_cycle">Day cycle:</string>
+   
+    <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string>
+    <string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string>
+
+    <string name="combo_label">-Select a preset-</string>
+
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="50"
+     name="label"
+     top="60"
+     width="60">
+     Preset:
+    </text>
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     name="preset_combo"
+     top_delta="-5"
+     width="200"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Delete"
+     layout="topleft"
+     left_pad="15"
+     name="delete"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel"
+     width="70"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..d9a3ad0c4b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="381"
+ layout="topleft"
+ name="Edit Day cycle"
+ help_topic="day_presets"
+ save_rect="true"
+ title="Edit Day Cycle"
+ width="705">
+
+    <string name="title_new">Create a New Day Cycle</string>
+    <string name="title_edit">Edit Day Cycle</string>
+    <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string>
+    <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
+    <string name="combo_label">-Select a preset-</string>
+
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="hint"
+     top="25"
+     width="685" />
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="label"
+     top_pad="25"
+     width="120">
+     Preset Name:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     max_chars="100"
+     name="day_cycle_combo"
+     top_delta="-5"
+     width="200" />
+    <line_editor
+     height="20"
+     left_delta="0"
+     name="day_cycle_name"
+     top_delta="0"
+     visible="true"
+     width="200" />
+    <text
+     follows="top|left|right"
+     height="95"
+     layout="topleft"
+     left_pad="10"
+     name="note"
+     top_delta="0"
+     width="345"
+     wrap="true">
+     Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
+    </text>
+ <!--======== Controls panel ========-->
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"
+     left="10"    
+     name="hint_item1"
+     top="100"
+     width="300">
+     - Click on a tab to edit the specific sky settings and time.
+    </text>
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"    
+     name="hint_item2"
+     top_pad="10"
+     width="300">
+     - Click and drag the tabs to set the transition times.
+    </text>
+    <text
+     follows="left|top|right"
+     height="10"
+     layout="topleft"
+     name="hint_item3"
+     top_pad="10"
+     width="300">
+     - Use the scrubber to preview your day cycle.
+    </text>
+    <panel
+     follows="top|left"
+     height="100"
+     name="day_cycle_slider_panel"
+     layout="topleft"
+     left_delta="25"
+     top_pad="15"
+     width="660">
+        <multi_slider
+         can_edit_text="true"
+         control_name="WLTimeSlider"
+         decimal_digits="0"
+         draw_track="false"
+         follows="bottom"
+         height="10"
+         increment="0.0833333"
+         initial_value="0"
+         layout="topleft"
+         left="20"
+         max_sliders="20"
+         max_val="24"
+         name="WLTimeSlider"
+         show_text="false"
+         top_pad="0"
+         use_triangle="true"
+         width="525" />
+        <multi_slider
+         can_edit_text="true"
+         control_name="WLDayCycleKeys"
+         decimal_digits="0"
+         follows="bottom"
+         height="10"
+         increment="0.0833333"
+         initial_value="0"
+         layout="topleft"
+         left_delta="0"
+         max_sliders="20"
+         max_val="24"
+         name="WLDayCycleKeys"
+         show_text="false"
+         top_pad="15"
+         width="525" />
+        <button
+         height="20"
+         label="Add Key"
+         label_selected="Add Key"
+         layout="topleft"
+         left_pad="20"
+         name="WLAddKey"
+         top_delta="-18"
+         width="96" />
+        <button
+         height="20"
+         label="Delete Key"
+         label_selected="Delete Key"
+         layout="topleft"
+         name="WLDeleteKey"
+         top_pad="5"
+         width="96" />
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left="8"
+         name="WL12am"
+         top="74"
+         width="55">
+         12am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL3am"
+         top_delta="0"
+         width="55">
+            3am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL6am"
+         top_delta="0"
+         width="55">
+            6am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL9amHash"
+         top_delta="0"
+         width="55">
+            9am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL12pmHash"
+         top_delta="0"
+         width="55">
+            12pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL3pm"
+         top_delta="0"
+         width="55">
+            3pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL6pm"
+         top_delta="0"
+         width="55">
+            6pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL9pm"
+         top_delta="0"
+         width="55">
+            9pm
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         height="16"
+         layout="topleft"
+         left_pad="10"
+         name="WL12am2"
+         top_delta="0"
+         width="55">
+            12am
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left="20"
+         name="WL12amHash"
+         top="54"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL3amHash"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL6amHash"
+         top_delta="-3"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL9amHash2"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL12pmHash2"
+         top_delta="-3"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL3pmHash"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL6pmHash"
+         top_delta="-3"
+         width="6">
+            |
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="11"
+         layout="topleft"
+         left_pad="59"
+         name="WL9pmHash"
+         top_delta="3"
+         width="6">
+            I
+        </text>
+        <text
+         type="string"
+         length="1"
+         border_visible="true"
+         follows="left|top|right"
+         font="SansSerif"
+         height="14"
+         layout="topleft"
+         left_pad="59"
+         name="WL12amHash2"
+         top_delta="-3"
+         width="6">
+         |
+        </text>
+    </panel>
+    <text
+     type="string"
+     length="1"
+     border_visible="true"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="192"
+     name="WLCurKeyPresetText"
+     top_pad="10"
+     width="80">
+        Sky Setting:
+    </text>
+    <combo_box
+     height="18"
+     label="Preset"
+     layout="topleft"
+     left_pad="5"
+     name="WLSkyPresets"
+     width="205" />
+        <text
+     type="string"
+     length="1"
+     border_visible="true"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="-40"
+     name="WLCurKeyTimeText"
+     top_pad="15"
+     width="35">
+        Time:
+    </text>
+    <time
+     follows="left|top"
+     height="16"
+     label_width="0"
+     layout="topleft"
+     left_pad="3"
+     name="time"
+     top_delta="-1"
+     value="6:00 AM"
+     width="75"/> 
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="20"
+     width="685"/>
+    <loading_indicator
+     height="23"
+     layout="topleft"
+     left="25"
+     name="progress_indicator"
+     top="350"
+     visible="false"
+     width="23" />
+    <check_box
+     follows="top|left"
+     height="10"
+     label="Make this my new day cycle"
+     layout="topleft"
+     left="310"
+     name="make_default_cb"
+     top_delta="13"
+     width="230"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left_pad="0"
+     name="save"
+     top_delta="-13"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="15"
+     name="cancel"
+     top_delta="0"
+     width="70"/>
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..56233d91ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -0,0 +1,953 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="375"
+ layout="topleft"
+ name="Edit Sky Preset"
+ help_topic="sky_preset"
+ save_rect="true"
+ title="Edit Sky Preset"
+ width="840">
+
+    <string name="title_new">Create a New Sky Preset</string>
+    <string name="title_edit">Edit Sky Preset</string>
+    <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
+    <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string>
+    <string name="combo_label">-Select a preset-</string>
+
+    <text
+     follows="top|left|right"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="hint"
+     top="25"
+     width="700">
+     To edit your preset, adjust the controls then click "Save"
+     </text>
+    <text
+     follows="top|left|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="label"
+     top_pad="25"
+     width="120">
+        Preset Name:
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|left"
+     layout="topleft"
+     left_pad="10"
+     max_chars="100"
+     name="sky_preset_combo"
+     top_delta="-5"
+     width="200"/>
+    <line_editor
+     height="20"
+     left_delta="0"
+     name="sky_preset_name"
+     top_delta="0"
+     width="200" />
+    <text
+     follows="top|left|right"
+     height="40"
+     layout="topleft"
+     left_pad="10"
+     name="note"
+     top_delta="0"
+     width="405"
+     wrap="true">
+     Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
+    </text>
+ <!--======== Controls panel ========-->
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="203"
+     layout="topleft"
+     left="25"
+     name="panel_water_preset"
+     top="122"
+     visible="true"
+     width="790"/>
+    <tab_container
+     follows="left|top"
+     height="225"
+     halign="center"
+     layout="topleft"
+     left="22"
+     name="WindLight Tabs"
+     tab_position="top"
+     top="101"
+     width="794">
+    <panel
+     border="true"
+     bevel_style="none"
+     follows="left|top|right|bottom"
+     height="196"
+     label="ATMOSPHERE"
+     layout="topleft"
+     left="1"
+     help_topic="sky_preset_atmosphere"
+     mouse_opaque="false"
+     name="Atmosphere"
+     top="60"
+     width="698">
+
+         <!--======== Tab Panel I. I conlumn of controls ========--> 
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left="40"
+         name="BHText"
+         top="25"
+         width="200">
+           Blue Horizon
+        </text>
+        <color_swatch
+         can_apply_immediately="true"
+         follows="left|top"
+         height="37"
+         label_height="0"
+         layout="topleft"
+         left_delta="0"
+         name="WLBlueHorizon"
+         top_pad="6"
+         width="60" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_delta="0"
+         top_pad="20"
+         name="BDensText"
+         width="200">
+            Haze Horizon
+        </text>
+        <slider
+         control_name="WLHazeHorizon"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.25"
+         layout="topleft"
+         left_delta="0"
+         top_pad="6"
+         name="WLHazeHorizon"
+         width="200" />
+
+         <!--======== Tab Panel I. II conlumn of controls ========-->
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_pad="55"
+         name="BDensText2"
+         top="25"
+         width="200">
+            Blue Density
+        </text>
+        <color_swatch
+         can_apply_immediately="true"
+         follows="left|top"
+         height="37"
+         label_height="0"
+         layout="topleft"
+         left_delta="0"
+         name="WLBlueDensity"
+         top_pad="6"
+         width="60" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_delta="0"
+         name="HDText"
+         top_pad="20"
+         width="200">
+            Haze Density
+        </text>
+        <slider
+         control_name="WLHazeDensity"
+         decimal_digits="2"
+         follows="left|top"
+         height="10"
+         increment="0.01"
+         initial_value="0.7"
+         layout="topleft"
+         left_delta="0"
+         max_val="4"
+         name="WLHazeDensity"
+         top_pad="6"
+         width="200" />
+
+             <!--======== Tab Panel I. III conlumn of controls ========-->
+
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         font="SansSerif"
+         height="16"
+         layout="topleft"
+         left_pad="55"
+         name="DensMultText"
+         top="25"
+         width="200">
+           Density Multiplier
+        </text>
+            <slider
+             control_name="WLDensityMult"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             layout="topleft"
+             left_delta="15"
+             max_val="0.9"
+             name="WLDensityMult"
+             top_pad="6"
+             width="200" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="WLDistanceMultText"
+             top_pad="20"
+             width="200">
+                Distance Multiplier
+            </text>
+            <slider
+             control_name="WLDistancMult"
+             decimal_digits="1"
+             follows="left|top"
+             height="10"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="15"
+             max_val="100"
+             name="WLDistanceMult"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="MaxAltText"
+             top_pad="20"
+             width="200">
+                Max Altitude
+            </text>
+            <slider
+             control_name="WLMaxAltitude"
+             decimal_digits="0"
+             follows="left|top"
+             height="10"
+             increment="1"
+             initial_value="500"
+             layout="topleft"
+             left_delta="15"
+             max_val="4000"
+             name="WLMaxAltitude"
+             top_pad="6"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         bevel_style="none"
+         follows="left|top|right|bottom"
+         height="196"
+         label="LIGHTING"
+         layout="topleft"
+         left_delta="0"
+         help_topic="sky_preset_lighting"
+         name="Lighting"
+         top_delta="4"
+         width="698">
+
+         <!--======== Tab Panel II. I conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="20"
+             name="SLCText"
+             top="25"
+             width="150">
+                Sun/Moon Color
+            </text>
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="37"
+             label_height="0"
+             layout="topleft"
+             left_delta="10"
+             name="WLSunlight"
+             top_pad="6"
+             width="60" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-10"
+             name="WLAmbientText"
+             top_pad="20"
+             width="150">
+                Ambient
+            </text>
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="37"
+             label_height="0"
+             layout="topleft"
+             left_delta="10"
+             name="WLAmbient"
+             top_pad="6"
+             width="60" />
+
+            <!--======== Tab Panel II. II conlumn of controls ========-->
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="100"
+             name="SunGlowText"
+             top="25"
+             width="200">
+                Sun Glow
+            </text>
+            <slider
+             control_name="WLGlowB"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             label="Focus "
+             layout="topleft"
+             left_delta="10"
+             max_val="0.5"
+             name="WLGlowB"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLGlowR"
+             decimal_digits="2"
+             follows="top|left"
+             height="10"
+             increment="0.01"
+             initial_value="0.25"
+             label="Size    "
+             layout="topleft"
+             left_delta="0"
+             max_val="1.99"
+             min_val="1"
+             name="WLGlowR"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-10"
+             name="WLStarText"
+             top_pad="20"
+             width="200">
+                Star Brightness
+            </text>
+            <slider
+             control_name="WLStarAlpha"
+             decimal_digits="2"
+             follows="top|left"
+             height="10"
+             increment="0.01"
+             initial_value="0"
+             layout="topleft"
+             left_delta="10"
+             max_val="2"
+             name="WLStarAlpha"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-10"
+             name="SceneGammaText"
+             top_pad="20"
+             width="200">
+                Scene Gamma
+            </text>
+            <slider
+             control_name="WLGamma"
+             decimal_digits="2"
+             follows="top|left"
+             height="10"
+             increment="0.01"
+             initial_value="2.0"
+             layout="topleft"
+             left_delta="10"
+             max_val="10"
+             name="WLGamma"
+             top_pad="6"
+             width="200" />
+
+            <!--======== Tab Panel II. III conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="60"
+             name="TODText"
+             top="25"
+             width="200">
+                Sun/Moon Position
+            </text>
+            <multi_slider
+             can_edit_text="true"
+             control_name="WLSunPos"
+             decimal_digits="0"
+             follows="bottom"
+             height="10"
+             increment="0.0833333"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             max_sliders="1"
+             max_val="24"
+             name="WLSunPos"
+             show_text="false"
+             top_pad="0"
+             width="300" />
+
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_delta="2"
+             name="WL12amHash"
+             top_pad="6"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="66"
+             name="WL6amHash"
+             top_delta="0"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="67"
+             name="WL12pmHash2"
+             top_delta="0"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="67"
+             name="WL6pmHash"
+             top_delta="0"
+             width="6">
+                |
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             font="SansSerif"
+             height="14"
+             layout="topleft"
+             left_pad="67"
+             name="WL12amHash2"
+             top_delta="0"
+             width="6">
+             |
+            </text>
+
+
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_delta="-300"
+             name="WL12am"
+             top="74"
+             width="55">
+             12am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="20"
+             name="WL6am"
+             top_delta="0"
+             width="55">
+                6am
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="15"
+             name="WL12pmHash"
+             top_delta="0"
+             width="55">
+                12pm
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="18"
+             name="WL6pm"
+             top_delta="0"
+             width="55">
+                6pm
+            </text>
+            <text
+             type="string"
+             length="1"
+             border_visible="true"
+             follows="left|top|right"
+             height="16"
+             layout="topleft"
+             left_pad="15"
+             name="WL12am2"
+             top_delta="0"
+             width="55">
+                12am
+            </text>
+
+            <time
+             follows="left|top"
+             height="16"
+             label_width="0"
+             layout="topleft"
+             left_delta="-175"
+             name="WLDayTime"
+             top_pad="15"
+             value="6:00 AM"
+             width="75"/> 
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-106"
+             name="WLEastAngleText"
+             top_pad="24"
+             width="200">
+                East Angle
+            </text>
+            <slider
+             control_name="WLEastAngle"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.0"
+             layout="topleft"
+             left_delta="10"
+             name="WLEastAngle"
+             top_pad="6"
+             width="200" />
+
+        </panel>
+        <panel
+         border="true"
+         bevel_style="none"
+         follows="left|top|right|bottom"
+         height="196"
+         label="CLOUDS"
+         layout="topleft"
+         left_delta="0"
+         mouse_opaque="false"
+         help_topic="sky_preset_clouds"
+         name="Clouds"
+         top_delta="4"
+         width="698">
+
+            <!--======== Tab Panel III. I conlumn of controls ========-->
+
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="40"
+             name="WLCloudColorText"
+             top="25"
+             width="200">
+                Cloud Color
+            </text>
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="37"
+             label_height="0"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColor"
+             top_pad="6"
+             width="60" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudColorText2"
+             top_pad="20"
+             width="200">
+                Cloud XY/Density
+            </text>
+            <slider
+             control_name="WLCloudX"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="X"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudX"
+             width="200" />
+            <slider
+             control_name="WLCloudY"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="Y"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudY"
+             width="200" />
+            <slider
+             control_name="WLCloudDensity"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="D"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDensity"
+             top_pad="6"
+             width="200" />
+            
+            <!--======== Tab Panel III. II conlumn of controls ========-->
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="55"
+             name="WLCloudCoverageText"
+             top="15"
+             width="200">
+                Cloud Coverage
+            </text>
+            <slider
+             control_name="WLCloudCoverage"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="15"
+             name="WLCloudCoverage"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="WLCloudScaleText"
+             top_pad="20"
+             width="200">
+                Cloud Scale
+            </text>
+            <slider
+             control_name="WLCloudScale"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="15"
+             min_val="0.01"
+             name="WLCloudScale"
+             top_pad="6"
+             width="200" />
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WLCloudDetailText"
+             top_pad="20"
+             width="200">
+                Cloud Detail (XY/Density)
+            </text>
+            <slider
+             control_name="WLCloudDetailX"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="X"
+             layout="topleft"
+             left_delta="0"
+             top_pad="6"
+             name="WLCloudDetailX"
+             width="200" />
+            <slider
+             control_name="WLCloudDetailY"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="Y"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDetailY"
+             top_pad="6"
+             width="200" />
+            <slider
+             control_name="WLCloudDetailDensity"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="D"
+             layout="topleft"
+             left_delta="0"
+             name="WLCloudDetailDensity"
+             top_pad="6"
+             width="200" />
+            
+            <!--======== Tab Panel III. III conlumn of controls ========-->
+            
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_pad="55"
+             name="WLCloudScrollXText"
+             top="15"
+             width="150">
+                Cloud Scroll X
+            </text>
+            <check_box
+             control_name="WLCloudLockX"
+             follows="left|top"
+             height="16"
+             label="Lock"
+             layout="topleft"
+             left_delta="150"
+             name="WLCloudLockX"
+             top_delta="0"
+             width="200" />
+            <slider
+             control_name="WLCloudScrollX"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="-135"
+             max_val="10"
+             min_val="-10"
+             name="WLCloudScrollX"
+             top_pad="6"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-15"
+             name="WLCloudScrollYText"
+             top_pad="20"
+             width="150">
+                Cloud Scroll Y
+            </text>
+            <check_box
+             control_name="WLCloudLockY"
+             follows="left|top"
+             height="16"
+             label="Lock"
+             layout="topleft"
+             left_delta="150"
+             name="WLCloudLockY"
+             width="200" />
+            <slider
+             control_name="WLCloudScrollY"
+             decimal_digits="2"
+             follows="left|top"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_delta="-135"
+             max_val="10"
+             min_val="-10"
+             name="WLCloudScrollY"
+             top_pad="6"
+             width="200" />
+        </panel>
+    </tab_container>
+<!--======== End of Controls panel ========-->
+
+    <check_box
+     follows="top|left"
+     height="10"
+     label="Make this preset my new sky setting"
+     layout="topleft"
+     left="380"
+     name="make_default_cb"
+     top_pad="30"
+     width="280"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left_pad="0"
+     name="save"
+     width="70"/>
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     left_pad="15"
+     name="cancel"
+     width="70"/>
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..905983e7fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="375"
+ layout="topleft"
+ name="Edit Water Preset"
+ help_topic="water_preset"
+ save_rect="true"
+ title="Edit Water Preset"
+ width="725">
+
+  <string name="title_new">Create a New Water Preset</string>
+  <string name="title_edit">Edit a Water Preset</string>
+  <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
+  <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string>
+  <string name="combo_label">-Select a preset-</string>
+
+  <text
+   follows="top|left|right"
+   height="10"
+   layout="topleft"
+   left="30"
+   name="hint"
+   top="25"
+   width="680">
+   	To edit your preset, adjust the controls then click "Save"
+   </text>
+   
+   <text
+   follows="top|left|right"
+   font="SansSerif"
+   height="10"
+   layout="topleft"
+   left="30"
+   name="label"
+   top_pad="25"
+   width="120">
+   	Preset Name:
+   </text>
+   
+   <combo_box
+   	allow_text_entry="true"
+   	follows="top|left"
+   	layout="topleft"
+   	left_pad="10"
+   	max_chars="100"
+   	name="water_preset_combo"
+   	top_delta="-5"
+   	width="200"/>
+
+   <line_editor
+    height="20"
+    left_delta="0"
+    name="water_preset_name"
+    top_delta="0"
+    width="200" />
+   
+   <text
+   follows="top|left|right"
+   height="40"
+   layout="topleft"
+   left_pad="10"
+   name="note"
+   top_delta="0"
+   width="340"
+   wrap="true">
+   	Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
+   </text>
+ 
+ <!--======== Controls panel ========-->
+ <panel
+  border="false"
+  bevel_style="none"
+  follows="top|left"
+  height="230"
+  layout="topleft"
+  left="10"
+  name="panel_water_preset"
+  top="100"
+  width="700">
+ 
+<!--======== I conlumn of controls ========-->   
+   <text
+    follows="left|top|right"
+    height="10"
+    font="SansSerif"
+    layout="topleft"
+    left="10"    
+    name="water_color_label"
+    top="5"
+    width="215">
+       Water Fog Color
+   </text>
+   <color_swatch
+    can_apply_immediately="true"
+    follows="left|top"
+    height="37"
+    label_height="0"
+    layout="topleft"
+    left_delta="15"
+    name="WaterFogColor"
+    top_pad="8"
+    width="60" />
+    
+    
+   <text
+    follows="left|top|right"
+    font="SansSerif"
+    layout="topleft"
+    left_delta="-15"
+    top_pad="10"
+    name="water_fog_density_label"
+    width="215">
+    	Fog Density Exponent
+   </text>
+   <slider
+    decimal_digits="1"
+    follows="left|top"
+    height="10"
+    initial_value="0"
+    layout="topleft"
+    left_delta="15"
+    max_val="10"
+    name="WaterFogDensity"
+    top_pad="10"
+    width="200"/>
+    
+    
+   <text
+    follows="left|top|right"
+    font="SansSerif"
+    layout="topleft"
+    left_delta="-15"
+    top_pad="15"
+    name="underwater_fog_modifier_label"
+    width="215">
+    	Underwater Fog Modifier
+   </text>
+   <slider
+    decimal_digits="1"
+    follows="left|top"
+    height="10"
+    initial_value="0"
+    layout="topleft"
+    left_delta="15"
+    max_val="10"
+    name="WaterUnderWaterFogMod"
+    top_pad="10"
+    width="200"/>
+    
+    
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     layout="topleft"
+     left_delta="-15"
+     name="BHText"
+     top_pad="15"
+     width="215">
+        Big Wave Direction
+    </text>    
+    <slider
+     control_name="WaterWave1DirX"
+     decimal_digits="2"
+     follows="left|top"
+     increment="0.01"
+     initial_value="0.7"
+     label="X"
+     layout="topleft"             
+     max_val="4"
+     min_val="-4"
+     name="WaterWave1DirX"
+     top_pad="10"
+     width="216"/>    
+    <slider
+     control_name="WaterWave1DirY"
+     decimal_digits="2"
+     follows="left|top"
+     increment="0.01"
+     initial_value="0.7"
+     label="Y"
+     layout="topleft"
+     max_val="4"
+     min_val="-4"
+     name="WaterWave1DirY"
+     top_pad="5"
+     width="216"/>
+    
+<!--======== II conlumn of controls ========-->    
+    
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left_pad="20"
+     name="BDensText"
+     top="5"
+     width="215">
+        Reflection Wavelet Scale
+    </text>
+    <slider
+     control_name="WaterNormalScaleX"
+     decimal_digits="1"
+     follows="left|top"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="15"
+     max_val="10"
+     name="WaterNormalScaleX"
+     top_pad="10"
+     width="200"/>
+    <slider
+     control_name="WaterNormalScaleY"
+     decimal_digits="1"
+     follows="left|top"
+     initial_value="0.7"
+     layout="topleft"
+     max_val="10"
+     name="WaterNormalScaleY"
+     top_pad="6"
+     width="200"/>
+    <slider
+     control_name="WaterNormalScaleZ"
+     decimal_digits="1"
+     follows="left|top"
+     initial_value="0.7"
+     layout="topleft"
+     max_val="10"
+     name="WaterNormalScaleZ"
+     top_pad="6"
+     width="200"/>
+    
+    
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     layout="topleft"
+     left_delta="-15"
+     name="HDText"
+     top_pad="16"
+     width="215">
+        Fresnel Scale
+    </text>
+    <slider
+     control_name="WaterFresnelScale"
+     decimal_digits="2"
+     follows="left|top"
+     height="10"
+     increment="0.01"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="15"
+     name="WaterFresnelScale"
+     top_pad="10"
+     width="200"/>
+    <text
+     follows="left|top|right"
+     font="SansSerif"
+     layout="topleft"
+     left_delta="-15"
+     name="FresnelOffsetText"
+     top_pad="15"
+     width="215">
+        Fresnel Offset
+    </text>
+    <slider
+     control_name="WaterFresnelOffset"
+     decimal_digits="2"
+     follows="left"
+     increment="0.01"
+     initial_value="0.7"
+     layout="topleft"
+     left_delta="15"
+     name="WaterFresnelOffset"
+     top_pad="10"
+     width="200"/>
+     
+     
+     <text
+      follows="left|top|right"
+      font="SansSerif"
+      layout="topleft"
+      left_delta="-15"
+      name="BHText2"
+      top_pad="15"
+      width="215">
+         Little Wave Direction
+     </text>
+     <slider
+      control_name="WaterWave2DirX"
+      decimal_digits="2"
+      follows="left|top"
+      increment="0.01"
+      initial_value="0.7"
+      label="X"
+      layout="topleft"
+      max_val="4"
+      min_val="-4"
+      name="WaterWave2DirX"
+      top_pad="10"
+      width="216" />
+     <slider
+      control_name="WaterWave2DirY"
+      decimal_digits="2"
+      follows="left|top"
+      increment="0.01"
+      initial_value="0.7"
+      label="Y"
+      layout="topleft"
+      max_val="4"
+      min_val="-4"
+      name="WaterWave2DirY"
+      top_pad="6"
+      width="216" />
+
+<!--======== III conlumn of contorls ========-->
+
+	 <text
+      follows="left|top|right"
+      font="SansSerif"
+      height="16"
+      layout="topleft"
+      left_pad="20"
+      name="DensMultText"
+      top="5"
+      width="215">
+         Refract Scale Above
+     </text>
+     <slider
+      control_name="WaterScaleAbove"
+      decimal_digits="2"
+      follows="left|top"
+      increment="0.01"
+      initial_value="0.1"
+      layout="topleft"
+      left_delta="15"
+      name="WaterScaleAbove"
+      top_pad="5"
+      width="200" />
+     
+     <text
+      type="string"
+      length="1"
+      follows="left|top|right"
+      font="SansSerif"
+      height="16"
+      layout="topleft"
+      left_delta="-15"
+      name="WaterScaleBelowText"
+      top_pad="15"
+      width="215">
+         Refract Scale Below
+     </text>
+     <slider
+      control_name="WaterScaleBelow"
+      decimal_digits="2"
+      follows="left|top"
+      height="10"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      left_delta="15"
+      name="WaterScaleBelow"
+      top_pad="5"
+      width="200"/>
+     
+     <text
+      follows="left|top|right"
+      font="SansSerif"
+      height="16"
+      layout="topleft"
+      left_delta="-15"
+      name="MaxAltText"
+      top_pad="15"
+      width="215">
+         Blur Multiplier
+     </text>
+     <slider
+      control_name="WaterBlurMult"
+      follows="left|top"
+      height="10"
+      increment="0.001"
+      initial_value="0"
+      layout="topleft"
+      left_delta="15"
+      max_val="0.16"
+      name="WaterBlurMult"
+      top_pad="5"
+      width="200"/>
+      
+      <text
+       follows="left|top|right"
+       font="SansSerif"
+       height="16"
+       layout="topleft"
+       left_delta="-15"
+       name="BHText3"
+       top_pad="15"
+       width="215">
+          Normal Map
+      </text>
+      <texture_picker
+       height="80"
+       layout="topleft"
+       left_delta="15"
+       name="WaterNormalMap"
+       top_pad="5"
+       width="100" />
+	</panel>
+<!--======== End of Controls panel ========-->	
+
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="5"
+     width="700"/>
+	<check_box
+	 follows="top|left"
+	 height="10"
+	 label="Make this preset my new water setting"
+	 layout="topleft"
+	 left="275"
+	 name="make_default_cb"
+	 top_pad="20"
+	 width="280"/>
+	<button
+	 follows="bottom|right"
+	 height="23"
+	 label="Save"
+	 layout="topleft"
+	 left_pad="0"
+	 name="save"
+	 width="70"/>	 
+	<button
+	 follows="bottom|right"
+	 height="23"
+	 label="Cancel"
+	 layout="topleft"
+	 left_pad="15"
+	 name="cancel"
+	 width="70"/>
+	
+ </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
deleted file mode 100644
index 8df5e232d9..0000000000
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="150"
- layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
- save_rect="true"
- title="ENVIRONMENT EDITOR"
- width="600">
-    <floater.string
-     name="timeStr">
-        [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="EnvTimeText"
-     top="32"
-     width="140">
-        Time of Day
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left="15"
-     name="EnvTimeText2"
-     top="62"
-     width="140">
-        12:00 PM
-    </text>
-    <icon
-     height="25"
-     image_name="icon_diurnal.tga"
-     layout="topleft"
-     left="85"
-     name="EnvDayCycle"
-     top="30"
-     use_draw_context_alpha="false"
-     width="200" />
-    <slider
-     control_name="EnvTimeSlider"
-     decimal_digits="2"
-     follows="left"
-     height="10"
-     increment="0.0069444"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="0"
-     max_val="0.99"
-     name="EnvTimeSlider"
-     show_text="false"
-     top_pad="10"
-     width="200" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="EnvCloudText"
-     top="86"
-     width="140">
-        Cloud Cover
-    </text>
-    <slider
-     control_name="EnvCloudSlider"
-     decimal_digits="2"
-     follows="left"
-     height="10"
-     increment="0.01"
-     initial_value="0.7"
-     layout="topleft"
-     left_delta="75"
-     name="EnvCloudSlider"
-     top_delta="4"
-     width="210" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="310"
-     name="EnvWaterColorText"
-     top="39"
-     width="140">
-        Water Color
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     color="0.5 0.5 0.5 1"
-     follows="left|top"
-     height="50"
-     layout="topleft"
-     left="390"
-     name="EnvWaterColor"
-     tool_tip="Click to open color picker"
-     top="30"
-     width="40" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="310"
-     name="EnvWaterFogText"
-     top="86"
-     width="140">
-        Water Fog
-    </text>
-    <slider
-     control_name="EnvWaterFogSlider"
-     decimal_digits="2"
-     follows="left"
-     height="10"
-     initial_value="0"
-     layout="topleft"
-     left_delta="75"
-     max_val="10"
-     name="EnvWaterFogSlider"
-     top_delta="4"
-     width="210" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Use Estate Time"
-     layout="topleft"
-     left="10"
-     name="EnvUseEstateTimeButton"
-     top="120"
-     width="137" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Advanced Sky"
-     layout="topleft"
-     left_pad="3"
-     name="EnvAdvancedSkyButton"
-     top_delta="0"
-     width="137" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Advanced Water"
-     layout="topleft"
-     left_pad="3"
-     name="EnvAdvancedWaterButton"
-     top_delta="0"
-     width="137" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
new file mode 100644
index 0000000000..1b1cafaca6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="328"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="ENVIRONMENT SETTINGS"
+ width="540">
+
+ <text
+  follows="top|left|right"
+  height="15"
+  layout="topleft"
+  left="20"
+  name="note"
+  top="25"
+  width="510"
+  wrap="true">
+  Use the options below to customize the environment settings for your viewer.
+ </text>
+
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="237"
+  layout="topleft"
+  left="20"
+  name="border"
+  top_pad="8"
+  width="500"/>  
+ <radio_group
+  follows="top|left"
+  height="45"
+  layout="topleft"
+  left_delta="10"
+  name="region_settings_radio_group"
+  top_delta="20"
+  width="200">
+    <radio_item
+  	 label="Use region settings"
+  	 layout="topleft"
+  	 name="use_region_settings"/>
+    <radio_item
+  	 label="Customize my environment"
+  	 layout="topleft"
+  	 name="use_my_settings"
+  	 top_pad="20"/>
+  </radio_group>
+
+ <panel
+  height="170"
+  layout="topleft"
+  left="50"
+  name="user_environment_settings"
+  top_pad="0"
+  width="470">
+
+ <text
+  follows="top|left|right"
+  font="SansSerifItalic"
+  height="15"
+  layout="topleft"
+  left_delta="0"
+  name="note"
+  top_pad="0"
+  width="470"
+  wrap="true">
+  Note: your custom settings will not be visible to other users.
+ </text>
+
+ <!-- Water Setting -->
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="50"
+  top="40"
+  width="200">
+  		Water Setting
+  </text>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="water_settings_preset_combo"
+   top_delta="-5"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"/>
+  </combo_box>
+ 
+
+ <!-- Sky/Day Cycle Settings -->  
+ <text
+  name="sky_dayc_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="50"
+  top_pad="20"
+  width="100">
+  		Sky / Day Cycle
+  </text>
+  <radio_group
+   layout="topleft"
+   left_delta="50"
+   name="sky_dayc_settings_radio_group"
+   top_pad="10"
+   height="50"
+   width="150">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Fixed sky"
+  	 name="my_sky_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Day cycle"
+  	 name="my_dayc_settings"
+  	 top_pad="25"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="sky_settings_preset_combo"
+   top_delta="-7"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"/>
+  </combo_box>
+  <combo_box
+   follows="top|left"
+   name="dayc_settings_preset_combo"
+   top_delta="36"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"/>
+  </combo_box>
+  </panel>
+
+  <button
+   follows="left|top"
+   height="23"
+   label="OK"
+   layout="topleft"
+   right="-130"
+   name="ok_btn"
+   top_pad="10"
+   width="100" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Cancel"
+   layout="topleft"
+   left_pad="10"
+   name="cancel_btn"
+   width="100" />	
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 02e50ee584..de6d586f72 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -2,6 +2,8 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
+ left="10000"
+ bottom="10000"
  height="600"
  layout="topleft"
  min_height="150"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 43729d7c9f..5a1f920398 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -5,7 +5,7 @@
  height="440"
  layout="topleft"
  min_height="140"
- min_width="467"
+ min_width="0"
  name="floater_about"
  help_topic="floater_about"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index f58595b3c5..1d4a1d4827 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="true" height="550" min_height="550" min_width="620"
-     name="Model Preview" title="Upload Model" width="620">
+     name="Model Preview" title="Upload Model" width="620"
+      help_topic="upload_model" >
 
   <string name="status_idle">Idle</string>
   <string name="status_parse_error">Dae parsing issue - see log for details.</string>
@@ -23,6 +24,7 @@
   <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->
   <string name="decomposing">Analyzing...</string>
   <string name="simplifying">Simplifying...</string>
+  <string name="tbd">TBD</string>
   
 
   <text left="15" bottom="25" follows="top|left" height="15" name="name_label">
@@ -70,43 +72,89 @@
     width="290"
     height="290"
     follows="all"/>
-
-  <text bottom_delta="25" left="25" width="100" follows="bottom|left">Upload Details</text>
-  <panel top_pad="5" border="true" left="15" width="290" height="70" follows="bottom|left"
-          bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-    <text left="25" follows="bottom|left" width="140" height="15" name="streaming cost">
-      Resource Cost: [COST]
-    </text>
-    <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">
-      Physics Cost: [COST]
+    
+    <text
+     font="SansSerif"
+	 bottom_delta="15"
+     left_delta="0"
+     name="warning_title"
+     text_color="Yellow"
+     visible="false">
+     WARNING:
     </text>
-    <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">
-      Upload Fee: N/A
-    </text>
-  </panel>
+    <text
+     text_color="White"
+     height="40"
+	 width="290"
+	 top_delta="15"
+     left_delta="0"
+     name="warning_message"
+     parse_urls="true"
+     wrap="true"
+     visible="false">
+     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
 
-  <check_box
-	height="16"
+  <text
+	height="65"
+	top_delta="45"
 	left_delta="0"
-	name="confirm_checkbox"
-	top_pad="15"
-	follows="bottom|left"
-	width="16" />
+	name="weights_text"
+	width="80"
+	word_wrap="true" 
+	>
+Download:
+Physics:
+Server:
+
+Prim equivs:
+  </text>
 
   <text
-	height="30"
-	width="570"
+	height="65"
+	top_delta="0"
+	left_delta="80"
+	name="weights"
+	width="70"
 	word_wrap="true" 
-	left_delta="25"
-	top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
-  <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
+	>
+[ST]
+[PH]
+[SIM]
 
-  
-  <button bottom="540" left="300"  follows="bottom|right" height="20" label="Defaults"
-	     width="80" name="reset_btn" tool_tip="Reset to defaults"/>
-  <button bottom="540" left="430"  follows="bottom|right" height="20" label="Upload"
-	     width="80" name="ok_btn" tool_tip="Upload to simulator"/>
-  <button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
+[EQ]
+  </text>
+
+<!--
+  <text
+	height="65"
+	top_delta="0"
+	left_delta="70"
+	name="price_breakdown_text"
+	width="80"
+	word_wrap="true" 
+	>
+Streaming:
+Physics:
+Instances:
+Textures:
+Model:
+  </text>
+
+  <text
+	height="65"
+	top_delta="0"
+	left_delta="80"
+	name="price_breakdown"
+	width="65"
+	word_wrap="true" 
+	>
+L$ [STREAMING]
+L$ [PHYSICS]
+L$ [INSTANCES]
+L$ [TEXTURES]
+L$ [MODEL]
+  </text>
+    -->
 
   <tab_container
     follows="right|top|bottom"
@@ -122,7 +170,8 @@
     <panel
       border="true"
       label="Level of Detail"
-      name="lod_panel">
+      name="lod_panel"
+      help_topic="upload_model_lod">
 
       <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header">
         Select Level of Detail:
@@ -245,7 +294,8 @@
     <panel
       border="true"
       label="Physics"
-      name="physics_panel">
+      name="physics_panel"
+      help_topic="upload_model_physics">
 
       <!-- PHYSICS GEOMETRY-->
       <panel
@@ -386,7 +436,9 @@
     <panel
       border="true"
       label="Modifiers"
-      name="modifiers_panel">
+      name="modifiers_panel"
+      help_topic="upload_model_modifiers">
+
       <text left="10" width="90" bottom="30" follows="top|left" height="15">
         Scale:
       </text>
@@ -416,6 +468,26 @@
 
     </panel>
   </tab_container>
+
+  <text
+	height="16"
+	left_delta="5"
+	bottom_delta="30"
+	name="upload_fee"
+	width="300"
+	follows="bottom|right"
+	word_wrap="true" 
+	>
+	    Upload fee: L$ [FEE]
+  </text>
+  
+  <button bottom="540" left="10"  follows="bottom|left" height="20" label="Set to defaults"
+	     width="100" name="reset_btn" tool_tip="Set to defaults"/>
+  <button left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee"
+	     width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee" top_delta="0"/>
+  <button bottom="540" left="310"  follows="bottom|right" height="20" label="Upload"
+	     width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
+  <button right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn" top_delta="0"/>
   
   <!--
   <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 8603682e3a..3d16ccbc45 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -49,24 +49,6 @@
 	 top="32"
 	 left="210"
 	 height="32"
-	 name="physics2_btn"
-	 label="3. Physics"
-	 tab_stop="false"
-	 enabled="false"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Physics2"/>
-	</button>
-	<button
-	 top="32"
-	 left="210"
-	 height="32"
 	 name="physics_btn"
 	 label="3. Physics"
 	 tab_stop="false"
@@ -126,7 +108,7 @@
 		 height="22"
 		 top_pad="15"
 		 width="505"
-		 name="header_panel"
+		 name="choose_file_header_panel"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true"
@@ -135,46 +117,55 @@
 			 width="200"
 			 left="10"
 			 top="3"
-			 name="header_text"
+			 name="choose_file_header_text"
 			 text_color="White"
 			 height="10"
 			 font="SansSerifBig"
 			 layout="topleft">
-				Upload Model
+				Choose model file
 			</text>
 		</panel>
-		<text
-		 top_pad="14"
-		 width="460"
-		 height="20"
-		 name="description"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 word_wrap="true"
-		 left_delta="5">
-			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.
-		</text>
 		<panel
-		 top_delta="40"
+		 top_pad="14"
 		 left="15"
-		 height="270"
+		 height="310"
 		 width="505"
-		 name="content"
+		 name="choose_file_content_panel"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
+            <text
+			 height="32"
+			 left="10"
+			 name="advanced_users_text"
+			 text_color="White"
+			 top="15"
+			 width="320"
+			 word_wrap="true">
+				Advanced users: If you are familiar with 3D content creation tools you may wish to use the Advanced Uploader.
+			</text>
+			<button
+			 follows="left|top"
+			 height="20"
+			 label="Switch to Advanced"
+			 layout="topleft"
+			 left_delta="0"
+			 name="switch_to_advanced"
+			 top_pad="5"
+			 width="130">
+			</button>
 			<text
 			 type="string"
 			 length="1"
 			 text_color="White" 
 			 follows="left|top"
-			 top="10"
+			 top_pad="30"
 			 height="10"
 			 layout="topleft"
-			 left_delta="10"
-			 name="Cache location"
-			 width="300">
-				Filename:
+			 left_delta="0"
+			 name="choose_model_file_label"
+			 width="320">
+				Choose model file to upload
 			</text>
 			<line_editor
 			 border_style="line"
@@ -187,7 +178,7 @@
 			 max_length="4096"
 			 name="lod_file"
 			 top_pad="5"
-			 width="220" />
+			 width="230" />
 			<button
 			 follows="left|top"
 			 height="23"
@@ -200,23 +191,27 @@
 			 width="85">
 			</button>
 			<text
-			 top_delta="-15"
-			 width="200"
-			 height="15"
-			 font="SansSerifSmall"
+			 type="string"
+			 length="1"
+			 text_color="White" 
+			 follows="left|top"
+			 top_pad="5"
+			 height="10"
 			 layout="topleft"
-			 text_color="White"
-			 left_pad="19">
-				Model Preview:
+			 left="10"
+			 name="support_collada_text"
+			 width="320">
+				Second Life supports COLLADA (.dae) files
 			</text>
 			<!-- Placeholder panel for 3D preview render -->
 			<panel
-			 left_delta="0"
-			 top_pad="0"
-			 name="preview_panel"
+			 top="30"
+			 right="-10"
+			 name="choose_file_preview_panel"
 			 bevel_style="none"
 			 highlight_light_color="0.09 0.09 0.09 1"
 			 border="true"
+			 border_style="line"
 			 height="150"
 			 follows="all"
 			 width="150">
@@ -225,7 +220,8 @@
 			 top_pad="10"
 			 width="130"
 			 height="14"
-			 left="340"
+			 left_delta="0"
+			 name="dimensions_label"
 			 text_color="White"
 			 word_wrap="true">
 				Dimensions (meters):
@@ -238,15 +234,7 @@
 			 text_color="White"
 			 name="dimensions"
 			 left_delta="0">
-				X:         Y:         Z: 
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_dividers"
-			 left_delta="41">
-				 |               |   
+				X         Y         Z 
 			</text>
 			<text
 			 top_delta="0"
@@ -266,23 +254,26 @@
 			 height="15"
 			 name="dimension_z"
 			 left="450"/>
-			<text
-			 top="100"
-			 width="320"
-			 height="15"
-			 left="10"
-			 text_color="White" 
-			 word_wrap="true">
-				Note:
-			</text>
-			<text
-			 top_pad="0"
-			 width="320"
-			 height="40"
-			 left="10"
-			 word_wrap="true">
-Advanced users familiar with 3d content creation tools may prefer to use the [secondlife:///app/floater/upload_model Advanced Mesh Import Window] .
-			</text>
+            <text
+             height="16"
+             left="10"
+             name="warning_label"
+             text_color="Yellow"
+             top="200"
+             visible="false"
+             width="320">
+                WARNING:
+            </text>
+            <text
+             height="50"
+             left="10"
+             name="warning_text"
+             top_pad="0"
+             visible="false"
+             width="320"
+             word_wrap="true">
+                You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up your account for mesh model uploads. 
+            </text>
 		</panel>
 	</panel>
 
@@ -291,13 +282,13 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 height="388"
 		 top_delta="0"
 		 name="optimize_panel"
-		 visible="false"
+		 visible="true"
 		 width="535"
 		 left="0">
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="header_panel"
+		 name="optimize_header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -306,13 +297,13 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 			<text
 			 width="200"
 			 left="10"
-			 name="header_text"
+			 name="optimize_header_text"
 			 top="3"
 			 text_color="White"
 			 height="10"
 			 font="SansSerifBig"
 			 layout="topleft">
-				Optimize
+				Optimize model
 			</text>
 		</panel>
 		<text
@@ -321,10 +312,10 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 height="20"
 		 font="SansSerifSmall"
 		 layout="topleft"
-		 name="description"
+		 name="optimize_hint"
 		 word_wrap="true"
 		 left_delta="5">
-			This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.
+			We have optimized the model for performance. Adjust it further if you wish.
 		</text>
 		<panel
 		 top_delta="40"
@@ -332,11 +323,12 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 left="15"
 		 height="270"
 		 width="505"
-		 name="content"
+		 name="optimize_content_panel"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
 			<text
+			 name="generating_lod_label"
 			 top="20"
 			 width="300"
 			 height="12"
@@ -411,116 +403,92 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 				 bg_opaque_color="DkGray2"
 				 background_visible="true"
 				 background_opaque="true">
-			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
-				Model Preview:
-			</text>
-			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
-	     name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
-				</combo_item>
-				<combo_item name="medium">
-					Medium
-				</combo_item>
-				<combo_item name="low">
-					Low
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest
-				</combo_item>
-			</combo_box>
-			<panel
-				 left="10"
-				 top_pad="5"
-				 name="preview_panel"
-				 bevel_style="none"
-				 highlight_light_color="0.09 0.09 0.09 1"
-				 border_style="line"
-				 border="true"
-				 height="185"
-				 follows="all"
-				 width="185">
-			</panel>
-			<text top="45" left="214" text_color="White" font="SansSerifSmallBold" halign="center" width="110" height="30" wrap="true">Higher Performance</text>
-			<text top="75" left="204" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
-			<text top="45" left="378" text_color="White" font="SansSerifSmallBold" halign="center" width="90" height="30" wrap="true">Higher Accuracy</text>
-			<text top="75" left="364" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
+			<text name="optimize_performance_text" top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
+			<text name="optimize_faster_rendering_text" top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
+Less detail
+Lower prim weight</text>
+			<text name="optimize_accuracy_text" top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
+			<text name="optimize_slower_rendering_text" top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
+More detail
+Higher prim weight</text>
 
-			<slider
+          <slider
 		   follows="left|top"
 		   height="20"
 		   increment="1"
 		   layout="topleft"
-		   left="204"
-		   max_val="3"
-		   initial_value="2"
+		   left="10"
+		   max_val="2"
+		   initial_value="1"
 		   min_val="0"
 		   name="accuracy_slider"
 		   show_text="false"
 		   top="130"
 		   width="290" />
-			<text 
-			font="SansSerifSmall" 
+          <text 
+			font="SansSerifSmall"
+			name="accuracy_slider_mark1" 
 			top_pad="0"  
-			width="300" 
+			width="5" 
 			left_delta="6" 
 			height="4">'  
-      </text>
-
-
-			<icon
-				 top_pad="14"
-				 left_delta="0"
-				 width="280"
-				 height="2"
-				 image_name="model_wizard\divider_line.png"/>
-	
-			<text top_delta="20" width="200" text_color="White" left_delta="50" name="streaming cost"  height="20">Resource Cost:    [COST]</text>
-			<text
-						 top_pad="15"
-						 width="130"
-						 height="14"
-						 left="10"
-						 text_color="White"
-						 word_wrap="true">
-				Dimensions (meters):
-			</text>
-			<text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 font="SansSerifSmallBold"
-			 text_color="White"
-			 name="dimensions"
-			 left_delta="0">
-				X:         Y:         Z:
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_dividers"
-			 left_delta="41">
-				|               |
+          </text>
+          <text 
+			font="SansSerifSmall"
+			name="accuracy_slider_mark2" 
+			top_delta="0"  
+			width="5" 
+			left_delta="137" 
+			height="4">'  
+          </text>
+          <text 
+			font="SansSerifSmall"
+			name="accuracy_slider_mark3" 
+			top_delta="0"  
+			width="5" 
+			left_delta="137" 
+			height="4">'  
+          </text>
+          <button
+			follows="left|top"
+			height="20"
+			label="Recalculate Geometry"
+			layout="topleft"
+			left="80"
+			name="recalculate_geometry_btn"
+			top_pad="15"
+            width="150">
+          </button>
+			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="geometry_preview_label">
+				Geometry preview
 			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_x"
-			 left_delta="-25"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_y"
-			 left_delta="46"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_z"
-			 left_delta="46"/>
+			<panel
+				 right="-10"
+				 top="32"
+				 name="optimize_preview_panel"
+				 bevel_style="none"
+				 highlight_light_color="0.09 0.09 0.09 1"
+				 border_style="line"
+				 border="true"
+				 height="185"
+				 follows="all"
+				 width="185">
+			</panel>
+			<combo_box left_delta="75" top_pad="10"  follows="left|top" list_position="below" height="22"
+	     name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render">
+				<combo_item name="preview_lod_high">
+					High detail
+				</combo_item>
+				<combo_item name="preview_lod_medium">
+					Medium detail
+				</combo_item>
+				<combo_item name="preview_lod_low">
+					Low detail
+				</combo_item>
+				<combo_item name="preview_lod_lowest">
+					Lowest detail
+				</combo_item>
+			</combo_box>
 		</panel>
 	</panel>
 
@@ -534,7 +502,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="header_panel"
+		 name="physics_header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -543,13 +511,13 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 			<text
 			 width="200"
 			 left="10"
-			 name="header_text"
+			 name="physics_header_text"
 			 top="3"
 			 height="10"
 			 font="SansSerifBig"
 			 text_color="White" 
 			 layout="topleft">
-				Physics
+				Adjust physics
 			</text>
 		</panel>
 		<text
@@ -558,186 +526,108 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 height="50"
 		 font="SansSerifSmall"
 		 layout="topleft"
-		 name="description"
+		 name="physics_hint"
 		 word_wrap="true"
 		 left_delta="5">
-			The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:
+			We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model.
 		</text>
     <panel
 		 top_delta="44"
 		 left="15"
 		 height="270"
 		 width="505"
-		 name="content"
+		 name="physics_content_panel"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
-      <text top="15" left="20" text_color="White" font="SansSerifSmallBold" width="110" height="30" wrap="true" halign="center">Higher Performance</text>
-      <text top="45" left="10" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
-      <text top="15" left="372" text_color="White" font="SansSerifSmallBold" width="90" height="30" wrap="true" halign="center">Higher Accuracy</text>
-      <text top="45" left="360" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
+      <text name="physics_performance_text" top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
+      <text name="physics_faster_rendering_text" top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
+Less detail
+Lower prim weight</text>
+      <text name="physics_accuracy_text" top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
+      <text name="physics_slower_dendering_text" top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
+More detail
+Higher prim weight</text>
 
       <slider
 		   follows="left|top"
-		   height="22"
+		   height="190"
 		   increment=".1"
 		   layout="topleft"
-		   left="20"
+		   left="140"
 		   max_val="1"
 		   initial_value="0.5"
 		   min_val="0"
 		   name="physics_slider"
+		   orientation="vertical"
 		   show_text="false"
-		   top="90"
-		   width="440" />
-      <text
-			font="SansSerifSmall"
-			top_pad="0"
-			width="500"
-			left_delta="6"
-			height="4">'             '             '             '             '              '             '             '             '              '             '</text>
-      <text top_pad="10" width="110" halign="center" word_wrap="true" left="25"  height="40">Recommended for solid objects</text>
-      <text top_delta="0" width="110" halign="center" word_wrap="true" left="190"  height="40">Recommended for buildings</text>
-      <text top_delta="0" width="110" halign="center" word_wrap="true" left="350"  height="40">Recommended for vehicles</text>
-
-
-		<icon
-			 top_pad="5"
-			 left="15"
-			 width="470"
-			 height="2"
-			 image_name="model_wizard\divider_line.png"/>
-		
-	<text top_delta="30" width="180" text_color="White" left="160" name="streaming cost"  height="20">Resource Cost:       [COST]</text>
- 
-    </panel>
-	</panel>
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="physics2_panel"
-		 visible="true"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="header_text"
-			 text_color="White"
-			 top="3"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Physics
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="475"
-		 height="50"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			Preview the physics shape below then click Next to continue.  To modify the physics shape, click the Back button.
-		</text>
-		<panel
-			 top_delta="40"
-			 left="15"
-			 height="270"
-			 width="505"
-			 name="content"
-			 bg_opaque_color="DkGray2"
-			 background_visible="true"
-			 background_opaque="true">
-			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
-				Model Preview:
+		   top="25"
+		   width="22" />
+      <text name="physics_example_1" top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
+Moving objects
+Flying objects
+Vehicles</text>
+      <text name="physics_example_2" top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
+Small static objects
+Less detailed objects
+Simple furniture</text>
+      <text name="physics_example_3" top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
+Static objects
+Detailed objects
+Buildings</text>
+          <button
+			follows="left|top"
+			height="20"
+			label="Recalculate physics"
+			layout="topleft"
+			left="80"
+			name="recalculate_physics_btn"
+			top_pad="10"
+            width="150">
+          </button>
+          <button
+            enabled="false"
+			follows="left|top"
+			height="20"
+			label="Recalculating..."
+			layout="topleft"
+			left_delta="0"
+			name="recalculating_physics_btn"
+			top_delta="0"
+			visible="false"
+            width="150">
+          </button>
+			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="physics_preview_label">
+				Physics preview
 			</text>
-			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
-			   name="preview_lod_combo3" width="90" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
+			<panel
+				 right="-10"
+				 top="32"
+				 name="physics_preview_panel"
+				 bevel_style="none"
+				 highlight_light_color="0.09 0.09 0.09 1"
+				 border_style="line"
+				 border="true"
+				 height="185"
+				 follows="all"
+				 width="185">
+			</panel>
+			<combo_box left_delta="75" top_pad="10"  follows="left|top" list_position="below" height="22"
+	     name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render">
+				<combo_item name="preview_lod2_high">
+					High detail
 				</combo_item>
-				<combo_item name="medium">
-					Medium
+				<combo_item name="preview_lod2_medium">
+					Medium detail
 				</combo_item>
-				<combo_item name="low">
-					Low
+				<combo_item name="preview_lod2_low">
+					Low detail
 				</combo_item>
-				<combo_item name="lowest">
-					Lowest
+				<combo_item name="preview_lod2_lowest">
+					Lowest detail
 				</combo_item>
 			</combo_box>
-			<panel
-					   left="10"
-					   top_pad="10"
-					   name="preview_panel"
-					   bevel_style="none"
-					   highlight_light_color="0.09 0.09 0.09 1"
-					   border_style="line"
-					   border="true"
-					   height="190"
-					   follows="all"
-					   width="190">
-			</panel>
-			<text
-						 top_pad="8"
-						 width="130"
-						 height="14"
-						 left="10"
-						 text_color="White"
-						 word_wrap="true">
-				Dimensions (meters):
-			</text>
-			<text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 font="SansSerifSmallBold"
-			 text_color="White"
-			 name="dimensions"
-			 left_delta="0">
-				X:         Y:         Z:
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_dividers"
-			 left_delta="41">
-				|               |
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_x"
-			 left_delta="-25"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_y"
-			 left_delta="46"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_z"
-			 left_delta="46"/>
-			<text top="60" width="180" text_color="White" left="225" name="streaming cost"  height="20">Resource Cost:       [COST]</text>
-		</panel>
+    </panel>
 	</panel>
 
 	<panel
@@ -750,7 +640,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="header_panel"
+		 name="review_header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -759,7 +649,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 			<text
 			 width="200"
 			 left="10"
-			 name="header_text"
+			 name="review_header_text"
 			 text_color="White" 
 			 top="3"
 			 height="10"
@@ -768,162 +658,44 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 				Review
 			</text>
 		</panel>
-		<text
+		<panel
 		 top_pad="14"
-		 width="470"
-		 height="24"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.
-		</text>
-		<icon
-			 top_pad="10"
-			 left="20"
-			 width="495"
-			 height="2"
-			 image_name="model_wizard\divider_line.png"/>
-    <panel
-		 top_pad="5"
 		 left="15"
-		 height="270"
+		 height="310"
 		 width="505"
-		 name="content">
-      <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
-        Model Preview:
-      </text>
-      <combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
-	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">
-        <combo_item name="high">
-          High
-        </combo_item>
-        <combo_item name="medium">
-          Medium
-        </combo_item>
-        <combo_item name="low">
-          Low
-        </combo_item>
-        <combo_item name="lowest">
-          Lowest
-        </combo_item>
-      </combo_box>
-      <panel
-				 left="10"
-				 top_pad="10"
-				 name="preview_panel"
-				 bevel_style="none"
-				 highlight_light_color="0.09 0.09 0.09 1"
-				 border_style="line"
-				 border="true"
-				 height="190"
-				 follows="all"
-				 width="190">
-			</panel>
-		<text
-					 top_pad="8"
-					 width="130"
-					 height="14"
-					 left="10"
-					 text_color="White"
-					 word_wrap="true">
-			Dimensions (meters):
-		</text>
-		<text
-		 top_pad="0"
-		 width="160"
-		 height="15"
-		 font="SansSerifSmallBold"
-		 text_color="White"
-		 name="dimensions"
-		 left_delta="0">
-			X:         Y:         Z:
-		</text>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_dividers"
-		 left_delta="41">
-			|               |
-		</text>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_x"
-		 left_delta="-25"/>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_y"
-		 left_delta="46"/>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_z"
-		 left_delta="46"/>
+		 name="review_content_panel"
+		 bg_opaque_color="DkGray2"
+		 background_visible="true"
+		 background_opaque="true">
+			<text
+			 top="20"
+			 width="485"
+			 font="SansSerifMedium"
+			 text_color="White"
+			 left="10"
+			 name="review_prim_equiv"
+			 height="16">Impact to parcel/region: [EQUIV] prim equivalents
+			</text>
+			<text
+			 top_pad="20"
+			 width="485"
+			 font="SansSerifMedium"
+			 text_color="White"
+			 left="10"
+			 name="review_fee"
+			 height="16">Your account will be charged an upload fee of L$ [FEE].
+			</text>
+			<text 
+			 top_pad="20"
+			 width="485"
+			 font="SansSerifMedium"
+			 text_color="White"
+			 left="10"
+			 name="review_confirmation"
+			 height="32"
+			 word_wrap="true">By clicking the upload button, you confirm that you have the appropriate rights to the material contained in the model.
+			</text>
       </panel>
-    <text
-      width="300"
-      height="12"
-      top="125" 
-	  name="streaming cost" 
-      left="230" 
-      font="SansSerifSmallBold" 
-      text_color="White">Resource Cost:         [COST]</text>
-    <text
-      width="285"
-      height="30"
-      top_pad="0"
-      left_delta="0"
-      word_wrap="true"
-      font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>
-	<text
-	 width="300"
-	 height="12"
-	 name="physics cost" 
-	 top_pad="10"
-		 left_delta="0"
-	 font="SansSerifSmallBold"
-	 text_color="White">Physics Cost:        [COST]</text>
-	<text
-	  width="285"
-	  height="30"
-	  top_pad="0"
-		  left_delta="0"
-	  word_wrap="true"
-	  font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>
-		<text
-		 width="200"
-		 height="12"
-		 top_pad="10"
-		left_delta="0"
-		 font="SansSerifSmallBold"
-		 text_color="White">Upload Fee:</text>
-		<text
-		  width="285"
-		  height="26"
-		  top_pad="0"
-		  left_delta="0"
-		  word_wrap="true"
-		  font="SansSerifItalic">This is the amount the upload will cost.</text>
-		<check_box
-			height="16"
-			layout="topleft"
-			left_delta="0"
-			name="confirm_checkbox"
-			top_pad="15"
-			width="16" />
-		<text
-		  height="100"
-		  width="240"
-		  word_wrap="true" 
-		  left_delta="25"
-		  top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
 	</panel>
 
 
@@ -939,7 +711,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="header_panel"
+		 name="upload_header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -948,52 +720,85 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 			<text
 			 width="200"
 			 left="10"
-			 name="header_text"
+			 name="upload_header_text"
 			 top="3"
 			 text_color="White" 
 			 height="10"
 			 font="SansSerifBig"
 			 layout="topleft">
-				Upload Complete!
+				Upload complete
 			</text>
 		</panel>
 		<text
 		 top_pad="14"
-		 width="474"
-		 height="20"
-		 font="SansSerifSmall"
+		 width="495"
+		 height="16"
+		 font="SansSerifMedium"
 		 layout="topleft"
-		 name="description"
+		 name="model_uploaded_text"
+		 text_color="White"
 		 word_wrap="true"
-		 left_delta="5">
-			Congratulations! Your model has been sucessfully uploaded.  You will find the model in the Objects folder in your inventory.
+		 left="25">
+			Your model has been uploaded.
+		</text>
+		<text
+		 top_pad="5"
+		 width="495"
+		 height="16"
+		 font="SansSerifMedium"
+		 layout="topleft"
+		 name="inventory_text"
+		 text_color="White"
+		 word_wrap="true"
+		 left="25">
+			You will find it in the Objects folder in your inventory.
+		</text>
+		<text
+		 top_pad="20"
+		 width="495"
+		 font="SansSerifMedium"
+		 text_color="White"
+		 left="25"
+		 name="charged_fee"
+		 height="16">Your account has been charged L$ [FEE].
 		</text>
-		<icon
-			 top_pad="15"
-			 left_delta="0"
-			 width="495"
-			 height="2"
-			 image_name="model_wizard\divider_line.png"/>
 	</panel>
 
 
 
 	<button
 	 top="440"
-	 right="-245"
+	 right="-285"
 	 width="90"
 	 height="22"
 	 name="back"
 	 label="&lt;&lt; Back" />
 	<button
 	 top_delta="0"
-	 right="-150"
+	 right="-190"
 	 width="90"
 	 height="22"
 	 name="next"
 	 label="Next &gt;&gt; " />
 	<button
 	 top_delta="0"
+	 left_delta="0"
+	 width="160"
+	 height="22"
+	 name="calculate"
+	 label="Calculate weights &amp; fee &gt;&gt; " />
+	<button
+	 enabled="false"
+	 visible="false"
+	 top_delta="0"
+	 left_delta="0"
+	 width="160"
+	 height="22"
+	 name="calculating"
+	 label="Calculating... " />
+	<button
+	 enabled="false"
+	 top_delta="0"
 	 right="-150"
 	 width="90"
 	 height="22"
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index 41a440aaa0..f526970ad0 100644
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -22,6 +22,7 @@
      layout="topleft"
      left="10"
      name="object_name"
+     parse_urls="false"
      top="20"
      width="284">
         [DESC]:
diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml
index 8da35e9d7f..c756661ffc 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/floater_postcard.xml
@@ -7,11 +7,11 @@
  height="380"
  layout="topleft"
  min_height="380"
- min_width="450"
+ min_width="490"
  name="Postcard"
  help_topic="postcard"
  title="EMAIL SNAPSHOT"
- width="450">
+ width="490">
     <floater.string
      name="default_subject">
         Postcard from [SECOND_LIFE].
@@ -40,7 +40,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      name="to_form"
      top_delta="-4"
      width="150" />
@@ -59,7 +59,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      name="from_form"
      top_delta="-4"
      width="150" />
@@ -78,7 +78,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      max_length_bytes="100"
      name="name_form"
      top_delta="-4"
@@ -99,7 +99,7 @@
      height="20"
      label="Type your subject here."
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      max_length_bytes="100"
      name="subject_form"
      top_delta="-4"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..449731ab89
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="500"
+ layout="topleft"
+ name="Proxy Settings Floater"
+ help_topic="proxysettings"
+ title="Proxy Settings"
+ width="500">
+	<check_box
+	 control_name="BrowserProxyEnabled"
+	 top="38"
+	 enabled="true"
+	 follows="left|top"
+	 height="14"
+	 initial_value="false"
+	 commit_callback.function="Proxy.Change"
+	 label="Use HTTP Proxy for Web pages"
+	 left="22"
+	 mouse_opaque="true"
+	 name="web_proxy_enabled"
+	 radio_style="false"
+	 width="400"
+	 top_pad="5" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 left_delta="23"
+	 layout="topleft"
+	 name="Proxy location"
+	 top_pad="10"
+	 width="300">
+	    HTTP Proxy:
+	</text>
+	<line_editor
+	 control_name="BrowserProxyAddress"
+	 enabled_control="BrowserProxyEnabled"
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_delta="0"
+	 name="web_proxy_editor"
+	 tool_tip="The DNS name or IP address of the HTTP proxy you would like to use."
+	 top_pad="4"
+	 width="200" />
+	<spinner
+	 control_name="BrowserProxyPort"
+	 enabled_control="BrowserProxyEnabled"
+     decimal_digits="0"
+	 follows="left|top"
+	 height="23"
+	 increment="1"
+	 initial_value="80"
+	 label="Port number:"
+	 label_width="95"
+	 layout="topleft"
+	 left_delta="210"
+	 max_val="12000"
+	 min_val="10"
+	 name="web_proxy_port"
+	 top_delta="0"
+	 tool_tip="The port of the HTTP proxy you would like to use."
+	 width="145" />
+	<check_box
+	 control_name="Socks5ProxyEnabled"
+	 height="16"
+	 label="Use SOCKS 5 Proxy for UDP traffic"
+	 layout="topleft"
+	 left="22"
+	 name="socks_proxy_enabled"
+	 top_pad="32"
+	 width="256"
+	 commit_callback.function="Proxy.Change" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left_delta="23"
+	 name="Proxy location"
+	 top_pad="10"
+	 width="300">
+	    SOCKS 5 Proxy:
+	</text>
+	<line_editor
+	 control_name="Socks5ProxyHost"
+	 enabled_control="Socks5ProxyEnabled"
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_delta="0"
+	 name="socks_proxy_editor"
+	 tool_tip="The DNS name or IP address of the SOCKS 5 proxy you would like to use."
+	 top_pad="4"
+	 width="200"
+	 commit_callback.function="Proxy.Change" />
+	<spinner
+	 control_name="Socks5ProxyPort"
+	 enabled_control="Socks5ProxyEnabled"
+	 decimal_digits="0"
+	 follows="left|top"
+	 height="23"
+	 increment="1"
+	 initial_value="80"
+	 label="Port number:"
+	 label_width="95"
+	 layout="topleft"
+	 left_delta="210"
+	 max_val="12000"
+	 min_val="10"
+	 name="socks_proxy_port"
+	 top_delta="0"
+	 width="145"
+	 tool_tip="The port of the SOCKS 5 proxy you would like to use."
+	 commit_callback.function="Proxy.Change" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left="40"
+	 name="Proxy location"
+	 top_pad="15"
+	 width="300">
+	    SOCKS Authentication:
+	</text>
+	<radio_group
+	 control_name="Socks5AuthType"
+	 enabled_control="Socks5ProxyEnabled"
+	 height="50"
+	 layout="topleft"
+	 name="socks5_auth_type"
+	 top_pad="10"
+	 width="120"
+	 commit_callback.function="Proxy.Change" >
+		<radio_item
+		 height="16"
+		 label="No Authentication"
+		 layout="topleft"
+		 name="Socks5NoAuth"
+		 value="None"
+		 tool_tip="Socks5 proxy requires no authentication."
+		 width="120" />
+		<radio_item
+		 height="16"
+		 label="Username/Password"
+		 layout="topleft"
+		 name="Socks5UserPass"
+		 value="UserPass"
+		 tool_tip="Socks5 proxy requires username/password authentication."
+		 width="120" />
+	</radio_group>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left_delta="20"
+	 top_delta="50"
+	 width="200">
+	    Username:
+	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 left_pad="15"
+	 layout="topleft"
+	 width="200">
+	    Password:
+	</text>
+	<line_editor
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left="60"
+	 name="socks5_username"
+	 tool_tip="The username used to authenticate with your SOCKS 5 server"
+	 top_pad="4"
+	 width="200"
+	 commit_callback.function="Proxy.Change" />
+	<line_editor
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_pad="15"
+	 name="socks5_password"
+	 tool_tip="The password used to authenticate with your SOCKS 5 server"
+	 top_delta="0"
+	 width="200"
+	 is_password="true"
+	 commit_callback.function="Proxy.Change" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left="25"
+	 name="Proxy location"
+	 top_pad="18"
+	 width="300">
+	   Other HTTP traffic proxy:
+	</text>
+	<radio_group
+	 control_name="HttpProxyType"
+	 name="other_http_proxy_type"
+	 height="60"
+	 layout="topleft"
+	 top_pad="9"
+	 width="120"
+	 left_delta="15" 
+	 commit_callback.function="Proxy.Change" >
+		<radio_item
+		 height="16"
+		 label="Do not proxy"
+		 layout="topleft"
+		 name="OtherNoProxy"
+		 value="None"
+		 width="120"
+		 tool_tip="Non-web HTTP traffic will NOT be sent to any proxy."/>
+		<radio_item
+		 height="16"
+		 label="Use HTTP Proxy"
+		 layout="topleft"
+		 name="OtherHTTPProxy"
+		 value="Web"
+		 width="120"
+		 enabled_control="BrowserProxyEnabled"
+		 tool_tip="Non-web HTTP will be sent through the configured Web proxy." />
+		<radio_item
+		 height="16"
+		 label="Use SOCKS 5 Proxy"
+		 layout="topleft"
+		 name="OtherSocksProxy"
+		 value="Socks"
+		 width="120"
+		 enabled_control="Socks5ProxyEnabled"
+		 tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
+	</radio_group>
+	<button
+	 follows="left|top"
+	 height="22"
+	 label="OK"
+	 label_selected="OK"
+	 layout="topleft"
+	 left="282"
+	 name="OK"
+	 top_pad="36"
+	 width="90"
+	 commit_callback.function="Proxy.OK" />
+	<button
+	 follows="left|top"
+	 height="22"
+	 label="Cancel"
+	 label_selected="Cancel"
+	 layout="topleft"
+	 left_pad="10"
+	 name="Cancel"
+	 top_delta="0"
+	 width="90"
+	 commit_callback.function="Proxy.Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 32fb6f97e7..3b58cd08f6 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -16,5 +16,5 @@
      name="region_panels"
      right="-1"
      tab_position="top"
-     top="20" />
+     top="20"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 8770ede7e9..eaf575fc08 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -1,71 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="13"
+  legacy_header_height="18"
  can_resize="true"
- height="600"
+  height="775"
  layout="topleft"
  min_height="400"
- min_width="450"
- name="floater_search"
- help_topic="floater_search"
+  min_width="500"
+  name="floater_web_content"
+  help_topic="floater_web_content"
  save_rect="true"
+  auto_tile="true"
  save_visibility="true"
- single_instance="true"
- title="FIND"
- width="650">
-    <floater.string
-     name="loading_text">
-        Loading...
-    </floater.string>
-    <floater.string
-     name="done_text">
-        Done
-    </floater.string>
-    <layout_stack
-     height="580"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="10"
-     name="stack1"
-     top="20"
-     width="630">
-        <layout_panel
-         height="570"
-         layout="topleft"
-         left_delta="0"
-         top_delta="0"
-         name="browser_layout"
-         user_resize="false"
-         width="630">
-            <web_browser
-              trusted_content="true" 
-             follows="left|right|top|bottom"
-             layout="topleft"
-             left="0"
-             name="browser"
-             top="0"
-             height="540"
-             width="630" />
-            <text
-             follows="bottom|left"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="status_text"
-             top_pad="10"
-             width="150" />
-            <text
-             visible="false"
-             follows="bottom|right"
-             height="16"
-             left_delta="0"
-             name="refresh_search"
-             left_pad="0"
-             right="-10"
-             halign="right"
-             width="450">
-               Redo search to reflect current God level
-            </text>
-        </layout_panel>
-    </layout_stack>
-</floater>
+  title=""
+  initial_mime_type="text/html"
+  width="780"
+             tab_stop="true"
+  filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index ec190ab656..89a0c4c287 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -330,13 +330,13 @@
      increment="1"
      initial_value="75"
      label="Image quality"
-     label_width="100"
+     label_width="124"
      layout="topleft"
      left_delta="0"
      max_val="100"
      name="image_quality_slider"
      top_pad="5"
-     width="205" />
+     width="228" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
index 304987c3d5..74e01f359c 100644
--- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
@@ -15,14 +15,14 @@
  layout="topleft"
  name="floater_sound_devices"
  title="Sound Devices"
- width="315">
+ width="490">
   <panel
     layout="topleft"
     follows="all"
     filename="panel_sound_devices.xml"
     name="device_settings_panel"
     width="400"
-    left="2"
+    left="10"
     top="26"
     class="panel_voice_device_settings"/>
   <text
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 8b8f70b940..8901583799 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -47,24 +47,12 @@
         Click and drag to select land
     </floater.string>
     <floater.string
-     name="grid_screen_text">
-        Screen
+     name="status_selectcount">
+        [OBJ_COUNT] objects ( [PRIM_COUNT] prims[PE_STRING] ) selected
     </floater.string>
     <floater.string
-     name="grid_local_text">
-        Local
-    </floater.string>
-    <floater.string
-     name="grid_world_text">
-        World
-    </floater.string>
-    <floater.string
-     name="grid_reference_text">
-        Reference
-    </floater.string>
-    <floater.string
-     name="grid_attachment_text">
-        Attachment
+     name="status_selectprimequiv">
+        , [SEL_WEIGHT] prim equivs
     </floater.string>
     <button
      follows="left|top"
@@ -221,7 +209,7 @@
 	<radio_group
      follows="left|top"
 	 left="5"
-	 top="59"
+	 top="55"
 	 height="70"
      layout="topleft"
 	 name="edit_radio_group">
@@ -255,18 +243,18 @@
      label="Edit linked"
      layout="topleft"
      name="checkbox edit linked parts"
-     top_pad="-10">
+     top_pad="-18">
 		  <check_box.commit_callback
 			function="BuildTool.selectComponent"/>
 	</check_box>
 
    <button
      follows="left|top"
-     height="23"
+     height="20"
      label="Link"
-     top_pad="2"
+     top="108"
      layout="topleft"
-     left="5"
+     left="143"
      name="link_btn"
      width="50">
 	  <button.commit_callback
@@ -274,27 +262,15 @@
     </button>
     <button
      follows="left|top"
-     height="23"
+     height="20"
      label="Unlink"
      layout="topleft"
      left_pad="2"
      name="unlink_btn"
-     width="105">
+     width="90">
 	  <button.commit_callback
 	     function="BuildTool.UnlinkObjects"/>
     </button>
-    <text
-	   text_color="LtGray_50"
-	   follows="top|left"
-	   halign="left"
-	   left_pad="3"
-	   name="RenderingCost"
-	   tool_tip="Shows the rendering cost calculated for this object"
-	   top_delta="11"
-	   type="string"
-	   width="100">
-	   þ: [COUNT]
-	   </text>
     <check_box
      control_name="ScaleUniform"
      height="19"
@@ -302,7 +278,7 @@
      layout="topleft"
      left="143"
      name="checkbox uniform"
-     top="50"
+     top="48"
      width="20" />
     <text
      height="19"
@@ -324,53 +300,29 @@
      layout="topleft"
      left="143"
      name="checkbox stretch textures"
-     top_pad="-6"
+     top_pad="-4"
      follows="left|top"
      width="134" />
    <check_box
      control_name="SnapEnabled"
      height="18"
      initial_value="true"
-     label="Snap to grid"
+     label="Snap"
      layout="topleft"
      top_pad="0"
      name="checkbox snap to grid"
      width="134" />
-    <combo_box
-     height="23"
-     layout="topleft"
-     follows="left|top"
-     name="combobox grid mode"
-     tool_tip="Choose the type of grid ruler for positioning the object"
-     top_pad="0"
-     width="108">
-        <combo_box.item
-         label="World grid"
-         name="World"
-         value="World" />
-        <combo_box.item
-         label="Local grid"
-         name="Local"
-         value="Local" />
-        <combo_box.item
-         label="Reference grid"
-         name="Reference"
-         value="Reference" />
-		 <combo_box.commit_callback
-	     function="BuildTool.gridMode"/>
-    </combo_box>
     <button
      left_pad="0"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
+     label="Options..."
      layout="topleft"
      follows="top|left"
      name="Options..."
      tool_tip="See more grid options"
-     top_pad="-22"
-     right="-10"
-     width="18"
-     height="23" >
+     top="83"
+     right="-35"
+     width="65"
+     height="21" >
 	 <button.commit_callback
 	     function="BuildTool.gridOptions"/>
 	</button>
@@ -385,7 +337,7 @@
      left="10"
      name="ToolCube"
      tool_tip="Cube"
-     top="51"
+     top="58"
      width="20" />
     <button
      follows="left|top"
@@ -447,10 +399,10 @@
      image_selected="Object_Hemi_Cylinder_Selected"
      image_unselected="Object_Hemi_Cylinder"
      layout="topleft"
-     left_delta="29"
+     left="10"
      name="ToolHemiCylinder"
      tool_tip="Hemicylinder"
-     top_delta="0"
+     top="84"
      width="20" />
     <button
      follows="left|top"
@@ -515,7 +467,7 @@
      left="10"
      name="ToolTorus"
      tool_tip="Torus"
-     top="77"
+     top="109"
      width="20" />
     <button
      follows="left|top"
@@ -575,9 +527,9 @@
      height="19"
      label="Keep Tool selected"
      layout="topleft"
-     left="4"
+     left="155"
      name="checkbox sticky"
-     top="101"
+     top="55"
      width="128" />
     <check_box
      control_name="CreateToolCopySelection"
@@ -596,7 +548,7 @@
      layout="topleft"
      left_delta="18"
      name="checkbox copy centers"
-     top="132"
+     top="85"
      width="134" />
     <check_box
      control_name="CreateToolCopyRotates"
@@ -749,89 +701,49 @@
 	  <button.commit_callback
 	     function="BuildTool.applyToSelection"/>
     </button>
+    <text
+	 text_color="LtGray_50"
+	  type="string"
+	  length="1"
+	  height="16"
+	  follows="left|top"
+	  font="SansSerifSmall"
+	  layout="topleft"
+	  left="10"
+	  name="selection_empty"
+	  top_pad="0"
+	  width="100">
+		Nothing selected.
+	</text>
 	<text
 	 text_color="LtGray_50"
 	  type="string"
 	  length="1"
-	  height="10"
+	  height="16"
 	  follows="left|top"
-	  halign="right"
+	  font="SansSerifSmall"
 	  layout="topleft"
-	  right="-10"
-	  name="obj_count"
-	  top_pad="5"
-	  width="143">
-		Objects: [COUNT]
+	  left="10"
+	  name="selection_count"
+	  top_delta="0"
+	  visible="false"
+	  width="280">
 	</text>
 	<text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-	height="10" 
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     right="-10"
-     name="prim_count"
-     width="143">
-		Prims: [COUNT]
+	 text_color="LtGray_50"
+	  type="string"
+	  length="1"
+	  height="16"
+	  follows="left|top"
+	  font="SansSerifSmall"
+	  layout="topleft"
+	  left="10"
+	  name="selection_weight"
+	  top_pad="0"
+	  visible="false"
+	  width="280">
+	  Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT].
 	</text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     height="10"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     right="-120"
-     name="linked_set_count"
-     top="144"
-     width="80">
-        Linked Sets: [COUNT]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     height="10"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     top_delta="0"
-     right="-8"
-     name="linked_set_cost"
-     tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 
-     width="80">
-        Cost: [COST] / [PHYSICS]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     top_pad="5"
-     right="-120"
-     name="object_count"
-     width="80">
-        Objects: [COUNT]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-	 top_delta="0"
-     right="-8"
-     name="object_cost"
-     tool_tip="Cost of currently selected objects as [prims] / [physics complexity]"
-     width="80">
-        Cost: [COST] / [PHYSICS]
-    </text>
     <!-- <text -->
     <!-- text_color="LtGray_50" -->
     <!--  type="string" -->
@@ -858,6 +770,15 @@
     <!--  width="143"> -->
     <!--     Prims: [COUNT] -->
     <!-- </text> -->
+    <view_border
+    bevel_style="none"
+    follows="top|left"
+    height="0"
+    layout="topleft"
+    left="6"
+    name="cost_text_border"
+    top="135"
+    width="282"/>
     <tab_container
      follows="left|top"
      height="410"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 9bf9cc6c77..2c754cd8d0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -25,6 +25,46 @@
   <string name="new_voice_effect">
     (New!)
   </string>
+
+  <!--  effect names begin -->
+  <string name="effect_Arena">Arena</string>
+  <string name="effect_Beast">Beast</string>
+  <string name="effect_Buff">Buff</string>
+  <string name="effect_Buzz">Buzz</string>
+  <string name="effect_Camille">Camille</string>
+  <string name="effect_Creepy">Creepy</string>
+  <string name="effect_CreepyBot">CreepyBot</string>
+  <string name="effect_Cyber">Cyber</string>
+  <string name="effect_DeepBot">DeepBot</string>
+  <string name="effect_Demon">Demon</string>
+  <string name="effect_Flirty">Flirty</string>
+  <string name="effect_Foxy">Foxy</string>
+  <string name="effect_Halloween_2010_Bonus">Halloween_2010_Bonus</string>
+  <string name="effect_Helium">Helium</string>
+  <string name="effect_Husky">Husky</string>
+  <string name="effect_Intercom">Intercom</string>
+  <string name="effect_Macho">Macho</string>
+  <string name="effect_Micro">Micro</string>
+  <string name="effect_Mini">Mini</string>
+  <string name="effect_Nano">Nano</string>
+  <string name="effect_Nightmare">Nightmare</string>
+  <string name="effect_PopBot">PopBot</string>
+  <string name="effect_Rachel">Rachel</string>
+  <string name="effect_Radio">Radio</string>
+  <string name="effect_Robot">Robot</string>
+  <string name="effect_Roxanne">Roxanne</string>
+  <string name="effect_Sabrina">Sabrina</string>
+  <string name="effect_Samantha">Samantha</string>
+  <string name="effect_Sexy">Sexy</string>
+  <string name="effect_Shorty">Shorty</string>
+  <string name="effect_Sneaky">Sneaky</string>
+  <string name="effect_Stallion">Stallion</string>
+  <string name="effect_Sultry">Sultry</string>
+  <string name="effect_Thunder">Thunder</string>
+  <string name="effect_Vixen">Vixen</string>
+  <string name="effect_WhinyBot">WhinyBot</string>
+  <!--  effect names end -->
+
  <text
    height="16"
    word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
deleted file mode 100644
index 3a44ba3763..0000000000
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="240"
- layout="topleft"
- name="Water Floater"
- help_topic="water_floater"
- save_rect="true"
- title="ADVANCED WATER EDITOR"
- width="700">
-    <floater.string
-     name="WLDefaultWaterNames">
-        Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="KeyFramePresetsText"
-     top="34"
-     font="SansSerif"
-     width="85">
-        Water Presets:
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="95"
-     name="WaterPresetsCombo"
-     top_delta="-4"
-     width="150" />
-    <button
-     height="23"
-     label="New"
-     label_selected="New"
-     layout="topleft"
-     left_pad="3"
-     name="WaterNewPreset"
-     top_delta="0"
-     width="70" />
-    <button
-     height="23"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     left_pad="3"
-     name="WaterSavePreset"
-     top_delta="0"
-     width="70" />
-    <button
-     height="23"
-     label="Delete"
-     label_selected="Delete"
-     layout="topleft"
-     left_pad="3"
-     name="WaterDeletePreset"
-     top_delta="0"
-     width="70" />
-    <tab_container
-    border="false"
-     follows="left|top"
-     height="180"
-     halign="center"
-     layout="topleft"
-     left="0"
-     name="Water Tabs"
-     tab_position="top"
-     top="60"
-     width="700">
-        <panel
-         border="true"
-         follows="all"
-         height="180"
-         label="SETTINGS"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         help_topic="water_settings_tab"
-         name="Settings"
-         top="0"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText"
-             top="4"
-             width="200">
-                Water Fog Color
-            </text>
-            <color_swatch
-             can_apply_immediately="true"
-             color="0.5 0.5 0.5 1"
-             follows="left|top"
-             height="50"
-             layout="topleft"
-             left="40"
-             name="WaterFogColor"
-             tool_tip="Click to open color picker"
-             top="30"
-             width="40" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="WaterFogDensText"
-             top="84"
-             width="200">
-                Fog Density Exponent
-            </text>
-            <slider
-             control_name="WaterFogDensity"
-             decimal_digits="1"
-             follows="left"
-             height="10"
-             initial_value="16"
-             layout="topleft"
-             left="24"
-             max_val="10"
-             name="WaterFogDensity"
-             top="124"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="WaterUnderWaterFogModText"
-             top="124"
-             width="200">
-                Underwater Fog Modifier
-            </text>
-            <slider
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="16"
-             layout="topleft"
-             left="24"
-             max_val="2"
-             name="WaterUnderWaterFogMod"
-             top="164"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BDensText"
-             top="4"
-             width="200">
-                Reflection Wavelet Scale
-            </text>
-            <slider
-             control_name="WaterNormalScaleX"
-             decimal_digits="1"
-             follows="left"
-             height="15"
-             initial_value="0.7"
-             label="1"
-             layout="topleft"
-             max_val="10"
-             name="WaterNormalScaleX"
-             top_pad="24"
-             width="200" />
-            <slider
-             control_name="WaterNormalScaleY"
-             decimal_digits="1"
-             follows="left"
-             height="15"
-             initial_value="0.7"
-             label="2"
-             layout="topleft"
-             max_val="10"
-             name="WaterNormalScaleY"
-             top_pad="4"
-             width="200" />
-            <slider
-             control_name="WaterNormalScaleZ"
-             decimal_digits="1"
-             follows="left"
-             height="15"
-             initial_value="0.7"
-             label="3"
-             layout="topleft"
-             max_val="10"
-             name="WaterNormalScaleZ"
-             top_pad="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             name="HDText"
-             top="84"
-             width="200">
-                Fresnel Scale
-            </text>
-            <slider
-             control_name="WaterFresnelScale"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             name="WaterFresnelScale"
-             top="124"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             name="FresnelOffsetText"
-             top="124"
-             width="200">
-                Fresnel Offset
-            </text>
-            <slider
-             control_name="WaterFresnelOffset"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             name="WaterFresnelOffset"
-             top="164"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="DensMultText"
-             top="4"
-             width="200">
-                Refract Scale Above
-            </text>
-            <slider
-             control_name="WaterScaleAbove"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             layout="topleft"
-             left="494"
-             name="WaterScaleAbove"
-             top="44"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="WaterScaleBelowText"
-             top="44"
-             width="200">
-                Refract Scale Below
-            </text>
-            <slider
-             control_name="WaterScaleBelow"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0"
-             layout="topleft"
-             left="494"
-             name="WaterScaleBelow"
-             top="84"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="MaxAltText"
-             top="84"
-             width="200">
-                Blur Multiplier
-            </text>
-            <slider
-             control_name="WaterBlurMult"
-             follows="left"
-             height="10"
-             increment="0.001"
-             initial_value="0"
-             layout="topleft"
-             left="494"
-             max_val="0.16"
-             name="WaterBlurMult"
-             top="124"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="all"
-         height="180"
-         label="IMAGE"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         help_topic="water_waves_tab"
-         name="Waves"
-         top="0"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText"
-             top="4"
-             width="200">
-                Big Wave Direction
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="WaterWave1DirXText"
-             top_pad="5"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WaterWave1DirX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave1DirX"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WaterWave1DirYText"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WaterWave1DirY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave1DirY"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText2"
-             top_pad="-10"
-             width="355">
-                Little Wave Direction
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             left_delta="0"
-             name="WaterWave2DirXText"
-             top_pad="5"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WaterWave2DirX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave2DirX"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WaterWave2DirYText"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WaterWave2DirY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             max_val="4"
-             min_val="-4"
-             name="WaterWave2DirY"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="240"
-             name="BHText3"
-             top="4"
-             width="200">
-                Normal Map
-            </text>
-            <texture_picker
-             height="143"
-             layout="topleft"
-             left="250"
-             name="WaterNormalMap"
-             top="22"
-             width="128" />
-        </panel>
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index e04a72cbc0..0eda9ae62a 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -18,6 +18,7 @@
     follows="left|right|top|bottom"
     layout="topleft"
     left="5"
+    animate="false"
     name="stack1"
     orientation="vertical"
     top="20"
@@ -39,6 +40,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        chrome="true"
 		    hover_glow_amount="0.15"
         tool_tip="Navigate back"
         follows="left|top"
@@ -57,6 +59,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        chrome="true"
         tool_tip="Navigate forward"
         follows="left|top"
         height="22"
@@ -74,6 +77,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        chrome="true"
         tool_tip="Stop navigation"
         enabled="true"
         follows="left|top"
@@ -92,6 +96,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        chrome="true"
         tool_tip="Reload page"
         follows="left|top"
         height="22"
@@ -136,6 +141,7 @@
 		    image_disabled_selected="PushButton_Disabled"
 		    image_selected="PushButton_Selected"
 		    image_unselected="PushButton_Off"
+        chrome="true"
         tool_tip="Open current URL in your desktop browser"
         follows="right|top"
         enabled="true" 
@@ -156,14 +162,20 @@
       name="external_controls"
       top_delta="0"
       user_resize="false"
+      auto_resize="true"
       width="585">
       <web_browser
-        bottom="-22"
+        bottom="-2"
         follows="all"
         layout="topleft"
         left="0"
         name="webbrowser"
         top="0"/>
+    </layout_panel>
+    <layout_panel name="status_bar" 
+                  height="23"
+                  auto_resize="false"
+                  user_resize="false">
       <text
         type="string"
         length="200"
@@ -174,7 +186,7 @@
         name="statusbartext"
         parse_urls="false"
         text_color="0.4 0.4 0.4 1"
-        top_pad="5"
+        top_pad="3"
         width="495"/>
       <progress_bar
         color_bar="0.3 1.0 0.3 1"
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
deleted file mode 100644
index 7923dd87fa..0000000000
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ /dev/null
@@ -1,1288 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="256"
- layout="topleft"
- name="WindLight floater"
- help_topic="windlight_floater"
- save_rect="true"
- title="ADVANCED SKY EDITOR"
- width="700">
-    <floater.string
-     name="WLDefaultSkyNames">
-        A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerif"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="KeyFramePresetsText"
-     top="34"
-     width="135">
-        Sky Presets:
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_delta="135"
-     name="WLPresetsCombo"
-     top_delta="-4"
-     width="150" />
-    <button
-     height="23"
-     label="New"
-     label_selected="New"
-     layout="topleft"
-     left_pad="3"
-     name="WLNewPreset"
-     width="70" />
-    <button
-     height="23"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     left_pad="3"
-     name="WLSavePreset"
-     width="70" />
-    <button
-     height="23"
-     label="Delete"
-     label_selected="Delete"
-     layout="topleft"
-     left_pad="3"
-     name="WLDeletePreset"
-     width="70" />
-    <button
-     height="23"
-     label="Day Cycle Editor"
-     label_selected="Day Cycle Editor"
-     layout="topleft"
-     right="-10"
-     name="WLDayCycleMenuButton"
-     top_pad="-23"
-     width="120" />
-    <tab_container
-     follows="left|top"
-     height="196"
-     halign="center"
-     layout="topleft"
-     left="0"
-     name="WindLight Tabs"
-     tab_position="top"
-     top="60"
-     width="700">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="196"
-         label="ATMOSPHERE"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         help_topic="windlight_atmosphere_tab"
-         name="Atmosphere"
-         top="60"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText"
-             top="4"
-             width="355">
-                Blue Horizon
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="BHText2"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLBlueHorizonR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLBlueHorizonR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="10"
-             top_pad="-15"
-             name="BHText3"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLBlueHorizonG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueHorizonG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             name="BHText4"
-             left="10"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLBlueHorizonB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             name="WLBlueHorizonB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             name="BHText5"
-             left="10"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLBlueHorizonI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             name="WLBlueHorizonI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             top_pad="-10"
-             name="BDensText"
-             width="355">
-                Haze Horizon
-            </text>
-            <slider
-             control_name="WLHazeHorizon"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.25"
-             layout="topleft"
-             left="23"
-             top_delta="0"
-             top_pad="27"
-             name="WLHazeHorizon"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BDensText2"
-             top="4"
-             width="355">
-                Blue Density
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText6"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLBlueDensityR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLBlueDensityR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText7"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLBlueDensityG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueDensityG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText8"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLBlueDensityB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueDensityB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="BHText9"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLBlueDensityI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueDensityI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="HDText"
-             top_pad="-10"
-             width="355">
-                Haze Density
-            </text>
-            <slider
-             control_name="WLHazeDensity"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="258"
-             max_val="4"
-             name="WLHazeDensity"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="DensMultText"
-             top="4"
-             width="355">
-                Density Multiplier
-            </text>
-            <slider
-             control_name="WLDensityMult"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             layout="topleft"
-             left_delta="13"
-             max_val="0.9"
-             name="WLDensityMult"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLDistanceMultText"
-             top_pad="-10"
-             width="355">
-                Distance Multiplier
-            </text>
-            <slider
-             control_name="WLDistancMult"
-             decimal_digits="1"
-             follows="left"
-             height="10"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="13"
-             max_val="100"
-             name="WLDistanceMult"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="MaxAltText"
-             top_pad="-15"
-             width="355">
-                Max Altitude
-            </text>
-            <slider
-             control_name="WLMaxAltitude"
-             decimal_digits="0"
-             follows="left"
-             height="10"
-             increment="1"
-             initial_value="500"
-             layout="topleft"
-             left_delta="13"
-             max_val="4000"
-             name="WLMaxAltitude"
-             top_pad="27"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="196"
-         label="LIGHTING"
-         layout="topleft"
-         left_delta="0"
-         help_topic="windlight_lighting_tab"
-         name="Lighting"
-         top_delta="4"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="SLCText"
-             top="4"
-             width="355">
-                Sun/Moon Color
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLSunlightR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLSunlightR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText2"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLSunlightG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText3"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLSunlightB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText4"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLSunlightI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLSunlightI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="TODText"
-             top_pad="-10"
-             width="355">
-                Sun/Moon Position
-            </text>
-            <icon
-             height="20"
-             image_name="icon_diurnal.tga"
-             layout="topleft"
-             left_delta="14"
-             top_pad="10"
-             name="SkyDayCycle"
-             use_draw_context_alpha="false"
-             width="148" />
-            <slider
-             control_name="WLSunAngle"
-             follows="left"
-             height="10"
-             increment="0.001"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="-8"
-             name="WLSunAngle"
-             top_pad="20"
-             width="207" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="WLAmbientText"
-             top="4"
-             width="355">
-                Ambient
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText5"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLAmbientR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLAmbientR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText6"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLAmbientG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText7"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLAmbientB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText8"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLAmbientI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1"
-             layout="topleft"
-             left_delta="0"
-             name="WLAmbientI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLEastAngleText"
-             top_pad="-10"
-             width="355">
-                East Angle
-            </text>
-            <slider
-             control_name="WLEastAngle"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.0"
-             layout="topleft"
-             left_delta="13"
-             name="WLEastAngle"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="SunGlowText"
-             top="4"
-             width="355">
-                Sun Glow
-            </text>
-            <slider
-             control_name="WLGlowB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.1"
-             label="Focus "
-             layout="topleft"
-             left_delta="0"
-             max_val="0.5"
-             name="WLGlowB"
-             top_pad="27"
-             width="200" />
-            <slider
-             control_name="WLGlowR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.25"
-             label="Size    "
-             layout="topleft"
-             left_delta="0"
-             max_val="1.99"
-             min_val="1"
-             name="WLGlowR"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="SceneGammaText"
-             top_pad="-10"
-             width="200">
-                Scene Gamma
-            </text>
-            <slider
-             control_name="WLGamma"
-             decimal_digits="2"
-             follows="bottom"
-             height="10"
-             increment="0.01"
-             initial_value="2.0"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="WLGamma"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WLStarText"
-             top_pad="-10"
-             width="355">
-                Star Brightness
-            </text>
-            <slider
-             control_name="WLStarAlpha"
-             decimal_digits="2"
-             follows="bottom"
-             height="10"
-             increment="0.01"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_val="2"
-             name="WLStarAlpha"
-             top_pad="27"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="196"
-         label="CLOUDS"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="windlight_clouds_tab"
-         name="Clouds"
-         top_delta="4"
-         width="698">
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="WLCloudColorText"
-             top="4"
-             width="355">
-                Cloud Color
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText"
-             top_pad="5"
-             width="10">
-                R
-            </text>
-            <slider
-             control_name="WLCloudColorR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLCloudColorR"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText2"
-             top_pad="-15"
-             width="10">
-                G
-            </text>
-            <slider
-             control_name="WLCloudColorG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorG"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText3"
-             top_pad="-15"
-             width="10">
-                B
-            </text>
-            <slider
-             control_name="WLCloudColorB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorB"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText4"
-             top_pad="-15"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLCloudColorI"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudColorI"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudColorText2"
-             top_pad="-10"
-             width="355">
-                Cloud XY/Density
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText5"
-             top_pad="5"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WLCloudX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLCloudX"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText6"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WLCloudY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="3"
-             top_pad="6"
-             name="WLCloudY"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText7"
-             top_pad="-15"
-             width="10">
-                D
-            </text>
-            <slider
-             control_name="WLCloudDensity"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDensity"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="245"
-             name="WLCloudCoverageText"
-             top="4"
-             width="355">
-                Cloud Coverage
-            </text>
-            <slider
-             control_name="WLCloudCoverage"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="13"
-             name="WLCloudCoverage"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudScaleText"
-             top_pad="-10"
-             width="355">
-                Cloud Scale
-            </text>
-            <slider
-             control_name="WLCloudScale"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="13"
-             min_val="0.01"
-             name="WLCloudScale"
-             top_pad="27"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="WLCloudDetailText"
-             top_pad="-10"
-             width="355">
-                Cloud Detail (XY/Density)
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText8"
-             top_pad="8"
-             width="10">
-                X
-            </text>
-            <slider
-             control_name="WLCloudDetailX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="3"
-             top_pad="8"
-             name="WLCloudDetailX"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText9"
-             top_pad="-15"
-             width="10">
-                Y
-            </text>
-            <slider
-             control_name="WLCloudDetailY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDetailY"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="-13"
-             name="BHText10"
-             top_pad="-15"
-             width="10">
-                D
-            </text>
-            <slider
-             control_name="WLCloudDetailDensity"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudDetailDensity"
-             left_pad="3"
-             top_pad="6"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="480"
-             name="WLCloudScrollXText"
-             top="4"
-             width="355">
-                Cloud Scroll X
-            </text>
-            <check_box
-             control_name="WLCloudLockX"
-             follows="left"
-             height="16"
-             label="Lock"
-             layout="topleft"
-             left="625"
-             name="WLCloudLockX"
-             width="200" />
-            <slider
-             control_name="WLCloudScrollX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left="494"
-             max_val="10"
-             min_val="-10"
-             name="WLCloudScrollX"
-             top="45"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-14"
-             name="WLCloudScrollYText"
-             top_delta="-1"
-             width="355">
-                Cloud Scroll Y
-            </text>
-            <check_box
-             control_name="WLCloudLockY"
-             follows="left"
-             height="16"
-             label="Lock"
-             layout="topleft"
-             left="625"
-             name="WLCloudLockY"
-             width="200" />
-            <slider
-             control_name="WLCloudScrollY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left="494"
-             max_val="10"
-             min_val="-10"
-             name="WLCloudScrollY"
-             top="85"
-             width="200" />
-            <check_box
-             control_name="DrawClassicClouds"
-             follows="left"
-             height="16"
-             label="Draw Classic Clouds"
-             layout="topleft"
-             left="480"
-             name="DrawClassicClouds"
-             top="104"
-             width="200" />
-        </panel>
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index bd9e367d1f..bc3bcd331b 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -38,6 +38,7 @@
      height="20"
      left="8"
      name="user_name_small"
+     parse_urls="false"
      top="7"
      text_color="White"
      translate="false"
@@ -52,6 +53,7 @@
     height="21"
     left="8"
     name="user_name"
+    parse_urls="false"
     top="10"
     text_color="White"
     translate="false"
@@ -64,6 +66,7 @@
      left="8"
      name="user_slid"
      font="SansSerifSmallBold"
+     parse_urls="false"
      text_color="EmphasisColor"
      translate="false"
      value="teststring.pleaseignore"
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 3ead67ca57..a7d1aa963c 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -135,6 +135,14 @@
          name="login_panel_holder"
          width="1024"/>
 
+      <debug_view follows="all"
+                  left="0"
+                  top="0"
+                  mouse_opaque="false"
+                  height="500"
+                  name="DebugView"
+                  width="1024"/>
+
       <panel follows="all"
                     height="500"
                     left="0"
@@ -154,13 +162,6 @@
                       top="0"
                       width="1024"/>
       </panel>
-      <debug_view follows="all"
-                  left="0"
-                  top="0"
-                  mouse_opaque="false"
-                  height="500"
-                  name="DebugView"
-                  width="1024"/>
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index b36b82ebd8..0f42000ae7 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -42,7 +42,7 @@
                     <menu_item_call.on_enable
                      function="File.EnableUpload" />
                 </menu_item_call>
-		<menu_item_call
+                <menu_item_call
                  label="Model..."
                  layout="topleft"
                  name="Upload Model">
@@ -54,18 +54,6 @@
                 <menu_item_call.on_visible
                 function="File.VisibleUploadModel"/>
                 </menu_item_call>
-              <menu_item_call
-                label="Model Wizard..."
-                layout="topleft"
-                name="Upload Model Wizard">
-                <menu_item_call.on_click
-                 function="Floater.Show"
-                 parameter="upload_model_wizard" />
-                <menu_item_call.on_enable
-                 function="File.EnableUploadModel" />
-                <menu_item_call.on_visible
-                function="File.VisibleUploadModel"/>
-	      </menu_item_call>
                 <menu_item_call
                  label="Bulk (L$[COST] per file)..."
                  layout="topleft"
@@ -263,4 +251,4 @@
                      parameter="eyes" />
                 </menu_item_call>
             </menu>
-</menu>
+</menu>
+\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
index c39c26f25f..960da4bd7a 100644
--- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
@@ -28,4 +28,16 @@
     <menu_item_call.on_enable
      function="Edit.EnablePaste" />
   </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="debug_separator"
+   visible="false" />
+  <menu_item_call
+   label="Open Web Inspector"
+   layout="topleft"
+   name="open_webinspector"
+   visible="false">
+    <menu_item_call.on_click
+     function="Open.WebInspector" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_mode_change.xml b/indra/newview/skins/default/xui/en/menu_mode_change.xml
new file mode 100644
index 0000000000..87d1a0a7a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_mode_change.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="Mode Change">
+  <menu_item_check
+   label="Basic"
+   name="BasicMode">
+    <on_check
+         function="CheckSessionSettings"
+         parameter="settings_minimal.xml" />
+    <on_click
+      function="ChangeMode"
+      parameter="basic"/>
+  </menu_item_check>
+    <menu_item_check
+     label="Advanced"
+     name="AdvancedMode">
+    <on_check
+     function="CheckSessionSettings"
+     parameter="" />
+    <on_click
+      function="ChangeMode"
+      parameter="advanced"/>
+    </menu_item_check>
+  </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 81046e99a0..36ebe73753 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -232,6 +232,16 @@
              function="SideTray.PanelPeopleTab"
              parameter="nearby_panel" />
             </menu_item_call>
+        <menu_item_check
+         label="Nearby Voice"
+         name="Nearby Voice">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="voice_controls" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="voice_controls" />
+        </menu_item_check>
     </menu>
     <menu
      create_jump_keys="true"
@@ -470,7 +480,7 @@
 
         <menu_item_separator/>
 
-    <menu
+        <menu
          create_jump_keys="true"
          label="Sun"
          name="Environment Settings"
@@ -505,24 +515,114 @@
                  function="World.EnvSettings"
                  parameter="midnight" />
             </menu_item_call>
-            <menu_item_call
-             label="Estate Time"
-             name="Revert to Region Default">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="default" />
-            </menu_item_call>
-
-            <menu_item_separator/>
-
-            <menu_item_call
-             label="Environment Editor"
-             name="Environment Editor">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="editor" />
-            </menu_item_call>
         </menu>
+	    
+   
+	    <menu
+	     create_jump_keys="true"
+	     label="Enviroment Editor"
+	     name="Enviroment Editor"
+	     tear_off="true">
+	     	
+	     	<menu_item_call
+	     	 label="Enviroment Settings..."
+	     	 name="Enviroment Settings">
+	     	 	<menu_item_call.on_click
+	     	 	 function="World.EnvSettings"
+                 parameter="editor"/>
+	     	</menu_item_call>
+	     	
+	     	<menu_item_separator/>
+	     	
+	     	<menu
+	     	 name="Water Presets"
+	     	 label="Water Presets">
+	     	 	<menu_item_call
+	     	 	 label="New preset..."
+	     	 	 name="new_water_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_water"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Edit preset..."
+	     	 	 name="edit_water_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_water"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Delete preset..."
+	     	 	 name="delete_water_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_water"/>
+	     	 	 	<menu_item_call.on_enable
+	     	 	 	function="World.EnableEnvPreset"
+	     	 	 	parameter="delete_water"/>
+	     	 	</menu_item_call>
+	     	</menu>
+	     	
+	     	<menu
+	     	 name="Sky Presets"
+	     	 label="Sky Presets">
+	     	 	<menu_item_call
+	     	 	 label="New preset..."
+	     	 	 name="new_sky_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_sky"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Edit preset..."
+	     	 	 name="edit_sky_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_sky"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Delete preset..."
+	     	 	 name="delete_sky_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_sky"/>
+	     	 	 	<menu_item_call.on_enable
+	     	 	 	function="World.EnableEnvPreset"
+	     	 	 	parameter="delete_sky"/>
+	     	 	</menu_item_call>
+	     	</menu>
+	     	
+	     	<menu
+	     	 name="Day Presets"
+	     	 label="Day Presets">
+	     	 	<menu_item_call
+	     	 	 label="New preset..."
+	     	 	 name="new_day_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_day_cycle"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Edit preset..."
+	     	 	 name="edit_day_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_day_cycle"/>
+	     	 	</menu_item_call>
+	     	 	<menu_item_call
+	     	 	 label="Delete preset..."
+	     	 	 name="delete_day_preset">
+	     	 	 	<menu_item_call.on_click
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_day_cycle"/>
+	     	 	 	<menu_item_call.on_enable
+	     	 	 	function="World.EnableEnvPreset"
+	     	 	 	parameter="delete_day_cycle"/>
+	     	 	</menu_item_call>
+	     	</menu>
+	    </menu>
+    
+    
     </menu>
     <menu
      create_jump_keys="true"
@@ -983,19 +1083,7 @@
             <menu_item_call.on_visible
             function="File.VisibleUploadModel"/>
             </menu_item_call>
-			<menu_item_call
-           label="Model Wizard..."
-           layout="topleft"
-           name="Upload Model Wizard">
-				<menu_item_call.on_click
-				 function="Floater.Show"
-				 parameter="upload_model_wizard" />
-				<menu_item_call.on_enable
-				 function="File.EnableUploadModel" />
-				<menu_item_call.on_visible
-				function="File.VisibleUploadModel"/>
-			</menu_item_call>
-            <menu_item_call
+	   <menu_item_call
              label="Bulk (L$[COST] per file)..."
              layout="topleft"
              name="Bulk Upload">
@@ -1162,16 +1250,6 @@
              function="ToggleControl"
              parameter="QuietSnapshotsToDisk" />
         </menu_item_check>
-        <menu_item_check
-         label="Compress Snapshots to Disk"
-         name="CompressSnapshotsToDisk">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="CompressSnapshotsToDisk" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="CompressSnapshotsToDisk" />
-        </menu_item_check>
 
         <menu_item_separator/>
 
@@ -1997,15 +2075,14 @@
             </menu_item_check>
           <menu_item_check
              label="Show Upload Cost"
-             layout="topleft"
              name="Show Upload Cost">
-            <menu_item_check.on_check
+              <menu_item_check.on_check
              function="CheckControl"
              parameter="DebugShowUploadCost" />
             <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="DebugShowUploadCost" />
-          </menu_item_check>
+                 function="ToggleControl"
+                 parameter="DebugShowUploadCost" />
+            </menu_item_check>
             <menu_item_check
              label="Show Render Info"
              name="Show Render Info">
@@ -2016,7 +2093,7 @@
                  function="ToggleControl"
                  parameter="DebugShowRenderInfo" />
             </menu_item_check>
-			<menu_item_check
+			  <menu_item_check
              label="Show Texture Info"
              name="Show Texture Info">
                 <menu_item_check.on_check
@@ -2056,6 +2133,16 @@
                function="ToggleControl"
                parameter="DebugShowMemory" />
             </menu_item_check>
+	     <menu_item_check
+               label="Show Private Mem Info"
+               name="Show Private Mem Info">
+              <menu_item_check.on_check
+               function="CheckControl"
+               parameter="DebugShowPrivateMem" />
+              <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="DebugShowPrivateMem" />
+            </menu_item_check>
 
             <menu_item_separator/>
 
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
index 0ac2c14253..0e858ccf10 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
@@ -20,4 +20,11 @@
          function="Gear.OnEnable"
          parameter="take_off" />
     </menu_item_call>
+    <menu_item_call
+     label="Copy outfit list to clipboard"
+     layout="topleft"
+     name="copy">
+        <on_click
+         function="Gear.Copy" />
+    </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 09105c1d28..99ab56d10a 100755..100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3698,6 +3698,19 @@ Join me in [REGION]
 
   <notification
    icon="alertmodal.tga"
+   name="TooManyTeleportOffers"
+   type="alertmodal">
+You attempted to make [OFFERS] teleport offers
+which exceeds the limit of [LIMIT].
+    <tag>group</tag>
+    <tag>fail</tag>
+  <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="OfferTeleportFromGod"
    type="alertmodal">
 God summon Resident to your location?
@@ -4841,18 +4854,6 @@ Do you wish to overwrite the saved preset?
 
   <notification
    icon="alertmodal.tga"
-   name="WLDeletePresetAlert"
-   type="alertmodal">
-Do you wish to delete [SKY]?
-    <tag>confirm</tag>
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="WLNoEditDefault"
    type="alertmodal">
 You cannot edit or delete a default preset.
@@ -4869,81 +4870,53 @@ This day cycle file references a missing sky file: [SKY].
 
   <notification
    icon="alertmodal.tga"
-   name="PPSaveEffectAlert"
+   name="WLRegionApplyFail"
    type="alertmodal">
-PostProcess Effect exists. Do you still wish overwrite it?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="NewSkyPreset"
-   type="alert">
-Give me a name for the new sky.
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
-New Preset
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
+Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
   </notification>
 
   <notification
+   functor="GenericAcknowledge"
    icon="alertmodal.tga"
-   name="ExistsSkyPresetAlert"
+   name="EnvCannotDeleteLastDayCycleKey"
    type="alertmodal">
-Preset already exists!
-  <tag>fail</tag>
+Unable to delete the last key in this day cycle because you cannot have an empty day cycle.  You should modify the last remaining key instead of attempting to delete it and then to create a new one.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
-   icon="alert.tga"
-   name="NewWaterPreset"
-   type="alert">
-Give me a name for the new water preset.
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
-New Preset
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="DayCycleTooManyKeyframes"
+   type="alertmodal">
+You cannot add any more keyframes to this day cycle.  The maximum number of keyframes for day cycles of [SCOPE] scope is [MAX].
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
+   functor="GenericAcknowledge"
    icon="alertmodal.tga"
-   name="ExistsWaterPresetAlert"
+   name="EnvUpdateRate"
    type="alertmodal">
-Preset already exists!
-  <tag>fail</tag>
+    You may only update region environmental settings every [WAIT] seconds.  Wait at least that long and then try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="WaterNoEditDefault"
+   name="PPSaveEffectAlert"
    type="alertmodal">
-You cannot edit or delete a default preset.
-  <tag>fail</tag>
+PostProcess Effect exists. Do you still wish overwrite it?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
   </notification>
 
   <notification
@@ -5018,19 +4991,19 @@ Would you like to automatically wear the clothing you are about to create?
    name="NotAgeVerified"
    type="alertmodal">
    <tag>fail</tag>
-You must be age-verified to visit this area.  Do you want to go to the [SECOND_LIFE] website and verify your age?
+To access adult content and areas in Second Life you must be at least 18 years old. Please visit our age verification page to confirm you are over 18. 
+Note this will launch your web browser.
 
 [_URL]
     <tag>confirm</tag>
     <url option="0" name="url">
-
-	    https://secondlife.com/account/verification.php
+	    https://secondlife.com/my/account/verification.php
     </url>
     <usetemplate
      ignoretext="I have not verified my age"
      name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
+     notext="Cancel"
+     yestext="Go to Age Verification"/>
   </notification>
 
   <notification
@@ -5116,7 +5089,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
    name="FriendOnline"
    type="notifytip">
     <tag>friendship</tag>
-[NAME] is Online
+&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Online
   </notification>
 
   <notification
@@ -5124,7 +5097,7 @@ Topic: [SUBJECT], Message: [MESSAGE]
    name="FriendOffline"
    type="notifytip">
     <tag>friendship</tag>
-[NAME] is Offline
+&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Offline
   </notification>
 
   <notification
@@ -5655,6 +5628,15 @@ This area has building disabled. You can&apos;t build or rez objects here.
 
   <notification
    icon="notify.tga"
+   name="SeeAvatars"
+   persist="true"
+   type="notify"
+   unique="true">
+This parcel hides avatars and text chat from another parcel.   You can&apos;t see other residents outside the parcel, and those outside are not able to see you.  Regular text chat on channel 0 is also blocked.
+  </notification>
+
+  <notification
+   icon="notify.tga"
    name="ScriptsStopped"
    persist="true"
    type="notify">
@@ -5921,7 +5903,7 @@ No valid parcel could be found.
    name="ObjectGiveItem"
    type="offer">
 An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
     <form name="form">
       <button
        index="0"
@@ -6279,6 +6261,10 @@ Grant this request?
 [MESSAGE]
     <form name="form">
       <button
+       index="-2"
+       name="Mute"
+       text="Block"/>
+      <button
        index="-1"
        name="Ignore"
        text="Ignore"/>
@@ -6294,6 +6280,10 @@ Grant this request?
 [MESSAGE]
     <form name="form">
       <button
+       index="-2"
+       name="Mute"
+       text="Block"/>
+      <button
        index="-1"
        name="Ignore"
        text="Ignore"/>
@@ -6828,6 +6818,20 @@ Select residents to share with.
 See the log file for details.
   </notification>
    
+   <notification
+    name="MeshUploadPermError"
+    icon="alert.tga"
+    type="alert">
+    Error while requesting mesh upload permissons.
+  </notification>
+  
+  <notification
+    name="RegionCapabilityRequestError"
+    icon="alert.tga"
+    type="alert">
+    Could not get region capability &apos;[CAPABILITY]&apos;.
+  </notification>
+   
   <notification
    icon="notifytip.tga"
    name="ShareItemsConfirmation"
@@ -6838,7 +6842,7 @@ Are you sure you want to share the following items:
 
 With the following Residents:
 
-[RESIDENTS]
+&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
   <tag>confirm</tag>
 	<usetemplate
      name="okcancelbuttons"
@@ -7143,6 +7147,20 @@ Click and drag anywhere on the world to rotate your view
     <tag>funds</tag>
   </notification>
 
+   <notification
+   icon="alertmodal.tga"
+   name="LowMemory"
+   type="alertmodal">
+    Your memory pool is low. Some functions of SL are disabled to avoid crash. Please close other applications. Restart SL if this persists.
+  </notification>
+
+  <notification
+     icon="alertmodal.tga"
+     name="ForceQuitDueToLowMemory"
+     type="alertmodal">
+    SL will quit in 30 seconds due to out of memory.
+  </notification>
+
   <notification
   name="PopupAttempt"
   icon="Popup_Caution"
@@ -7161,6 +7179,138 @@ Click and drag anywhere on the world to rotate your view
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_PERMITTED"
+   type="alertmodal">
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_ERROR"
+   type="alertmodal">
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>	 
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_ACCEPTABLE"
+   type="alertmodal">
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_AUTH_FAIL"
+   type="alertmodal">
+	The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UDP_FWD_NOT_GRANTED"
+   type="alertmodal">
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_HOST_CONNECT_FAILED"
+   type="alertmodal">
+	Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UNKNOWN_STATUS"
+   type="alertmodal">
+	Unknown proxy error with server "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_INVALID_HOST"
+   type="alertmodal">
+	Invalid SOCKS proxy address or port "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_BAD_CREDS"
+   type="alertmodal">
+	Invalid SOCKS 5 username or password.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="PROXY_INVALID_HTTP_HOST"
+   type="alertmodal">
+    Invalid HTTP proxy address or port "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PROXY_INVALID_SOCKS_HOST"
+   type="alertmodal">
+	Invalid SOCKS proxy address or port "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ChangeProxySettings"
+   type="alert">
+	Proxy settings take effect after you restart [APP_NAME].
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
   name="AuthRequest"
   type="browser">
 The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; requires a user name and password.
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
index 1d8bfa0672..9369d1b5cf 100644
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -75,6 +75,7 @@
 		width="250"
 		length="1"
 		follows="right|left"
+		parse_urls="false"
 		use_ellipses="true"
 		font="SansSerifBold">
     TestString PleaseIgnore
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index e40dc430fc..b7c58eb6ab 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -60,6 +60,7 @@
      layout="topleft"
      left_pad="5"
      name="avatar_name"
+     parse_urls="false"
      top="6"
      use_ellipses="true"
      value="(loading)"
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index 9e70706603..beea53437a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -52,7 +52,7 @@
              multi_select="true"
              name="list_attachments"
              top="0"
-             width="311"/>
+			 width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 82dfb445da..2ec2e03e8c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -220,7 +220,7 @@
 			  height="23"
 			  layout="topleft"
 			  left_pad="4"
-			  name="layout_panel1"
+			  name="layout_panel2"
 		      user_resize="false" 
 		      auto_resize="true"
 			  width="146">
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
new file mode 100644
index 0000000000..d06190ec54
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_inventory_panel
+    name="inventory_inbox"
+    start_folder="Received Items"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+	top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inbox_inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 46c1add739..4251128714 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -63,6 +63,7 @@
          layout="topleft"
          left_pad="5"
          name="user_name"
+         parse_urls="false"
          text_color="white"
          top="8"
          translate="false"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 8d0f1437e6..983f93cb03 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -117,7 +117,7 @@ label="Remember password"
   name="connect_btn"
   top="35"
   width="90" />
- <text
+  <text
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
@@ -125,25 +125,25 @@ label="Remember password"
   name="mode_selection_text"
   top="20"
   width="130">
-       Mode:
- </text>
-<combo_box
-  follows="left|bottom"
+    Mode:
+  </text>
+  <combo_box
+    follows="left|bottom"
   height="23"
-  max_chars="128"
+    max_chars="128"
   tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-  top_pad="0"
-  name="mode_combo"
-  width="110">
-<combo_box.item
-  label="Basic"
-  name="Basic"
-  value="settings_minimal.xml" />
-<combo_box.item
-  label="Advanced"
-  name="Advanced"
-  value="" />
-</combo_box>
+    top_pad="0"
+    name="mode_combo"
+    width="110">
+    <combo_box.item
+      label="Basic"
+      name="Basic"
+      value="settings_minimal.xml" />
+    <combo_box.item
+      label="Advanced"
+      name="Advanced"
+      value="" />
+  </combo_box>
   <text
   follows="left|bottom"
   font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 8a7bd53054..9749b6fdd4 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -97,7 +97,7 @@
 	     mouse_opaque="false"
 	     name="location_combo"
 	     top_delta="0"
-	     width="266">
+	     width="226">
          <combo_list
          mouse_wheel_opaque="true"/>
 	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
@@ -137,7 +137,7 @@
 	     name="search_combo_box"
 	     tool_tip="Search"
 	     top_delta="0"
-	     width="200" >
+	     width="244" >
          <combo_editor
           label="Search [SECOND_LIFE]"
           name="search_combo_editor"/>
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..af32056428
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inventory_panel
+    name="inventory_outbox"
+    start_folder="Outbox"
+    follows="all" layout="topleft"
+    top="0" left="0" height="165" width="308"
+	top_pad="0"
+    bg_opaque_color="DkGray2"
+    bg_alpha_color="DkGray2"
+    background_visible="true"
+    background_opaque="true"
+    border="false"
+    bevel_style="none"
+    show_item_link_overlays="true"
+    >
+    <scroll reserve_scroll_corner="false" />
+</inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index 9f98019c94..a0096adc01 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,9 +14,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
-     no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
-     no_matched_tabs_text.v_pad="10"
-     no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"
+
      follows="all"
      height="400"
      layout="topleft"
@@ -24,6 +22,13 @@
      name="outfits_accordion"
      top="0"
      width="309">
+       <no_matched_tabs_text
+         name="no_matched_outfits_msg"
+         value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+         v_pad="10"/>
+       <no_visible_tabs_text
+         name="no_outfits_msg"
+         value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"/>
     </accordion>
     <panel
      background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 775805ad2e..cc4522f944 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -110,8 +110,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            <layout_panel
              height="142"
              layout="topleft"
+             min_dim="100"
              mouse_opaque="false"
-             user_resize="false"
+             user_resize="true"
              visibility_control="NearbyListShowMap"
              width="313">
              <net_map
@@ -128,9 +129,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
            <layout_panel
              height="213"
              layout="topleft"
-             min_height="100"
+             min_dim="100"
              mouse_opaque="false"
-             user_resize="false"
+             user_resize="true"
              width="313">
              <avatar_list
                allow_select="true"
@@ -621,7 +622,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="im_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="41">
@@ -642,7 +643,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="call_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="52">
@@ -663,7 +664,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="share_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="66">
@@ -684,7 +685,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="teleport_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="77">
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 774a9e8bbf..e280115bda 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -153,6 +153,14 @@
      name="icon_DamageNo"
      translate="false"
      value="Parcel_DamageNo_Dark" />
+    <string
+     name="icon_SeeAVs_Off"
+     translate="false"
+     value="Parcel_SeeAVsOff_Dark" />
+    <string
+     name="icon_SeeAVs_On"
+     translate="false"
+     value="Parcel_SeeAVsOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -354,7 +362,7 @@
                  title="Parcel">
                     <panel
                      follows="all"
-                     height="175"
+                     height="200"
                      layout="topleft"
                      left="0"
                      name="parcel_characteristics_panel"
@@ -543,6 +551,31 @@
                          top_delta="0"
                          value="Off"
                          width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="Parcel_SeeAVsOff_Dark"
+                         layout="topleft"
+                         left="10"
+                         name="see_avatars_icon"
+                         top_pad="7"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="see_avatars_label"
+                         value="See Avatars:"
+                         width="90" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="0"
+                         name="see_avatars_value"
+                         value="Off"
+                         width="60" />
                         <button
                          follows="bottom|right"
                          height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index daf571297f..b6b8a337a1 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -234,7 +234,7 @@ background_visible="true"
 				height="23"
 				layout="topleft"
 				mouse_opaque="false"
-				name="bottom_bar_ls3"
+				name="bottom_bar_profile_ls"
 				left="0"
 				orientation="horizontal"
 				top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 30be5bc853..47236c1a48 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -139,7 +139,7 @@
      height="16"
      label="Add datestamp to log file name."
      layout="topleft"
-     left_detla="5"
+     left_delta="5"
      name="logfile_name_datestamp"
      top_pad="10"
      width="350"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 1c22a5c02e..a7078ce2e1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -70,7 +70,7 @@
    layout="topleft"
    left="77"
    name="connection_port_enabled"
-   top_pad="20"
+   top_pad="10"
    width="256">
     <check_box.commit_callback
      function="Notification.Show"
@@ -79,7 +79,7 @@
   <spinner
    control_name="ConnectionPort"
    enabled_control="ConnectionPortEnabled"
- decimal_digits="0"
+   decimal_digits="0"
    follows="left|top"
    height="23"
    increment="1"
@@ -195,60 +195,6 @@
     name="media_popup_enabled"
     width="400"           
     top_pad="5"/>
-  <check_box
-    top_delta="4"
-    enabled="true"
-    follows="left|top"
-    height="14"
-    initial_value="false"
-    control_name="BrowserProxyEnabled"
-    label="Enable Web Proxy"
-    left_delta="0"
-    mouse_opaque="true"
-    name="web_proxy_enabled"
-    radio_style="false"
-    width="400"           top_pad="5"/>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_delta="20"
-   name="Proxy location"
-   top_delta="16"
-   width="300">
-    Proxy location:
-  </text>
-  <line_editor
-   control_name="BrowserProxyAddress"
-   enabled_control="BrowserProxyEnabled"
- follows="left|top"
-   font="SansSerif"
-   height="23"
-   layout="topleft"
-   left_delta="0"
-   name="web_proxy_editor"
-   tool_tip="The name or IP address of the proxy you would like to use"
-   top_pad="4"
-   width="200" />
-  <spinner
-   control_name="BrowserProxyPort"
-   enabled_control="BrowserProxyEnabled"
- decimal_digits="0"
-   follows="left|top"
-   height="23"
-   increment="1"
-   initial_value="80"
-   label="Port number:"
-   label_width="95"
-   layout="topleft"
-   left_delta="210"
-   max_val="12000"
-   min_val="10"
-   name="web_proxy_port"
-   top_delta="0"
-   width="145" />
   <text
      type="string"
      length="1"
@@ -268,7 +214,7 @@
      height="23"
      layout="topleft"
      left_delta="50"
-	 top_pad="5"
+     top_pad="5"
      name="updater_service_combobox"
      width="300">
         <combo_box.item
@@ -286,4 +232,31 @@
          name="Install_manual"
          value="0" />
   </combo_box>
+  <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Proxy Settings:"
+     mouse_opaque="false"
+     top_pad="5"
+     width="300">
+		Proxy Settings:
+  </text>
+  <button
+	label="Adjust proxy settings"
+    follows="left|top"
+    height="23"
+	width="140" 
+    label_selected="Browse"
+    layout="topleft"
+    left_delta="50"
+    name="set_proxy"
+    top_pad="5"
+    >
+		<button.commit_callback
+		  function="Pref.Proxy" />
+  </button>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 1745c1e4b0..1f92244eb9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -385,7 +385,7 @@
 		height="18"
 		image_name="Move_Walk_Off"
 		layout="topleft"
-    left_pad="170" 
+		left_pad="170" 
 		name="avatar_icon"
 		mouse_opaque="false"
 		visible="true"
@@ -496,8 +496,8 @@
     filename="panel_sound_devices.xml"
      visiblity_control="ShowDeviceSettings"
      name="device_settings_panel"
-    top="314"
-    width="345"
+    top_pad="0"
+    width="480"
     left="18"
     class="panel_voice_device_settings"/>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 2868d91cc7..4535c56339 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -132,4 +132,12 @@
      name="cancel_btn"
      top="700"
      width="90" />
+  <web_browser
+   follows="all"
+   layout="topleft"
+   left="0"
+   name="login_media_panel"
+   width="1024"
+   height="768"
+   top="0"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
new file mode 100644
index 0000000000..aa38c49fae
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ border="true"
+ follows="top|left"
+ height="300"
+ label="Environment"
+ layout="topleft"
+ help_topic="panel_region_environment_tab"
+ name="panel_env_info"
+ width="530"> 
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="30"
+  layout="topleft"
+  left="50"
+  top_pad="20"
+  width="430"
+  wrap="true">
+  Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see.  More info
+ </text> 
+ <view_border
+  bevel_style="none"
+  follows="top|left"
+  height="237"
+  layout="topleft"
+  left="50"
+  name="border"
+  top="60"
+  width="430"/>
+ <radio_group
+  follows="top|left"
+  height="45"
+  layout="topleft"
+  left_delta="10"
+  name="region_settings_radio_group"
+  top_delta="20"
+  width="200">
+  <radio_item
+   label="Use Second Life default"
+   layout="topleft"
+   name="use_sl_default_settings"/>
+  <radio_item
+   label="Use the following settings"
+   layout="topleft"
+   name="use_my_settings"
+   top_pad="20"/>
+  </radio_group>
+ <panel
+  follows="top|left"
+  height="150"
+  layout="topleft"
+  left="50"
+  name="user_environment_settings"
+  top_pad="20"
+  width="430">
+   <text
+    name="water_settings_title"
+    follows="top|left"
+    height="16"
+    layout="topleft"
+    left="50"
+    top_pad="0"
+    width="160">
+    Water Setting
+   </text>
+   <combo_box
+    follows="top|left"
+    left_pad="2"
+    name="water_settings_preset_combo"
+    top_delta="-7"
+    width="200">
+    <combo_box.item
+     label="-Select a preset-"
+     name="item0"/>
+   </combo_box>
+   <text
+    name="sky_dayc_settings_title"
+    follows="top|left"
+    height="16"
+    layout="topleft"
+    left="50"
+    top_pad="30"
+    width="100">
+    Sky / Day Cycle
+   </text>
+   <radio_group
+    layout="topleft"
+    left_delta="50"
+    name="sky_dayc_settings_radio_group"
+    top_pad="10"
+    height="50"
+    width="110">
+    <radio_item
+     layout="topleft"
+     label="Fixed sky"
+     name="my_sky_settings"/>
+    <radio_item
+     layout="topleft"
+     label="Day cycle"
+     name="my_dayc_settings"
+     top_pad="25"/>  	
+    </radio_group>
+   <combo_box
+    follows="top|left"
+    left_pad="2"
+    name="sky_settings_preset_combo"
+    top_delta="-7"
+    width="200">
+    <combo_box.item
+     label="-Select a preset-"
+     name="item0"/>
+   </combo_box>
+   <combo_box
+    follows="top|left"
+    name="dayc_settings_preset_combo"
+    top_delta="36"
+    width="200">
+    <combo_box.item
+     label="-Select a preset-"
+     name="item0"/>
+   </combo_box>
+ </panel>
+ <button
+  follows="left|top"
+  height="23"
+  label="Apply"
+  layout="topleft"
+  right="-160"
+  name="apply_btn"
+  top_pad="10"
+  width="100" />
+ <button
+  follows="left|top"
+  height="23"
+  label="Cancel"
+  layout="topleft"
+  left_pad="10"
+  name="cancel_btn"
+  width="100" /> 
+ <loading_indicator
+  height="23"
+  left="50"
+  name="progress_indicator"
+  top_delta="0"
+  visible="false"
+  width="23" />
+</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 1307d807e2..6b28639a77 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="false"
+ border="true"
  follows="top|left"
  height="510"
  help_topic="panel_region_estate_tab"
@@ -20,7 +20,7 @@
      name="estate_help_text"
      top="14"
      word_wrap="true"
-     width="300">
+     >
         Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
@@ -30,9 +30,10 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     right="160"
      name="estate_text"
      top_pad="2"
+     halign="right"
      width="140">
         Estate:
     </text>
@@ -43,9 +44,9 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     top_delta="0"
      name="estate_name"
-     top_delta="16"
+     left_pad="6"
      width="150">
         (unknown)
     </text>
@@ -56,9 +57,10 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     right="160"
      name="owner_text"
-     top_pad="2"
+     top_pad="6"
+     halign="right"
      width="150">
         Estate owner:
     </text>
@@ -69,75 +71,68 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="0"
+     top_delta="0"
      name="estate_owner"
-     top_delta="16"
+     left_pad="6"
      use_ellipses="true"
      width="290">
         (unknown)
     </text>
+
     <view_border
-     bevel_style="in"
+     bevel_style="none"
      follows="top|left"
-     height="270"
+     height="95"
      layout="topleft"
-     left_delta="-4"
+     left="10"
      top_pad="5"
-     width="300" />
+     width="470" />
+
     <check_box
      height="20"
-     label="Use Global Time"
+     label="Allow Public Access"
      layout="topleft"
-     left="12"
-     name="use_global_time_check"
-     top="132"
+     left="20"
+     name="externally_visible_check"
+     top_delta="5"
      width="200" />
+
     <check_box
      height="20"
-     label="Fixed Sun"
-     layout="topleft"
-     left="12"
-     name="fixed_sun_check"
-     top="152"
-     width="100" />
-    <icon
-     height="20"
-     image_name="icon_day_cycle.tga"
+     label="Allow Voice Chat"
      layout="topleft"
-     left="47"
-     name="daycycle"
-     top="177"
-     width="165" />
-    <slider
-     follows="left|top"
-     height="20"
-     increment="0.001"
-     label="Phase"
-     layout="topleft"
-     left="12"
-     max_val="30"
-     min_val="6"
-     name="sun_hour_slider"
-     show_text="false"
-     top="202"
+     left="280"
+     name="voice_chat_check"
+     top_delta="0"
      width="200" />
     <check_box
      height="20"
-     label="Allow Public Access"
+     label="Allow Direct Teleport"
      layout="topleft"
      left_delta="0"
-     name="externally_visible_check"
-     top_pad="6"
-     width="200" />
+     name="allow_direct_teleport"
+     top_pad="4"
+     width="80" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="23"
+     label="Apply"
+     layout="topleft"
+     name="apply_btn"
+     top_pad="15"
+     left_delta="0"
+     width="97" />
+
     <text
      type="string"
      length="1"
      follows="top|left"
      height="16"
      layout="topleft"
-     left="32"
+     left="20"
      name="Only Allow"
-     top="250"
+     top_delta="-30"
      width="278">
         Restrict Access to accounts verified by:
     </text>
@@ -161,50 +156,6 @@
      tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
      top_pad="2"
      width="278" />
-    <check_box
-     height="20"
-     label="Allow Voice Chat"
-     layout="topleft"
-     left="12"
-     name="voice_chat_check"
-     top="304"
-     width="200" />
-    <check_box
-     height="20"
-     label="Allow Direct Teleport"
-     layout="topleft"
-     left="12"
-     name="allow_direct_teleport"
-     top_pad="4"
-     width="80" />
-    <button
-     enabled="false"
-     follows="left|top"
-     height="23"
-     label="Apply"
-     layout="topleft"
-     name="apply_btn"
-     top_pad="10"
-     left="110"
-     width="97" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Send Message To Estate..."
-     layout="topleft"
-     left="45"
-     name="message_estate_btn"
-     top_pad="20"
-     width="220" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Kick Resident from Estate..."
-     layout="topleft"
-     left="45"
-     name="kick_user_from_estate_btn"
-     top_pad="5"
-     width="220" />
 
     <text
      type="string"
@@ -214,16 +165,31 @@
      height="20"
      layout="topleft"
      name="estate_manager_label"
-     right="520"
+     top_pad="30"
+     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">
+        Allowed Residents:
+    </text>
+
+    <!-- Estate Managers box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
+     left="10"
      top_pad="-5"
      width="200" />
     <name_list
@@ -235,43 +201,15 @@
      name="estate_manager_name_list"
      top_delta="0"
      width="200" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_estate_manager_btn"
-     right="520"
-     top_pad="5"
-     width="97" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left_delta="-103"
-     name="add_estate_manager_btn"
-     top_delta="0"
-     width="97" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="allow_resident_label"
-     top_pad="10"
-     width="200">
-        Allowed Residents:
-    </text>
+
+    <!-- Allowed Residents box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
-     top_pad="-5"
+     left="280"
+     top_delta="0"
      width="200" />
     <name_list
      follows="left|top"
@@ -282,42 +220,78 @@
      name="allowed_avatar_name_list"
      top_delta="0"
      width="200" />
+
+    <!-- Estate Managers buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_estate_manager_btn"
+     top_pad="6"
+     width="97" />
     <button
      follows="left|top"
      height="23"
      label="Remove..."
      layout="topleft"
-     name="remove_allowed_avatar_btn"
-     right="520"
-     top_pad="5"
+     name="remove_estate_manager_btn"
+     left_pad="6"
      width="97" />
+
+    <!-- Allowed Residents buttons -->
     <button
      follows="left|top"
      height="23"
+     left="280"
      label="Add..."
      layout="topleft"
-     left_delta="-103"
      name="add_allowed_avatar_btn"
      top_delta="0"
      width="97" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_avatar_btn"
+     left_pad="6"
+     top_delta="0"
+     width="97" />
+
     <text
      type="string"
      length="1"
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="0"
+     left="10"
      name="allow_group_label"
      top_pad="10"
      width="200">
         Allowed Groups:
     </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="280"
+     name="ban_resident_label"
+     top_delta="0"
+     width="200">
+        Banned Residents:
+    </text>
+
+    <!-- Allowed Groups box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
+     left="10"
      top_pad="-5"
      width="200" />
     <name_list
@@ -329,43 +303,15 @@
      name="allowed_group_name_list"
      top_delta="0"
      width="200" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Remove..."
-     layout="topleft"
-     name="remove_allowed_group_btn"
-     right="520"
-     top_pad="5"
-     width="97" />
-    <button
-     follows="left|top"
-     height="23"
-     label="Add..."
-     layout="topleft"
-     left_delta="-103"
-     name="add_allowed_group_btn"
-     top_delta="0"
-     width="97" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="ban_resident_label"
-     top_pad="10"
-     width="200">
-        Banned Residents:
-    </text>
+
+    <!-- Banned Residents box -->
     <view_border
      bevel_style="none"
      follows="top|left"
      height="71"
      layout="topleft"
-     right="520"
-     top_pad="-5"
+     left="280"
+     top_delta="0"
      width="200" />
     <name_list
      follows="left|top"
@@ -376,22 +322,64 @@
      name="banned_avatar_name_list"
      top_delta="0"
      width="200" />
+
+    <!-- Allowed Groups buttons -->
+    <button
+     follows="left|top"
+     height="23"
+     label="Add..."
+     layout="topleft"
+     left="10"
+     name="add_allowed_group_btn"
+     top_pad="6"
+     width="97" />
     <button
      follows="left|top"
      height="23"
      label="Remove..."
      layout="topleft"
-     name="remove_banned_avatar_btn"
-     right="520"
-     top_pad="5"
+     name="remove_allowed_group_btn"
+     left_pad="6"
+     top_delta="0"
      width="97" />
+
+    <!-- Banned Residents buttons -->
     <button
      follows="left|top"
      height="23"
      label="Add..."
      layout="topleft"
-     left_delta="-103"
+     left="280"
      name="add_banned_avatar_btn"
      top_delta="0"
      width="97" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Remove..."
+     layout="topleft"
+     name="remove_banned_avatar_btn"
+     top_delta="0"
+     left_pad="6"
+     width="97" />
+
+    <button
+     follows="left|top"
+     height="23"
+     label="Send Message To Estate..."
+     layout="topleft"
+     left="10"
+     name="message_estate_btn"
+     top_pad="20"
+     width="220" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Kick Resident from Estate..."
+     layout="topleft"
+     left="280"
+     name="kick_user_from_estate_btn"
+     top_delta="0"
+     width="220" />
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 5093c52129..5d060c0a0d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="top|left"
- height="320"
+ height="460"
  help_topic="panel_region_terrain_tab"
  label="Terrain"
  layout="topleft"
@@ -50,10 +50,10 @@
      label="Terrain Raise Limit"
      label_width="120"
      layout="topleft"
-     left="15"
+     left="240"
      max_val="100"
      name="terrain_raise_spin"
-     top="60"
+     top="40"
      width="180" />
     <spinner
      follows="left|top"
@@ -62,95 +62,336 @@
      label="Terrain Lower Limit"
      label_width="120"
      layout="topleft"
-     left="15"
+     left="240"
      max_val="0"
      min_val="-100"
      name="terrain_lower_spin"
-     top="80"
+     top="60"
      width="180" />
-    <check_box
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="60"
+     layout="topleft"
+     left="8"
+     top="30"
+     width="460" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
      height="20"
-     label="Use Estate Sun"
      layout="topleft"
-     left="250"
-     name="use_estate_sun_check"
-     top="35"
+     left="10"
+     name="detail_texture_text"
+     top="110"
+     width="300">
+        Terrain Textures (requires 512x512, 24 bit .tga files)
+    </text>
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_delta="0"
+     name="texture_detail_0"
+     top_delta="20"
      width="100" />
-    <check_box
-     height="20"
-     label="Fixed Sun"
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_1"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_2"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
      layout="topleft"
-     left="250"
-     name="fixed_sun_check"
-     top="55"
+     left_pad="10"
+     name="texture_detail_3"
+     top_delta="0"
      width="100" />
-    <icon
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
      height="20"
-     image_name="icon_day_cycle.tga"
      layout="topleft"
-     left="285"
-     name="daycycle"
-     top="80"
-     width="165" />
-    <slider
+     left="10"
+     name="height_text_lbl"
+     top_delta="90"
+     width="65">
+        1 (Low)
+    </text>
+    <text
+     type="string"
+     length="1"
      follows="left|top"
      height="20"
-     increment="0.001"
-     label="Phase"
      layout="topleft"
-     left="250"
-     max_val="30"
-     min_val="6"
-     name="sun_hour_slider"
-     show_text="false"
-     top="105"
-     width="200" />
-    <button
-     enabled="false"
+     left_pad="45"
+     name="height_text_lbl2"
+     top_delta="0"
+     width="100">
+        2
+    </text>
+    <text
+     type="string"
+     length="1"
      follows="left|top"
      height="20"
-     label="Apply"
      layout="topleft"
-     left="350"
-     name="apply_btn"
-     top="135"
-     width="90" />
-    <view_border
-     bevel_style="none"
-     follows="top|left"
-     height="130"
+     left_pad="10"
+     name="height_text_lbl3"
+     top_delta="0"
+     width="100">
+        3
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
      layout="topleft"
-     left="8"
-     top="30"
-     width="460" />
+     left_pad="10"
+     name="height_text_lbl4"
+     top_delta="0"
+     width="100">
+        4 (High)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl5"
+     top_delta="30"
+     width="300">
+        Texture Elevation Ranges
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl10"
+     top_delta="30"
+     width="200"
+     word_wrap="true">
+      These values represent the blend range for the textures above.
+    </text>
+    <text
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       name="height_text_lbl11"
+       top_delta="32"
+       width="200"
+       word_wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="270"
+     name="height_text_lbl6"
+     top="250"
+     width="100">
+        Northwest
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl7"
+     top_delta="0"
+     width="100">
+        Northeast
+    </text>
+<!--  northwest low-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="Low"
+      label_width="37"
+      layout="topleft"
+      left="230"
+      max_val="500"
+      min_val="-500"
+      name="height_start_spin_1"
+      top_delta="15"
+      width="100" />  
+<!--    northeast low-->
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_3"
+       top_delta="0"
+       width="100" />
+<!--  northwest high-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="High"
+      label_width="37"
+      layout="topleft"
+      left="230"
+      max_val="500"
+      min_val="-500"
+      name="height_range_spin_1"
+      top_delta="20"
+      width="100" />
+<!--  northeast high-->
+    <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_3"
+       top_delta="0"
+       width="100" />
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="270"
+     name="height_text_lbl8"
+     top_pad="10"
+     width="100">
+        Southwest
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Southeast
+    </text>
+<!--  southwest low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left="230"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_0"
+     top_delta="15"
+     width="100" />
+<!--  southeast low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_2"
+     top_delta="0"
+     width="100" />
+<!--southwest high-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left="230"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_0"
+     top_delta="20"
+     width="100" />
+<!--  southeast high-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_2"
+     top_delta="0"
+     width="100" />
+<!-- Terrain Download/Upload/Bake buttons -->
     <button
      follows="left|top"
      height="20"
      label="Download RAW terrain..."
      layout="topleft"
-     left_delta="2"
+     left="10"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="60"
-     width="170" />
+     top="390"
+     width="160" />
     <button
      follows="left|top"
      height="20"
      label="Upload RAW terrain..."
      layout="topleft"
-     left="10"
+     left_pad="10"
+     top_delta="0"
      name="upload_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top="243"
-     width="170" />
+     width="160" />
     <button
      follows="left|top"
      height="20"
      label="Bake Terrain"
      layout="topleft"
-     left="10"
+     left_pad="10"
      name="bake_terrain_btn"
      tool_tip="Set current terrain as mid-point for raise/lower limits"
-     top="283"
+     width="100" />
+    <button
+     enabled="true"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left_delta="0"
+     name="apply_btn"
+     top="430"
      width="100" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
deleted file mode 100644
index 5d910ea659..0000000000
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="top|left"
- height="320"
- help_topic="panel_region_texture_tab"
- label="Ground Textures"
- layout="topleft"
- left="0"
- name="Textures"
- top="320"
- width="480">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_text_lbl"
-     top="10"
-     width="100">
-        Region:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_text"
-     top_delta="0"
-     width="400">
-        unknown
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="detail_texture_text"
-     top="36"
-     width="300">
-        Terrain Textures (requires 512x512, 24 bit .tga files)
-    </text>
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_delta="0"
-     name="texture_detail_0"
-     top_delta="20"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_1"
-     top_delta="0"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_2"
-     top_delta="0"
-     width="100" />
-    <texture_picker
-     follows="left|top"
-     height="100"
-     layout="topleft"
-     left_pad="10"
-     name="texture_detail_3"
-     top_delta="0"
-     width="100" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl"
-     top="146"
-     width="65">
-        1 (Low)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="45"
-     name="height_text_lbl2"
-     top_delta="0"
-     width="100">
-        2
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl3"
-     top_delta="0"
-     width="100">
-        3
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl4"
-     top_delta="0"
-     width="100">
-        4 (High)
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl5"
-     top="170"
-     width="300">
-        Texture Elevation Ranges
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl6"
-     top="185"
-     width="100">
-        Northwest
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl7"
-     top_delta="0"
-     width="100">
-        Northeast
-    </text>
-<!--  northwest low-->
-     <spinner
-      follows="left|top"
-      height="20"
-      increment="0.5"
-      label="Low"
-      label_width="37"
-      layout="topleft"
-      left="10"
-      max_val="500"
-      min_val="-500"
-      name="height_start_spin_1"
-      top_delta="15"
-      width="100" />  
-<!--    northeast low-->
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="Low"
-       label_width="37"
-       layout="topleft"
-       left_pad="10"
-       max_val="500"
-       min_val="-500"
-       name="height_start_spin_3"
-       top_delta="0"
-       width="100" />
-<!--  northwest high-->
-     <spinner
-      follows="left|top"
-      height="20"
-      increment="0.5"
-      label="High"
-      label_width="37"
-      layout="topleft"
-      left="10"
-      max_val="500"
-      min_val="-500"
-      name="height_range_spin_1"
-      top_delta="20"
-      width="100" />
-<!--  northeast high-->
-    <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="High"
-       label_width="37"
-       layout="topleft"
-       left_pad="10"
-       max_val="500"
-       min_val="-500"
-       name="height_range_spin_3"
-       top_delta="0"
-       width="100" />
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl8"
-     top_pad="10"
-     width="100">
-        Southwest
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl9"
-     top_delta="0"
-     width="100">
-        Southeast
-    </text>
-<!--  southwest low-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_0"
-     top_delta="15"
-     width="100" />
-<!--  southeast low-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Low"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_start_spin_2"
-     top_delta="0"
-     width="100" />
-<!--southwest high-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_0"
-     top_delta="20"
-     width="100" />
-<!--  southeast high-->
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="High"
-     label_width="37"
-     layout="topleft"
-     left_pad="10"
-     max_val="500"
-     min_val="-500"
-     name="height_range_spin_2"
-     top_delta="0"
-     width="100" />
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="height_text_lbl10"
-     top_delta="30"
-     width="400"
-     word_wrap="true">
-      These values represent the blend range for the textures above.
-    </text>
-    <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left_delta="0"
-       name="height_text_lbl11"
-       top_delta="32"
-       width="400"
-       word_wrap="true">
-        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
-      </text>
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     left="350"
-     name="apply_btn"
-     top="290"
-     width="100" />
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 6ef93406ec..0f330a7b98 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -142,6 +142,7 @@
     mouse_opaque="false"
     background_visible="true"
   >
+      <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" />
       <panel
         class="sidepanel_inventory"
         name="sidepanel_inventory"
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index ccae7c5350..46cbc1e87f 100644
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
@@ -7,33 +7,54 @@
  layout="topleft"
  name="device_settings_panel"
  width="360">
-	<panel.string
-	  name="default_text">
-		Default
-	</panel.string>
-	<icon
-		   height="18"
-		   image_name="Microphone_On"
-		   left_delta="4"
-		   name="microphone_icon"
-		   mouse_opaque="false"
-		   top="7"
-       layout="topleft"
-		   visible="true"
-		   width="18" />
-	<text
+    <panel.string
+      name="default_text">
+        Default
+    </panel.string>
+    <string
+     name="name_no_device">
+        No Device
+    </string>
+    <string
+     name="name_default_system_device">
+        Default System Device
+    </string>
+    <icon
+     follows="left|top"
+     height="18"
+     image_name="Microphone_On"
+     left_delta="-5"
+     name="microphone_icon"
+     mouse_opaque="false"
+     top="7"
+     layout="topleft"
+     visible="true"
+     width="18" />
+    <icon
+     follows="left|top"
+     height="18"
+     image_name="Parcel_Voice_Dark"
+     layout="topleft"
+     left_pad="220" 
+     name="speaker_icon"
+     mouse_opaque="false"
+     top_delta="0"
+     visible="true"
+     width="22" />
+    <text
      type="string"
      length="1"
-      font.style="BOLD"
+     font.style="BOLD"
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="3"
+     left_pad="-240"
+     top_delta="5"
      name="Input"
-     width="70">
-		Input
-	</text>
-	<combo_box
+     width="60">
+        Input
+    </text>
+    <combo_box
      height="23"
      control_name="VoiceInputAudioDevice"
      follows="left|top"
@@ -42,33 +63,57 @@
      max_chars="128"
      name="voice_input_device"
      top_delta="-5"
-     width="200" />
-	<text
-	  type="string"
-	  length="1"
-	  follows="left|top"
-	  height="16"
-	  layout="topleft"
-	  left_delta="-70"
-	  name="My volume label"
-	  top_pad="4"
-	  width="200">
-		My volume:
-	</text>
-	<slider_bar
-	  control_name="AudioLevelMic"
-   follows="top|right|left"
-   height="17"
-   increment="0.025"
-   initial_value="1.0"
-   layout="topleft"
-   left_delta="-6"
-   max_val="2"
-   name="mic_volume_slider"
-   tool_tip="Change the volume using this slider"
-   top_pad="-1"
-   width="220" />
-	<text
+     width="150" />
+    <text
+     font.style="BOLD"
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_pad="30"
+     name="Output"
+     top_delta="5"
+     width="60">
+        Output
+    </text>
+    <combo_box
+     control_name="VoiceOutputAudioDevice"
+     height="23"
+     follows="left|top"
+     layout="topleft"
+     left_pad="0"
+     max_chars="128"
+     name="voice_output_device"
+     top_delta="-4"
+     width="150" />
+    <text
+     type="string"
+     halign="left"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="-300"
+     name="My volume label"
+     top_pad="14"
+     width="200">
+        My volume:
+    </text>
+    <slider_bar
+     control_name="AudioLevelMic"
+     follows="top|right|left"
+     height="17"
+     increment="0.025"
+     initial_value="1.0"
+     layout="topleft"
+     left_delta="95"
+     max_val="2"
+     name="mic_volume_slider"
+     tool_tip="Change the volume using this slider"
+     top_pad="-18"
+     width="110" />
+    <text
      type="string"
      text_color="EmphasisColor"
      length="1"
@@ -79,8 +124,8 @@
      name="wait_text"
      top_delta="-1"
      width="110">
-		Please wait
-	</text>
+        Please wait
+    </text>
   <locate
      follows="right|top"
      height="20"
@@ -121,35 +166,4 @@
      name="bar4"
      top_delta="0"
      width="20" />
-	<icon
-	   height="18"
-	   image_name="Parcel_Voice_Light"
-	   left="5"
-	   name="speaker_icon"
-	   mouse_opaque="false"
-	   top_pad="3"
-	   visible="true"
-	   width="22" />
-	<text
-     font.style="BOLD"
-     type="string"
-     length="1"
-     follows="left|top"
-     height="15"
-     layout="topleft"
-     left_pad="0"
-     name="Output"
-     width="70">
-		Output
-	</text>
-	<combo_box
-     control_name="VoiceOutputAudioDevice"
-     height="23"
-     follows="left|top"
-     layout="topleft"
-     left_pad="0"
-     max_chars="128"
-     name="voice_output_device"
-     top_delta="-3"
-     width="200" />
-</panel>
+</panel>
+\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index d756dfb7de..c780cf2696 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
     </panel.string>
   <panel
     height="18"
-    left="-315"
+    left="-355"
     width="95"
     top="1"
     follows="right|top" 
@@ -77,19 +77,39 @@
      top="0"
      width="55" />
   </panel>
+  <combo_box
+    follows="right|top"   
+    drop_down_button.pad_left="10" 
+    left_pad="5"
+    top="0"
+    width="120"
+    height="20"
+    pad_left="5"
+    name="mode_combo"
+    tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+    >
+    <combo_box.item
+      label="Basic Mode"
+      name="Basic"
+      value="settings_minimal.xml" />
+    <combo_box.item
+      label="Advanced Mode"
+      name="Advanced"
+      value="" />
+  </combo_box>
     <text
+      left_pad="5"
      type="string"
      font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
      follows="right|top"
-     halign="right"
+     halign="center"
      height="16"
      top="5"
      layout="topleft"
-     left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="145">
+     width="75">
         24:00 AM PST
     </text>
     <button
@@ -100,7 +120,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="15"
+     left_pad="10"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index 30d3064e14..79f29777ce 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -88,6 +88,16 @@
     visible="false"
     width="14"
     />
+  <icon
+    follows="right|top"
+    height="13"
+    image_name="Parcel_SeeAVsOff_Light"
+    left="2"
+    name="see_avatars_icon"
+    top="3"
+    visible="false"
+    width="14"
+    />
   <text
     follows="right|top"
     font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 8997c1a6d7..79a0ec7c72 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -9,7 +9,7 @@
 	  min_width="240"
 	  name="objects panel"
 	  width="333">
-	 <panel
+    <panel
 		 follows="all"
 		 layout="topleft"
 		 left="0"
@@ -19,24 +19,226 @@
 		 height="570"
 		 visible="true"
 		 width="330">
-		<panel
-			 class="panel_main_inventory"
-			 filename="panel_main_inventory.xml"
-			 follows="all"
-			 layout="topleft"
-			 left="0"
-			 name="panel_main_inventory"
-			 top="0"
-			 label=""
-			 height="545"
-			 width="330" />
+         <layout_stack
+              follows="left|right|top|bottom"
+              layout="topleft"
+              left="0"
+              top="0"
+              orientation="vertical"
+              name="inventory_layout_stack"
+              height="535"
+              width="330">
+             <layout_panel
+                 name="main_inventory_layout_panel"
+                 min_dim="150"
+                 width="330"
+                 follows="bottom|left|right"
+                 user_resize="false"
+                 height="480">
+                 <panel
+                      class="panel_main_inventory"
+                      filename="panel_main_inventory.xml"
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="panel_main_inventory"
+                      top="0"
+                      label=""
+                      height="480"
+                      width="330" />
+             </layout_panel>
+             <layout_panel
+                 width="330"
+                 auto_resize="true"
+                 user_resize="false"
+                 follows="bottom|left|right"
+                 name="inbox_layout_panel"
+                 visible="false"
+                 min_dim="35"
+                 max_dim="200"
+                 expanded_min_dim="90"
+                 height="200">
+                 <panel
+                      follows="all"
+                      layout="topleft"
+                      left="0"
+                      name="marketplace_inbox"
+                      class="panel_marketplace_inbox"
+                      top="0"
+                      label=""
+                      height="200"
+                      width="330">
+                     <string name="InboxLabelWithArg">Received Items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received Items</string>
+                     <button
+                        label="Received Items"
+                        name="inbox_btn"
+                        height="35"
+                        width="308"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        halign="left"
+                        handle_right_mouse="false"
+                        follows="top|left|right"
+                        is_toggle="true"
+                        tab_stop="false"
+                        pad_left="35"
+                        top="0"
+                        left="10" />
+                     <text
+                        type="string"
+                        length="1"
+                        follows="right|top"
+                        layout="topleft"
+                        height="13"
+                        top="10"
+                        right="-20"
+                        name="inbox_fresh_new_count"
+                        font="SansSerifMedium"
+                        halign="right"
+                        text_color="EmphasisColor"
+                        top_pad="0"
+                        width="300">
+                        [NUM] New
+                     </text>
+                     <panel
+                        follows="all"
+                        left="10"
+                        bottom="200"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items to your inventory to manage and use them"
+                        >
+                        <text
+							name="inbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Purchases from the marketplace will be delivered here.
+						</text>
+                    </panel>
+                 </panel>
+             </layout_panel>
+             <layout_panel
+                width="330"
+                auto_resize="true"
+                user_resize="false"
+                follows="bottom|left|right"
+                name="outbox_layout_panel"
+                visible="false"
+                min_dim="35"
+                max_dim="200"
+                expanded_min_dim="90"
+                height="200">
+                 <panel
+                      follows="all"
+                      layout="topleft"
+                      left="10"
+                      name="marketplace_outbox"
+                      class="panel_marketplace_outbox"
+                      top="0"
+                      label=""
+                      height="200"
+                      width="310">
+                     <button
+                        label="Merchant Outbox"
+                        is_toggle="true"
+                        handle_right_mouse="false"
+                        name="outbox_btn"
+                        follows="top|left|right"
+                        image_unselected="MarketplaceBtn_Off"
+                        image_selected="MarketplaceBtn_Selected"
+                        height="35"
+                        tab_stop="false"
+                        width="308"
+                        halign="left"
+                        pad_left="35"
+                        top="0"
+                        left="0" />
+                     <button
+                         image_unselected="OutboxPush_Off"
+                         image_selected="OutboxPush_Selected"
+                         image_hover_selected="OutboxPush_Selected_Over"
+                         image_hover_unselected="OutboxPush_Over"
+                         image_disabled_selected="OutboxPush_Selected_Disabled"
+                         image_disabled="OutboxPush_Disabled"
+                         image_pressed="OutboxPush_Press"
+                         image_pressed_selected="OutboxPush_Selected_Press"
+                         label=""
+                         tool_tip="Push to my Marketplace Storefront"
+                         is_toggle="false"
+                         name="outbox_sync_btn"
+                         follows="top|right"
+                         tab_stop="false"
+                         halign="center"
+                         top="6"
+                         left="-50"
+                         height="23"
+                         width="32"
+                         enabled="false" />
+                     <loading_indicator
+                        follows="top|right"
+                        name="outbox_sync_indicator"
+                        top="6"
+                        left="-50"
+                        height="23"
+                        width="32"
+                        images_per_sec="1.15"
+                        tab_stop="false"
+                        visible="false">
+                         <images>
+                             <image name="OutboxPush_Progress_1"/>
+                             <image name="OutboxPush_Progress_2"/>
+                             <image name="OutboxPush_Progress_3"/>
+                             <image name="OutboxPush_Progress_4"/>
+                             <image name="OutboxPush_Progress_5"/>
+                             <image name="OutboxPush_Progress_6"/>
+                         </images>
+                     </loading_indicator>
+                     <panel
+                        follows="all"
+                        left="10"
+                        bottom="200"
+                        width="308"
+                        top="35"
+                        bg_opaque_color="InventoryBackgroundColor"
+                        background_visible="true"
+                        background_opaque="true"
+                        tool_tip="Drag and drop items here to prepare them for sale on your storefront"
+                        >
+                        <text
+							name="outbox_inventory_placeholder"
+							type="string"
+							follows="all"
+							layout="topleft"
+							top="0"
+							left="0"
+							width="308"
+							height="165"
+							wrap="true"
+							halign="center">
+							Set up your merchant account to use this feature.
+						</text>
+                    </panel>
+                 </panel>
+             </layout_panel>
+         </layout_stack>
 		<panel
 		     follows="bottom|left|right"
-			 height="25"
+			 height="30"
 			 layout="topleft"
 			 name="button_panel"
 			 left="9"
-			 top_pad="-2"
+             top_pad="7"
 			 width="308">
 			<layout_stack
      	         follows="bottom|left|right"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 71f48c833d..2094275bed 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -18,6 +18,7 @@
 	<string name="StartupClearingCache">Clearing cache...</string>
 	<string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
 	<string name="StartupInitializingVFS">Initializing VFS...</string>
+  <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string>
 
 	<!--  progress -->
 	<string name="ProgressRestoring">Restoring...</string>
@@ -43,6 +44,8 @@
 	<string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
 	<string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
 	<string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>
+	<string name="LoginRequestSeedCapGrant">Requesting region capabilities...</string>
+	<string name="LoginRetrySeedCapGrant">Requesting region capabilities, attempt [NUMBER]...</string>
 	<string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
 	<string name="LoginConnectingToRegion">Connecting to region...</string>
 	<string name="LoginDownloadingClothing">Downloading clothing...</string>
@@ -1759,10 +1762,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
 	</string>
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
-list llGetParcelDetails(vector pos, list params)
-Returns the parcel details specified in params for the parcel at pos.
-Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA
-	</string>
+    list llGetParcelDetails(vector pos, list params)
+    Returns the parcel details specified in params for the parcel at pos.
+    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
+  </string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
@@ -2021,6 +2024,8 @@ Returns a string with the requested data about the region
 	<string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string>
 	<string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
+	<string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string>
+	<string name="InventoryOutboxNoItems">Drag items here in preparation for listing on your marketplace storefront.</string>
     <!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
@@ -2067,7 +2072,6 @@ Returns a string with the requested data about the region
 
 	<!-- inventory folder -->
 	<string name="InvFolder My Inventory">My Inventory</string>
-	<string name="InvFolder My Favorites">My Favorites</string>
 	<string name="InvFolder Library">Library</string>
 	<string name="InvFolder Textures">Textures</string>
 	<string name="InvFolder Sounds">Sounds</string>
@@ -2087,10 +2091,10 @@ Returns a string with the requested data about the region
 	<string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string>
 	<string name="InvFolder Animations">Animations</string>
 	<string name="InvFolder Gestures">Gestures</string>
-	<string name="InvFolder Favorite">Favorites</string>
+	<string name="InvFolder Favorite">My Favorites</string>
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
   We should localize both of them with the same value -->
-	<string name="InvFolder favorite">Favorites</string>
+	<string name="InvFolder favorite">My Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
@@ -2236,6 +2240,7 @@ Returns a string with the requested data about the region
 	<string name="Unknown">(Unknown)</string>
 	<string name="SummaryForTheWeek"    value="Summary for this week, beginning on " />
 	<string name="NextStipendDay"       value="The next stipend day is " />
+	<string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string>
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
 	<string name="GroupColumn"          value="                      Group" />
 	<string name="Balance">Balance</string>
@@ -2250,6 +2255,9 @@ Returns a string with the requested data about the region
 	<string name="IMMainland">mainland</string>
 	<string name="IMTeen">teen</string>
 
+    <!-- floater about land -->
+    <string name="Anyone">anyone</string>
+
 	<!-- floater region info -->
 	<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
 	<string name="RegionInfoError">error</string>
@@ -2352,6 +2360,10 @@ Returns a string with the requested data about the region
 	<string name="GroupOwned">Group Owned</string>
 	<string name="Public">Public</string>
 
+	<!-- Environment settings -->
+	<string name="LocalSettings">Local Settings</string>
+	<string name="RegionSettings">Region Settings</string>
+
 	<!-- panel classified -->
 	<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
 	<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>
@@ -2385,6 +2397,7 @@ Returns a string with the requested data about the region
 	<string name="GroupMoneyBalance">Balance</string>
 	<string name="GroupMoneyCredits">Credits</string>
 	<string name="GroupMoneyDebits">Debits</string>
+	<string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string>
 
 	<!-- viewer object -->
 	<string name="ViewerObjectContents">Contents</string>
@@ -3133,6 +3146,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
+  <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
@@ -3400,6 +3414,34 @@ Abuse Report</string>
   <string name="Female - Stick tougue out">Female - Stick tougue out</string>
   <string name="Female - Wow">Female - Wow</string>
 
+  <string name="/bow1">/bow1</string>
+  <string name="/clap">/clap</string>
+  <string name="/count">/count</string>
+  <string name="/extinguish">/extinguish</string>
+  <string name="/kmb">/kmb</string>
+  <string name="/muscle">/muscle</string>
+  <string name="/no">/no</string>
+  <string name="/no!">/no!</string>
+  <string name="/paper">/paper</string>
+  <string name="/pointme">/pointme</string>
+  <string name="/pointyou">/pointyou</string>
+  <string name="/rock">/rock</string>
+  <string name="/scissor">/scissor</string>
+  <string name="/smoke">/smoke</string>
+  <string name="/stretch">/stretch</string>
+  <string name="/whistle">/whistle</string>
+  <string name="/yes">/yes</string>
+  <string name="/yes!">/yes!</string>
+  <string name="afk">afk</string>
+  <string name="dance1">dance1</string>
+  <string name="dance2">dance2</string>
+  <string name="dance3">dance3</string>
+  <string name="dance4">dance4</string>
+  <string name="dance5">dance5</string>
+  <string name="dance6">dance6</string>
+  <string name="dance7">dance7</string>
+  <string name="dance8">dance8</string>
+
   <!-- birth date format shared by avatar inspector and profile panels -->
   <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
   
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
new file mode 100644
index 0000000000..2d4c02b092
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Additional attributes:
+   -->
+<badge border_image="Badge_Border"
+       border_color="BadgeBorderColor"
+       font="SansSerifSmall"
+       image="Badge_Background"
+       image_color="BadgeImageColor"
+       label_color="BadgeLabelColor"
+       label_offset_horiz="0"
+       label_offset_vert="0"
+       location="top_left"
+       location_percent_hcenter="85"
+       location_percent_vcenter="85"
+       padding_horiz="7"
+       padding_vert="4"
+       requests_front="true"
+       mouse_opaque="false"
+       >
+</badge>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 16241ed84e..302014eb24 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -25,5 +25,6 @@
         pad_bottom="3" 
         height="23"
         scale_image="true"
+        handle_right_mouse="true"
         use_draw_context_alpha="true">
 </button>
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index d1f68a9ef9..82d620d1e6 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -16,6 +16,9 @@
                               font="SansSerifSmall"
                               scale_image="true"
                               pad_right="24"
+                              halign="left"
+                              tab_stop="true"
+                              follows="all"
                               image_unselected="DropDown_Off"
                               image_selected="DropDown_On"
                               image_pressed="DropDown_Press" 
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
new file mode 100644
index 0000000000..95f5cf2ecd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_folder_view_folder
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="20" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  >
+	<new_badge 
+        label="New" 
+        label_offset_horiz="-1"
+        location="right" 
+        padding_horiz="4" 
+        padding_vert="1" 
+        location_percent_hcenter="70"
+        border_image=""
+        image="Badge_Background_New"
+        />
+</inbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
new file mode 100644
index 0000000000..830c27bdac
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<inbox_inventory_panel show_load_status="false" />
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index 93875d66e6..00f4c43915 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -3,4 +3,12 @@
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
   background_opaque="true"
-  />
+  show_load_status="true"
+  >
+    <scroll
+		name="Inventory Scroller"
+        follows="all"
+		reserve_scroll_corner="true"
+        tab_stop="true"
+        />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 37d60f1671..44436fb6f2 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -123,6 +123,14 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
+  <see_avatars_icon
+    name="see_avatars_icon"
+    width="22"
+    height="18"
+    top="21"
+    follows="right|top"
+    image_name="Parcel_SeeAVsOff_Light"
+    />
   <combo_button
 		name="Location History"
                 label=""
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
index 9bf99fa363..47a210d9b7 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel.xml
@@ -10,4 +10,5 @@
        bg_alpha_image_overlay="White"
        background_visible="false"
        background_opaque="false"
-       chrome="false"/>
-\ No newline at end of file
+       chrome="false"
+       accepts_badge="true"/>
+\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml
new file mode 100644
index 0000000000..b5bdd564a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/time.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<time text_enabled_color="LabelTextColor"
+         text_disabled_color="LabelDisabledColor"
+         font="SansSerifSmall"
+         label_width="40" >
+  <time.up_button name="SpinCtrl Up"
+                     image_unselected="Stepper_Up_Off"
+                     image_selected="Stepper_Up_Press"
+                     tab_stop="false"
+                     follows="left|bottom" />
+  <time.down_button name="SpinCtrl Down"
+                       image_unselected="Stepper_Down_Off"
+                       image_selected="Stepper_Down_Press"
+                       tab_stop="false"
+                       follows="left|bottom" />
+</time>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 1c4b965f46..83749fc535 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -133,12 +133,12 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 				0
 			</text>
 			<button label="Comprar terreno" left="130" name="Buy Land..." width="125"/>
+			<button label="Venta Linden" name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
 			<button label="Información de scripts" name="Scripts..."/>
 			<button label="Comprar para el grupo" name="Buy For Group..."/>
 			<button label="Comprar un pase" left="130" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno." width="125"/>
 			<button label="Abandonar el terreno" name="Abandon Land..."/>
 			<button label="Reclamar el terreno" name="Reclaim Land..."/>
-			<button label="Venta Linden" name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
 		</panel>
 		<panel label="CONTRATO" name="land_covenant_panel">
 			<panel.string name="can_resell">
@@ -308,6 +308,9 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 			<panel.string name="push_restrict_region_text">
 				Sin &apos;empujones&apos; (prevalece lo marcado en la región)
 			</panel.string>
+			<panel.string name="see_avs_text">
+				Ver a los residentes de esta parcela y chatear con ellos
+			</panel.string>
 			<text name="allow_label">
 				Permitir a otros Residentes:
 			</text>
@@ -370,6 +373,10 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Pulse para elegir una imagen"/>
+			<text name="allow_label5">
+				Permitir a los residentes de otras parcelas:
+			</text>
+			<check_box label="Ver los avatares" name="SeeAvatarsCheck" tool_tip="Permite que los residentes de otras parcelas vean a los residentes de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos."/>
 			<text name="landing_point">
 				Punto de llegada: [LANDING]
 			</text>
@@ -429,6 +436,11 @@ los media:
 				Sonido:
 			</text>
 			<check_box label="Restringir sonidos de objetos y gestos a esta parcela" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				Sonidos de avatar:
+			</text>
+			<check_box label="Todos" name="all av sound check"/>
+			<check_box label="Grupo" name="group av sound check"/>
 			<text name="Voice settings:">
 				Voz:
 			</text>
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index 9d63abd73c..a3e656cc17 100644
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPCIONES DE LA CUADRÍCULA">
-	<spinner label="Unidad de la cuadrícula (metros)" label_width="192" name="GridResolution" width="250"/>
-	<spinner label="Alcance de la cuadrícula (metros)" label_width="192" name="GridDrawSize" width="250"/>
+	<floater.string name="grid_screen_text">
+		Pantalla
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Local
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Mundo
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Referencia
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Adjunto
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacidad de la cuadrícula">
+		Modo
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto">
+		<combo_box.item label="Mundo" name="World"/>
+		<combo_box.item label="Local" name="Local"/>
+		<combo_box.item label="Referencia" name="Reference"/>
+	</combo_box>
+	<spinner label="Unidades (metros)" label_width="192" name="GridResolution" width="250"/>
+	<spinner label="Extensión (metros)" label_width="192" name="GridDrawSize" width="250"/>
 	<check_box label="Activar subunidades" name="GridSubUnit"/>
 	<check_box label="Ver la sección transversal" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacidad de la cuadrícula">
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
deleted file mode 100644
index 9c3ac1be0e..0000000000
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITOR DEL CICLO DE UN DÍA">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo de un día" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				12 am
-			</text>
-			<text name="WL3am">
-				3 am
-			</text>
-			<text name="WL6am">
-				6 am
-			</text>
-			<text name="WL9amHash">
-				9 am
-			</text>
-			<text name="WL12pmHash">
-				12 pm
-			</text>
-			<text name="WL3pm">
-				3 pm
-			</text>
-			<text name="WL6pm">
-				6 pm
-			</text>
-			<text name="WL9pm">
-				9 pm
-			</text>
-			<text name="WL12am2">
-				12 am
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
-			<button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Configuración del fotograma clave:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Hora clave:
-			</text>
-			<spinner label="Hora" name="WLCurKeyHour"/>
-			<spinner label="Min." name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Modelo predefinido:
-			</text>
-			<combo_box label="Predefinido" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Intervalo:
-			</text>
-			<combo_box label="5 min." name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Duración del ciclo:
-			</text>
-			<spinner label="Hora" name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Seg." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Vista previa:
-			</text>
-			<button label="Probar" label_selected="Probar" name="WLAnimSky"/>
-			<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
-			<button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
-			<button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
-			<button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..5e7df8530e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="ELIMINAR EL ENV PREDEFINIDO">
+	<string name="title_water">
+		Eliminar el agua predefinida
+	</string>
+	<string name="title_sky">
+		Eliminar cielo predefinido
+	</string>
+	<string name="title_day_cycle">
+		Eliminar ciclo del día
+	</string>
+	<string name="label_water">
+		Predefinido:
+	</string>
+	<string name="label_sky">
+		Predefinido:
+	</string>
+	<string name="label_day_cycle">
+		Ciclo del día:
+	</string>
+	<string name="msg_confirm_deletion">
+		¿Estás seguro de que quieres eliminar el valor predefinido seleccionado?
+	</string>
+	<string name="msg_sky_is_referenced">
+		No se puede quitar un valor predefinido al que se hace referencia en otro u otros ciclos del día.
+	</string>
+	<string name="combo_label">
+		-Selecciona un valor predefinido-
+	</string>
+	<text name="label">
+		Predefinido:
+	</text>
+	<button label="Borrar" name="delete"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..6ac46351db
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="Editar ciclo del día">
+	<string name="title_new">
+		Crear un ciclo del día nuevo
+	</string>
+	<string name="title_edit">
+		Editar ciclo del día
+	</string>
+	<string name="hint_new">
+		Asigna un nombre al ciclo del día, ajusta los controles para crearlo y selecciona &quot;Guardar&quot;.
+	</string>
+	<string name="hint_edit">
+		Para editar el ciclo del día, ajusta los controles siguientes y selecciona &quot;Guardar&quot;.
+	</string>
+	<string name="combo_label">
+		-Selecciona un valor predefinido-
+	</string>
+	<text name="label">
+		Nombre predefinido:
+	</text>
+	<text name="note">
+		Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará.
+	</text>
+	<text name="hint_item1">
+		- Pulsa en una pestaña para editar la configuración y el tiempo de un cielo determinado.
+	</text>
+	<text name="hint_item2">
+		- Pulsa y arrastra las pestañas para ajustar los tiempos de transición.
+	</text>
+	<text name="hint_item3">
+		- Usa el depurador para obtener una vista previa del ciclo del día.
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="Añadir clave" label_selected="Añadir clave" name="WLAddKey"/>
+		<button label="Eliminar clave" label_selected="Eliminar clave" name="WLDeleteKey"/>
+		<text name="WL12am">
+			12 AM
+		</text>
+		<text name="WL3am">
+			3 AM
+		</text>
+		<text name="WL6am">
+			6 AM
+		</text>
+		<text name="WL9amHash">
+			9 AM
+		</text>
+		<text name="WL12pmHash">
+			12 PM
+		</text>
+		<text name="WL3pm">
+			3 PM
+		</text>
+		<text name="WL6pm">
+			6 PM
+		</text>
+		<text name="WL9pm">
+			9 PM
+		</text>
+		<text name="WL12am2">
+			12 AM
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		Configuración del cielo:
+	</text>
+	<combo_box label="Predefinido" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		Hora:
+	</text>
+	<time name="time" value="6 AM"/>
+	<check_box label="Convertir en mi nuevo ciclo del día" name="make_default_cb"/>
+	<button label="Guardar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..d2197b80fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="Editar cielo predefinido">
+	<string name="title_new">
+		Crear un nuevo cielo predefinido
+	</string>
+	<string name="title_edit">
+		Editar cielo predefinido
+	</string>
+	<string name="hint_new">
+		Asigna un nombre al valor predefinido, ajusta los controles para crearlo y selecciona &quot;Guardar&quot;.
+	</string>
+	<string name="hint_edit">
+		Para editar el cielo predefinido, ajusta los controles y selecciona &quot;Guardar&quot;.
+	</string>
+	<string name="combo_label">
+		-Selecciona un valor predefinido-
+	</string>
+	<text name="hint">
+		Para editar el valor predefinido, ajusta los controles y selecciona &quot;Guardar&quot;.
+	</text>
+	<text name="label">
+		Nombre predefinido:
+	</text>
+	<text name="note">
+		Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará.
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="ATMÓSFERA" name="Atmosphere">
+			<text name="BHText">
+				Horizonte azul
+			</text>
+			<text name="BDensText">
+				Cantidad de bruma
+			</text>
+			<text name="BDensText2">
+				Saturación
+			</text>
+			<text name="HDText">
+				Densidad de la bruma
+			</text>
+			<text name="DensMultText">
+				Densidad
+			</text>
+			<text name="WLDistanceMultText">
+				Distancia
+			</text>
+			<text name="MaxAltText">
+				Altitud máx.
+			</text>
+		</panel>
+		<panel label="LUZ" name="Lighting">
+			<text name="SLCText">
+				Color del sol y de la luna
+			</text>
+			<text name="WLAmbientText">
+				Ambiental
+			</text>
+			<text name="SunGlowText">
+				Resplandor del sol
+			</text>
+			<slider label="Visión" name="WLGlowB"/>
+			<slider label="Tamaño" name="WLGlowR"/>
+			<text name="WLStarText">
+				Brillo de las estrellas
+			</text>
+			<text name="SceneGammaText">
+				Gamma de la escena
+			</text>
+			<text name="TODText">
+				Posición del sol y la luna
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				12 AM
+			</text>
+			<text name="WL6am">
+				6 AM
+			</text>
+			<text name="WL12pmHash">
+				12 PM
+			</text>
+			<text name="WL6pm">
+				6 PM
+			</text>
+			<text name="WL12am2">
+				12 AM
+			</text>
+			<time name="WLDayTime" value="6:00 AM"/>
+			<text name="WLEastAngleText">
+				Ángulo de elevación
+			</text>
+		</panel>
+		<panel label="NUBES" name="Clouds">
+			<text name="WLCloudColorText">
+				Color de las nubes
+			</text>
+			<text name="WLCloudColorText2">
+				Posición/Densidad de las nubes
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				Nubosidad
+			</text>
+			<text name="WLCloudScaleText">
+				Altitud de las nubes
+			</text>
+			<text name="WLCloudDetailText">
+				Detalle de las nubes (Posición/Densidad)
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				Velocidad de las nubes: X
+			</text>
+			<check_box label="Lock" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				Velocidad de las nubes: Y
+			</text>
+			<check_box label="Lock" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="Convertir este valor predefinido en mi nueva configuración de cielo" name="make_default_cb"/>
+	<button label="Guardar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..f90ad59f78
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="Editar el agua predefinida">
+	<string name="title_new">
+		Crear una nueva agua predefinida
+	</string>
+	<string name="title_edit">
+		Editar el agua predefinida
+	</string>
+	<string name="hint_new">
+		Asigna un nombre al valor predefinido, ajusta los controles para crearlo y selecciona &quot;Guardar&quot;.
+	</string>
+	<string name="hint_edit">
+		Para editar el agua predefinida, ajusta los controles y selecciona &quot;Guardar&quot;.
+	</string>
+	<string name="combo_label">
+		-Selecciona un valor predefinido-
+	</string>
+	<text name="hint">
+		Para editar el valor predefinido, ajusta los controles y selecciona &quot;Guardar&quot;.
+	</text>
+	<text name="label">
+		Nombre predefinido:
+	</text>
+	<text name="note">
+		Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará.
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			Color del agua
+		</text>
+		<text name="water_fog_density_label">
+			Transparencia
+		</text>
+		<text name="underwater_fog_modifier_label">
+			Modificar la claridad del agua
+		</text>
+		<text name="BHText">
+			Sentido de las olas grandes
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			Tamaño de las ondulaciones
+		</text>
+		<text name="HDText">
+			Escala de Fresnel
+		</text>
+		<text name="FresnelOffsetText">
+			Coeficiente de reflexión
+		</text>
+		<text name="BHText2">
+			Sentido de las olas pequeñas
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			Refracción de la superficie
+		</text>
+		<text name="WaterScaleBelowText">
+			Refracción bajo la superficie
+		</text>
+		<text name="MaxAltText">
+			Desenfoque
+		</text>
+		<text name="BHText3">
+			Vista Normal
+		</text>
+	</panel>
+	<check_box label="Convertir este valor predefinido en mi nueva configuración de agua" name="make_default_cb"/>
+	<button label="Guardar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml
deleted file mode 100644
index 195690f546..0000000000
--- a/indra/newview/skins/default/xui/es/floater_env_settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDITOR DEL ENTORNO">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Duración de
-un día
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Nubosidad
-	</text>
-	<text name="EnvWaterColorText">
-		Color del
-agua
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el selector de color"/>
-	<text name="EnvWaterFogText">
-		Claridad del
-agua
-	</text>
-	<button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/>
-	<button label="Cielo avanzado" left="167" name="EnvAdvancedSkyButton" width="155"/>
-	<button label="Agua avanzada" left="326" name="EnvAdvancedWaterButton" width="155"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
new file mode 100644
index 0000000000..a9c5705d52
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="CONFIGURACIÓN DE ENTORNO">
+	<text name="note">
+		Puedes personalizar la configuración del entorno de tu visor con las opciones siguientes.
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Usar configuración de región" name="use_region_settings"/>
+		<radio_item label="Personalizar mi entorno" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			Nota: La configuración personalizada no estará visible para otros usuarios.
+		</text>
+		<text name="water_settings_title">
+			Configuración de agua
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Cielo/Ciclo del día
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Cielo invariable" name="my_sky_settings"/>
+			<radio_item label="Ciclo del día" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="OK" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
index 6208db75f9..36f988b25f 100644
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -3,6 +3,9 @@
 	<string name="status_idle">
 		Inactivo
 	</string>
+	<string name="status_parse_error">
+		Problema de análisis de DAE - consulta los datos en el registro.
+	</string>
 	<string name="status_reading_file">
 		Cargando...
 	</string>
@@ -12,6 +15,9 @@
 	<string name="status_vertex_number_overflow">
 		Error: El número de intersección es superior a 65534. Cancelado.
 	</string>
+	<string name="bad_element">
+		Error: el elemento no es válido
+	</string>
 	<string name="high">
 		Alto
 	</string>
@@ -54,6 +60,9 @@
 	<string name="simplifying">
 		Simplificando...
 	</string>
+	<string name="tbd">
+		TBD
+	</string>
 	<text name="name_label">
 		Nombre:
 	</text>
@@ -74,23 +83,26 @@
 			Nivel de detalle: Mínimo
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Coste de recursos: [COSTE]
-		</text>
-		<text name="physics cost">
-			Coste físico: [COSTE]
-		</text>
-		<text name="upload fee">
-			Cuota de carga: N/A
-		</text>
-	</panel>
-	<text name="status">
-		[ESTADO]
+	<text name="warning_title">
+		ATENCIÓN:
+	</text>
+	<text name="warning_message">
+		No podrás terminar de subir este modelo a los servidores de Second Life. [[VURL] Averigua cómo] puedes obtener autorización para subir modelos de malla.
+	</text>
+	<text name="weights_text">
+		Descargar:
+Física:
+Servidor:
+
+Equiv. en prims:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Valores predeterminados" name="reset_btn" tool_tip="Restablecer valores predeterminados"/>
-	<button label="Subir" name="ok_btn" tool_tip="Cargar al simulador"/>
-	<button label="Cancelar" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Nivel de detalle" name="lod_panel">
 			<text name="lod_table_header">
@@ -228,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Precio de subida: L$ [FEE]
+	</text>
+	<button label="Establecer en valores predeterminados" name="reset_btn" tool_tip="Establecer en valores predeterminados"/>
+	<button label="Calcular pesos y precio" name="calculate_btn" tool_tip="Calcular pesos y precio"/>
+	<button label="Subir" name="ok_btn" tool_tip="Cargar al simulador"/>
+	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_model_wizard.xml b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
index 019c2d3829..86de557ed9 100644
--- a/indra/newview/skins/default/xui/es/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
@@ -2,190 +2,216 @@
 <floater name="Model Wizard" title="CARGAR ASISTENTE DE MODELO">
 	<button label="5. Subir" name="upload_btn"/>
 	<button label="4. Revisar" name="review_btn"/>
-	<button label="3. Física" name="physics2_btn"/>
 	<button label="3. Física" name="physics_btn"/>
 	<button label="2. Optimizar" name="optimize_btn"/>
 	<button label="1. Seleccionar archivo" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Cargar modelo
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Elige el archivo de modelo
 			</text>
 		</panel>
-		<text name="description">
-			Este asistente te ayudará a importar modelos de redes en Second Life.  En primer lugar, especifica un archivo que contenga el modelo que desees importar.  Second Life es compatible con los archivos de COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nombre del archivo:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Usuarios avanzados: si tienes experiencia con las herramientas de creación de contenidos 3D, quizá te interese utilizar la función de subida avanzada.
+			</text>
+			<button label="Cambiar al modo Avanzado" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Elige el archivo de modelo que deseas subir
+			</text>
+			<button label="Buscar..." label_selected="Buscar..." name="browse"/>
+			<text name="support_collada_text">
+				‎Second Life admite los archivos COLLADA (.dae)
+			</text>
+			<text name="dimensions_label">
+				Dimensiones (metros):
 			</text>
-			<button label="Examinar..." label_selected="Examinar..." name="browse"/>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				ATENCIÓN:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				No podrás completar el paso final de la subida de este modelo a los servidores de Second Life. [secondlife:///app/floater/learn_more Averigua cómo] configurar tu cuenta para subir modelos de malla.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimizar
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Optimizar el modelo
 			</text>
 		</panel>
-		<text name="description">
-			Este asistente ha optimizado tu modelo con el fin de mejorar el rendimiento. Puedes ajustar los resultados del proceso de optimización a continuación o hacer clic en Siguiente para continuar.
+		<text name="optimize_hint">
+			Hemos optimizado el rendimiento del modelo, pero puedes ajustarlo más si lo deseas.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Generando el nivel de detalle
+			</text>
 			<text name="high_detail_text">
-				Generar nivel de detalle: Alto
+				Generar el nivel de detalle: Alto
 			</text>
 			<text name="medium_detail_text">
-				Generar nivel de detalle: Media
+				Generar el nivel de detalle: Medio
 			</text>
 			<text name="low_detail_text">
-				Generar nivel de detalle: Bajo
+				Generar el nivel de detalle: Bajo
 			</text>
 			<text name="lowest_detail_text">
-				Generar nivel de detalle: Mínimo
+				Generar el nivel de detalle: Mínimo
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Vista previa de modelo:
+			<text name="optimize_performance_text">
+				Rendimiento
+			</text>
+			<text name="optimize_faster_rendering_text">
+				Renderizado más rápido
+Menos detalles
+Menos peso de prim
+			</text>
+			<text name="optimize_accuracy_text">
+				Precisión
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Renderizado más lento
+Más detalles
+Más peso de prim
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Nivel de detalle disponible en la vista previa">
-				<combo_item name="high">
-					Alto
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Recalcular la geometría" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Vista previa de geometría
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="LOD para ver en renderizado de prueba">
+				<combo_item name="preview_lod_high">
+					Detalle alto
 				</combo_item>
-				<combo_item name="medium">
-					Media
+				<combo_item name="preview_lod_medium">
+					Detalles medios
 				</combo_item>
-				<combo_item name="low">
-					Bajo
+				<combo_item name="preview_lod_low">
+					Detalle bajo
 				</combo_item>
-				<combo_item name="lowest">
-					Mínimo
+				<combo_item name="preview_lod_lowest">
+					Detalles mínimos
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Coste de recursos:    [COSTE]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Ajustar la física
 			</text>
 		</panel>
-		<text name="description">
-			El asistente creará una forma física, que determinará la manera en la que el objeto interactúa con otros objetos y avatares. Selecciona con el controlador deslizante el nivel de detalle más adecuado en función del uso del objeto:
+		<text name="physics_hint">
+			Crearemos una forma para la apariencia exterior del modelo. Ajusta el nivel de detalle de la forma según se necesite para el propósito proyectado del modelo.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Coste de recursos:       [COSTE]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Rendimiento
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+			<text name="physics_faster_rendering_text">
+				Renderizado más rápido
+Menos detalles
+Menos peso de prim
 			</text>
-		</panel>
-		<text name="description">
-			Obtén una vista previa de la forma física a continuación y haz clic en Siguiente para continuar.  Para modificar la forma física, haz clic en el botón Atrás.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Vista previa de modelo:
+			<text name="physics_accuracy_text">
+				Precisión
+			</text>
+			<text name="physics_slower_dendering_text">
+				Renderizado más lento
+Más detalles
+Más peso de prim
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Nivel de detalle disponible en la vista previa">
-				<combo_item name="high">
-					Alto
+			<text name="physics_example_1">
+				Ejemplos:
+Objetos en movimiento
+Objetos voladores
+Vehículos
+			</text>
+			<text name="physics_example_2">
+				Ejemplos:
+Objetos estáticos pequeños
+Objetos con menos detalles
+Muebles sencillos
+			</text>
+			<text name="physics_example_3">
+				Ejemplos:
+Objetos estáticos
+Objetos con detalles
+Edificios
+			</text>
+			<button label="Recalcular física" name="recalculate_physics_btn"/>
+			<button label="Recalculando..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Prueba de física
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="LOD para ver en renderizado de prueba">
+				<combo_item name="preview_lod2_high">
+					Detalle alto
 				</combo_item>
-				<combo_item name="medium">
-					Media
+				<combo_item name="preview_lod2_medium">
+					Detalles medios
 				</combo_item>
-				<combo_item name="low">
-					Bajo
+				<combo_item name="preview_lod2_low">
+					Detalle bajo
 				</combo_item>
-				<combo_item name="lowest">
-					Mínimo
+				<combo_item name="preview_lod2_lowest">
+					Detalles mínimos
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Coste de recursos:       [COSTE]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Revisar
 			</text>
 		</panel>
-		<text name="description">
-			Revisa los detalles que aparecen más abajo y, a continuación, haz clic. Selecciona la opción de carga para cargar el modelo. Se realizará el cargo en tu saldo de L$ cuando hagas clic en Cargar.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Vista previa de modelo:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impacto en la parcela/región: [EQUIV] equivalentes en prim
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Nivel de detalle disponible en la vista previa">
-				<combo_item name="high">
-					Alto
-				</combo_item>
-				<combo_item name="medium">
-					Media
-				</combo_item>
-				<combo_item name="low">
-					Bajo
-				</combo_item>
-				<combo_item name="lowest">
-					Mínimo
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				Cargaremos en tu cuenta el precio de subida de L$ [FEE].
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Al pulsar en el botón de subida, confirmas que posees los derechos necesarios sobre el material que contiene el modelo.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Coste de recursos:         [COSTE]
-		</text>
-		<text name="physics cost">
-			Coste físico:        [COSTE]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carga completa.
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Subida finalizada
 			</text>
 		</panel>
-		<text name="description">
-			¡Felicidades! Tu modelo se ha cargado correctamente.  Encontrarás el modelo en la carpeta Objetos del inventario.
+		<text name="model_uploaded_text">
+			Se ha subido tu modelo.
+		</text>
+		<text name="inventory_text">
+			Puedes buscar la carpeta Objetos en tu inventario.
+		</text>
+		<text name="charged_fee">
+			Se han cargado [FEE] L$ en tu cuenta.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Atrás" name="back"/>
 	<button label="Siguiente &gt;&gt;" name="next"/>
+	<button label="Calcular pesos y precio &gt;&gt;" name="calculate"/>
+	<button label="Calculando..." name="calculating"/>
 	<button label="Subir" name="upload" tool_tip="Cargar al simulador"/>
 	<button label="Cancelar" name="cancel"/>
 	<button label="Cerrar" name="close"/>
@@ -193,6 +219,9 @@
 	<string name="status_idle">
 		Inactivo
 	</string>
+	<string name="status_parse_error">
+		Problema de análisis de DAE - consulta los datos en el registro.
+	</string>
 	<string name="status_reading_file">
 		Cargando...
 	</string>
@@ -202,6 +231,9 @@
 	<string name="status_vertex_number_overflow">
 		Error: El número de intersección es superior a 65534. Cancelado.
 	</string>
+	<string name="bad_element">
+		Error: el elemento no es válido
+	</string>
 	<string name="high">
 		Alto
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml
index 377b848530..e24d8064a1 100644
--- a/indra/newview/skins/default/xui/es/floater_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="ENCONTRAR">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Cargando...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index bca1839f09..1da2e491e1 100644
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="CONFIGURACIONES DEL DEPURADOR">
 	<radio_group name="boolean_combo">
-		<radio_item label="VERDADERO" name="TRUE" value="verdadero"/>
-		<radio_item label="FALSO" name="FALSE" value=""/>
+		<radio_item label="VERDADERO" name="TRUE" />
+		<radio_item label="FALSO" name="FALSE" />
 	</radio_group>
 	<color_swatch label="Color" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 9d29bc40bf..f6e246ebae 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Pulsa y arrastra para seleccionar el terreno.
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Pantalla
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] objetos ( [PRIM_COUNT] prims[PE_STRING] ) seleccionados
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Mundo
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Referencia
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Añadido
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] equivalentes en prim
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Visión"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
@@ -65,21 +56,13 @@
 	</radio_group>
 	<check_box label="Editar las partes enlazadas" name="checkbox edit linked parts"/>
 	<button label="Enlazar" name="link_btn"/>
-	<button label="Desenlazar" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Muestra cuánto se calcula que cuesta renderizar este objeto">
-		þ: [COUNT]
-	</text>
+	<button label="Desenlazar" name="unlink_btn" width="95"/>
 	<check_box label="" 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="Usar la cuadrícula" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto" width="82">
-		<combo_box.item label="Mundo" name="World"/>
-		<combo_box.item label="Local" name="Local"/>
-		<combo_box.item label="Referencia" name="Reference"/>
-	</combo_box>
+	<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"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -119,23 +102,11 @@
 		Fuerza
 	</text>
 	<button label="Aplicar" label_selected="Aplicar" left="146" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
-	<text left="134" name="obj_count">
-		Objetos: [COUNT]
-	</text>
-	<text left="134" name="prim_count">
-		Primitivas: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Conjuntos con enlaces: [RECUENTO]
-	</text>
-	<text name="linked_set_cost" tool_tip="Coste de los conjuntos con enlaces actualmente seleccionados como [prims], [complejidad física]">
-		Coste: [COSTE] / [FÍSICO]
-	</text>
-	<text name="object_count">
-		Objetos: [RECUENTO]
+	<text name="selection_empty">
+		No está seleccionado nada.
 	</text>
-	<text name="object_cost" tool_tip="Coste de los objetos actualmente seleccionados como [prims] / [complejidad física]">
-		Coste: [COSTE] / [FÍSICO]
+	<text name="selection_weight">
+		Peso de física [PHYS_WEIGHT], Coste de renderizado [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="General" name="General">
@@ -353,7 +324,6 @@
 				<combo_box.item label="Toroide" name="Torus"/>
 				<combo_box.item label="Plano" name="Plane"/>
 				<combo_box.item label="Cilindro" name="Cylinder"/>
-				<combo_box.item label="Red" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Caracter." name="Features">
@@ -405,7 +375,7 @@
 			</combo_box>
 			<spinner label="Gravedad" name="Physics Gravity"/>
 			<spinner label="Fricción" name="Physics Friction"/>
-			<spinner label="Densidad" name="Physics Density"/>
+			<spinner label="Densidad en 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Reemplazo" name="Physics Restitution"/>
 		</panel>
 		<panel label="Textura" name="Texture">
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 5ef4347958..1a265845af 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(¡Nuevo!)
 	</string>
+	<string name="effect_Arena">
+		Campo
+	</string>
+	<string name="effect_Beast">
+		Bestia
+	</string>
+	<string name="effect_Buff">
+		Musculoso
+	</string>
+	<string name="effect_Buzz">
+		Murmullo
+	</string>
+	<string name="effect_Camille">
+		Camila
+	</string>
+	<string name="effect_Creepy">
+		Aterrador
+	</string>
+	<string name="effect_CreepyBot">
+		Robot aterrador
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		Robot profundo
+	</string>
+	<string name="effect_Demon">
+		Diablo
+	</string>
+	<string name="effect_Flirty">
+		Coqueta
+	</string>
+	<string name="effect_Foxy">
+		Astuto
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Halloween_2010_Bonus
+	</string>
+	<string name="effect_Helium">
+		Helio
+	</string>
+	<string name="effect_Husky">
+		Corpulento
+	</string>
+	<string name="effect_Intercom">
+		Intercom
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Pesadilla
+	</string>
+	<string name="effect_PopBot">
+		Robot pop
+	</string>
+	<string name="effect_Rachel">
+		Raquel
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Robot
+	</string>
+	<string name="effect_Roxanne">
+		Roxana
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samanta
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Bajito
+	</string>
+	<string name="effect_Sneaky">
+		Furtivo
+	</string>
+	<string name="effect_Stallion">
+		Mujeriego
+	</string>
+	<string name="effect_Sultry">
+		Sensual
+	</string>
+	<string name="effect_Thunder">
+		Trueno
+	</string>
+	<string name="effect_Vixen">
+		Tigresa
+	</string>
+	<string name="effect_WhinyBot">
+		Robot llorica
+	</string>
 	<text name="preview_text">
 		Para probarla
 	</text>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
deleted file mode 100644
index 2c1f6cfbfb..0000000000
--- a/indra/newview/skins/default/xui/es/floater_water.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="EDITOR AVANZADO DEL AGUA">
-	<text name="KeyFramePresetsText">
-		Agua predefinida:
-	</text>
-	<button label="Nueva" label_selected="Nueva" name="WaterNewPreset"/>
-	<button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/>
-	<button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="CONFIGURACIÓN" name="Settings">
-			<text name="BHText">
-				Color del agua
-			</text>
-			<button label="?" left="175" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Pulsa para abrir el selector de color"/>
-			<text name="WaterFogDensText">
-				Transparencia
-			</text>
-			<button label="?" left="175" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Modificar la claridad del agua
-			</text>
-			<button label="?" left="175" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Tamaño de las ondulaciones
-			</text>
-			<button label="?" left="405" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Escala de Fresnel
-			</text>
-			<button label="?" left="405" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Coeficiente de reflexión
-			</text>
-			<button label="?" left="405" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refracción de la superficie
-			</text>
-			<button label="?" left="640" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refracción bajo la superficie
-			</text>
-			<button label="?" left="640" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Desenfoque
-			</text>
-			<button label="?" left="640" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="IMAGEN" name="Waves">
-			<text name="BHText">
-				Sentido de la onda grande
-			</text>
-			<button label="?" left="170" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Sentido de la onda pequeña
-			</text>
-			<button label="?" left="170" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Vista Normal
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
deleted file mode 100644
index 585a42e429..0000000000
--- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="EDITOR AVANZADO DEL CIELO">
-	<text name="KeyFramePresetsText">
-		Cielos definidos:
-	</text>
-	<button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/>
-	<button label="Guardar" label_selected="Guardar" name="WLSavePreset"/>
-	<button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/>
-	<button font="SansSerifSmall" label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" left_delta="90" name="WLDayCycleMenuButton" width="150"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMÓSFERA" name="Atmosphere">
-			<text name="BHText">
-				Coloración
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				V
-			</text>
-			<text name="BHText4">
-				A
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Cantidad de bruma
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Saturación
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				V
-			</text>
-			<text name="BHText8">
-				A
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densidad de la bruma
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Densidad
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Distancia
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitud máx.
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="LUZ" name="Lighting">
-			<text name="SLCText">
-				Color del Sol y de la Luna
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				A
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posición del Sol y la Luna
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiental
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				V
-			</text>
-			<text name="BHText7">
-				A
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ángulo de elevación
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Resplandor del Sol
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Visión" name="WLGlowB"/>
-			<slider label="Tamaño" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma de la escena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Brillo de las estrellas
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUBES" name="Clouds">
-			<text name="WLCloudColorText">
-				Color de las nubes
-			</text>
-			<button label="?" left="190" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				A
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Posición/Densidad de las nubes
-			</text>
-			<button label="?" left="190" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Nubosidad
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Altitud de las nubes
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text font="SansSerifSmall" name="WLCloudDetailText">
-				Detalle de las nubes (Posición/Densidad)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text bottom="-113" name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<slider bottom="-127" name="WLCloudDetailX"/>
-			<text name="WLCloudScrollXText">
-				Velocidad de X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Bloquear" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Velocidad de Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Bloquear" name="WLCloudLockY"/>
-			<check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/>
-			<button label="?" left="618" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index c27d624732..cabcacaed5 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -17,7 +17,7 @@
 		<menu_item_call label="Mostrar los &apos;TOS&apos;" name="TOS"/>
 		<menu_item_call label="Mostrar mensaje crítico" name="Critical"/>
 		<menu_item_call label="Prueba de navegadores de medios" name="Web Browser Test"/>
-		<menu_item_call label="Prueba de ventanas de contenidos web" name="Web Content Floater Test"/>
+		<menu_item_call label="Prueba de depuración de ventanas de contenido web" name="Web Content Floater Debug Test"/>
 		<menu_item_check label="Mostrar el selector de Grid" name="Show Grid Picker"/>
 		<menu_item_call label="Mostrar la consola de notificaciones" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
index f0fe383c0c..1403e4db01 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
+<toggleable_menu name="menu_group_plus">
 	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
 	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
 	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
 	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver mapa" name="view_map"/>
 	<menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 0824e386d5..b0d16d1ca4 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="Mis grupos" name="My Groups"/>
 		<menu_item_check label="Chat" name="Nearby Chat"/>
 		<menu_item_call label="Gente cerca" name="Active Speakers"/>
+		<menu_item_check label="Chat de voz" name="Nearby Voice"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_check label="Minimapa" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="Mediodía" name="Noon"/>
 			<menu_item_call label="Atardecer" name="Sunset"/>
 			<menu_item_call label="Medianoche" name="Midnight"/>
-			<menu_item_call label="Hora del Estado" name="Revert to Region Default"/>
-			<menu_item_call label="Editor del entorno" name="Environment Editor"/>
+		</menu>
+		<menu label="Editor de entorno" name="Enviroment Editor">
+			<menu_item_call label="Configuración de entorno..." name="Enviroment Settings"/>
+			<menu label="Agua predefinida" name="Water Presets">
+				<menu_item_call label="Nuevo predefinido..." name="new_water_preset"/>
+				<menu_item_call label="Editar predefinido..." name="edit_water_preset"/>
+				<menu_item_call label="Eliminar predefinido..." name="delete_water_preset"/>
+			</menu>
+			<menu label="Cielos predefinidos" name="Sky Presets">
+				<menu_item_call label="Nuevo predefinido..." name="new_sky_preset"/>
+				<menu_item_call label="Editar predefinido..." name="edit_sky_preset"/>
+				<menu_item_call label="Eliminar predefinido..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="Días predefinidos" name="Day Presets">
+				<menu_item_call label="Nuevo predefinido..." name="new_day_preset"/>
+				<menu_item_call label="Editar predefinido..." name="edit_day_preset"/>
+				<menu_item_call label="Eliminar predefinido..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="Construir" name="BuildTools">
@@ -142,7 +159,6 @@
 		<menu_item_check label="Desactivar los límites de la cámara" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto en Alta Resolución" name="HighResSnapshot"/>
 		<menu_item_check label="Silenciar el Guardar una foto" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Comprimir las fotos para el disco duro" name="CompressSnapshotsToDisk"/>
 		<menu label="Herramientas de rendimiento" name="Performance Tools">
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Estadísticas" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
index 9d9ce75e53..ec13f99a01 100644
--- a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
+<toggleable_menu name="Gear Wearing">
 	<menu_item_call label="Editar el vestuario" name="edit"/>
 	<menu_item_call label="Quitarme" name="takeoff"/>
-</menu>
+	<menu_item_call label="Copiar la lista del vestuario al portapapeles" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index b2131fc038..2ec1b333a9 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1560,6 +1560,11 @@ Vuelve a intentarlo más tarde.
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		Has intentado hacer [OFFERS] ofertas de teleporte,
+excediendo el límite de [LIMIT].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
 		¿Obligar a este Residente a ir a tu localización?
 		<form name="form">
@@ -1980,6 +1985,10 @@ Linden Lab
 		¿Estás seguro de que quieres borrar tu historial web, de viajes y de búsquedas?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		¿Estás seguro de que quieres vaciar la caché del visor?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		¿Estás seguro de que quieres limpiar tus cookies?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/>
@@ -2005,48 +2014,30 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 		¿Quieres sobrescribir la preselección guardada?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		¿Quieres borrar [SKY]?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
-	</notification>
 	<notification name="WLNoEditDefault">
 		No puedes editar ni borrar una preselección por defecto.
 	</notification>
 	<notification name="WLMissingSky">
 		Este archivo del ciclo de un día se refiere a un archivo perdido de cielo: [SKY].
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		Ya existe un efecto de procesamiento. ¿Quieres sobreescribirlo?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	<notification name="WLRegionApplyFail">
+		No se pudo aplicar la configuración a la región. El problema podría solucionarse saliendo de la región y regresando a ella. La razón especificada fue: [FAIL_REASON]
 	</notification>
-	<notification name="NewSkyPreset">
-		Dame un nombre para el cielo nuevo.
-		<form name="form">
-			<input name="message">
-				Preselección nueva
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Cancelar"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		¡Esa preselección ya existe!
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		No se puede eliminar la última clave de este ciclo del día, ya que no puedes vaciar la caché del día. En lugar de intentar eliminar la última clave restante y después intentar crear una nueva, debes modificarla.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		Dame un nombre para la nueva preselección de agua.
-		<form name="form">
-			<input name="message">
-				Preselección nueva
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Cancelar"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		No se pueden añadir más fotogramas clave a este ciclo del día. El número máximo de fotogramas clave para ciclos del día de alcance [SCOPE] es [MAX].
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		¡Esa preselección ya existe!
+	<notification name="EnvUpdateRate">
+		La configuración de entorno de la región sólo puede actualizarse cada [WAIT] segundos. Espera por lo menos este tiempo y vuelve intentarlo.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		No puedes editar o borrar una preselección por defecto.
+	<notification name="PPSaveEffectAlert">
+		Ya existe un efecto de procesamiento. ¿Quieres sobreescribirlo?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		No se puede empezar una nueva sesión de chat con [RECIPIENT].
@@ -2075,13 +2066,14 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 		<usetemplate ignoretext="Ponerme la ropa que estoy creando mientras modifico mi apariencia" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Debes haber verificado tu edad para visitar este sitio.  ¿Quieres ir al sitio web de [SECOND_LIFE] y verificarla?
+		Para acceder al contenido Adulto y los lugares de Second Life con dicho carácter, debes tener por lo menos 18 años. Visita la página de verificación de edad para confirmar que tienes más de 18 años. 
+Al hacerlo se iniciará el navegador web.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=es
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="No" yestext="Sí"/>
+		<usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="Cancelar" yestext="Ir a Verificación de la edad"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Para visitar este sitio debes haber aportado información de pago en tu cuenta.  ¿Quieres ir al sitio web de [SECOND_LIFE] y configurar esto?
@@ -2337,6 +2329,9 @@ Aquí no puedes volar.
 	<notification name="NoBuild">
 		Este terreno tiene desactivado el poder construir. Aquí no puedes ni construir ni crear objetos.
 	</notification>
+	<notification name="SeeAvatars">
+		Esta parcela oculta los avatares y el chat de texto de otras parcelas. No podrás ver a los residentes que estén fuera la parcela ni ellos podrán verte a ti. El chat de texto regular del canal 0 también está bloqueado.
+	</notification>
 	<notification name="ScriptsStopped">
 		Un administrador ha detenido temporalmente los scripts en esta región.
 	</notification>
@@ -2431,7 +2426,7 @@ Por favor, vuelve a intentarlo en unos momentos.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Un objeto de nombre &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, propiedad de [NAME_SLURL], te ha dado este [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Guardar"/>
 			<button name="Discard" text="Descartar"/>
@@ -2763,7 +2758,15 @@ Se mostrará cuando haya suficiente espacio.
 		Selecciona los residentes con quienes deseas compartir.
 	</notification>
 	<notification name="MeshUploadError">
-		No se ha cargado [ETIQUETA]: [MENSAJE] [IDENTIFICADOR] [IDENTIFICADOR_FALTA_VALIDEZ]
+		[LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER] 
+
+Consulta los detalles en el archivo de registro.
+	</notification>
+	<notification name="MeshUploadPermError">
+		Error al solicitar los permisos para subir la malla.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		No se ha podido obtener la capacidad de la región &apos;[CAPABILITY]&apos;.
 	</notification>
 	<notification name="ShareItemsConfirmation">
 		¿Estás seguro de que quieres compartir los elementos siguientes?
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
index 9b101ee4ba..cda465da9c 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Guardar" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Cancelar" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml
index 661b44e419..3f8057f242 100644
--- a/indra/newview/skins/default/xui/es/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_list.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="¿No encuentras lo que buscas? Inténtalo con [secondlife:///app/search/all/[SEARCH_TERM] Buscar]."/>
+		<no_visible_tabs_text name="no_outfits_msg" value="Todavía no tienes vestuario. Inténtalo con [secondlife:///app/search/all/ Buscar]"/>
+	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Ver más opciones"/>
+		<menu_button name="options_gear_btn" tool_tip="Ver más opciones"/>
 		<button name="trash_btn" tool_tip="Eliminar el vestuario seleccionado"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 01149e412d..2fcbb00aed 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -66,17 +66,17 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
index 3c363859a4..e1cf1332e2 100644
--- a/indra/newview/skins/default/xui/es/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml
@@ -64,6 +64,8 @@
 						<text name="scripts_value" value="Sí"/>
 						<text name="damage_label" value="Daño:"/>
 						<text name="damage_value" value="No"/>
+						<text name="see_avatars_label" value="Ver los avatares:"/>
+						<text name="see_avatars_value" value="No"/>
 						<button label="Acerca del terreno" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml
index 4c90a7e6b4..e9984b4512 100644
--- a/indra/newview/skins/default/xui/es/panel_places.xml
+++ b/indra/newview/skins/default/xui/es/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Ver más opciones"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="Perfil" name="profile_btn" tool_tip="Mostrar el perfil del lugar"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
index 96e63e6fa0..620a95de4d 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		Caché:
+	</text>
+	<spinner label="Tamaño de la caché (64 - 9984 MB)" name="cachesizespinner"/>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="Vaciar la caché" label_selected="Vaciar la caché" name="clear_cache"/>
+	<text name="Cache location">
+		Localización de la caché:
+	</text>
+	<button label="Elegir" label_selected="Elegir" name="set_cache"/>
+	<button label="Ubicación predeterminada" label_selected="Ubicación predeterminada" name="default_cache_location"/>
 	<text name="UI Size:">
 		Tamaño de la UI:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
index e6e4c13203..d47a6d718a 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
@@ -39,6 +39,6 @@
 	<text name="floater_opacity">
 		Opacidad de la ventana:
 	</text>
-	<slider label="Activo:" name="active"/>
-	<slider label="Inactivo:" name="inactive"/>
+	<slider label="Activa:" name="active"/>
+	<slider label="Inactiva:" name="inactive"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index fa7806a75a..5cb1654c70 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -12,13 +12,14 @@
 	<slider label="Ambiental" name="Wind Volume"/>
 	<slider label="Efectos de sonido" name="SFX Volume"/>
 	<slider label="Música en streaming" name="Music Volume"/>
-	<check_box label="Activados" name="enable_music"/>
+	<check_box label="Activada" name="enable_music"/>
 	<slider label="Multimedia" name="Media Volume"/>
 	<check_box label="Activados" name="enable_media"/>
 	<slider label="Chat de voz" name="Voice Volume"/>
 	<check_box label="Activado" name="enable_voice_check"/>
 	<check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="true"/>
 	<check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="true"/>
+	<check_box label="Reproducir sonidos de los gestos" name="gesture_audio_play_btn" tool_tip="Selecciona esta opción para escuchar los sonidos de los gestos" value="verdadero"/>
 	<text name="voice_chat_settings">
 		Configuración del chat de voz
 	</text>
@@ -35,28 +36,5 @@
 	<button label="Elegir la tecla" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Reconfigurarlo al botón medio del ratón"/>
 	<button label="Dispositivos de entrada y salida" name="device_settings_btn" width="210"/>
-	<panel label="Configuración de dispositivos" name="device_settings_panel">
-		<panel.string name="default_text">
-			Por defecto
-		</panel.string>
-		<panel.string name="default system device">
-			Dispositivo del sistema por defecto
-		</panel.string>
-		<panel.string name="no device">
-			Ningún dispositivo
-		</panel.string>
-		<text name="Input">
-			Entrada
-		</text>
-		<text name="My volume label">
-			Mi volumen:
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia el volumen usando este deslizable"/>
-		<text name="wait_text">
-			Por favor, espera
-		</text>
-		<text name="Output">
-			Salida
-		</text>
-	</panel>
+	<panel label="Configuración de dispositivos" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml
new file mode 100644
index 0000000000..a73f1deed4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Entorno" name="panel_env_info">
+	<text name="water_settings_title">
+		Selecciona la configuración de agua y cielo/ciclo del día que deseas que vean todos los visitantes de tu región. Más información
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Usar los valores predeterminados de Second Life" name="use_sl_default_settings"/>
+		<radio_item label="Usar la configuración siguiente" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Configuración de agua
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Cielo/Ciclo del día
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Cielo invariable" name="my_sky_settings"/>
+			<radio_item label="Ciclo del día" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Selecciona un valor predefinido-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index 98b10e4895..cb6c03dbb5 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -7,21 +7,56 @@
 		desconocida
 	</text>
 	<spinner label="Nivel del agua" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Límite de elevación &#10;del terreno" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Límite de bajada del &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Usar el Sol del estado" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Fijar el Sol" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Fase" name="sun_hour_slider"/>
+	<spinner label="Límite de elevación 
+del terreno" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Límite de bajada del 
+terreno" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Texturas del terreno (requiere archivos .tga de 512x512, 24 bits)
+	</text>
+	<text name="height_text_lbl">
+		1 (bajo)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (alto)
+	</text>
+	<text name="height_text_lbl5">
+		Intervalos de elevación de textura
+	</text>
+	<text name="height_text_lbl10">
+		Estos valores representan la gama de mezclas para las texturas anteriores.
+	</text>
+	<text name="height_text_lbl11">
+		El valor BAJA mide en metros la altura MÁXIMA de la textura n.º 1, y el valor ALTA es la altura MÍNIMA de la textura n.º 4.
+	</text>
+	<text name="height_text_lbl6">
+		Noroeste
+	</text>
+	<text name="height_text_lbl7">
+		Noreste
+	</text>
+	<spinner label="Bajo" name="height_start_spin_1"/>
+	<spinner label="Bajo" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Suroeste
+	</text>
+	<text name="height_text_lbl9">
+		Sureste
+	</text>
+	<spinner label="Bajo" name="height_start_spin_0"/>
+	<spinner label="Bajo" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
+	<button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="230"/>
+	<button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="230"/>
+	<button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada" width="230"/>
 	<button label="Aplicar" name="apply_btn"/>
-	<button width="230" label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
-	<button left="246" label="?" name="download_raw_help"/>
-	<button width="230" label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
-	<button left="246" label="?" name="upload_raw_help"/>
-	<button width="230" label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
-	<button left="246" label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
index acf5c68cda..9531b99cc8 100644
--- a/indra/newview/skins/default/xui/es/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Por defecto
 	</panel.string>
+	<string name="name_no_device">
+		Ningún dispositivo
+	</string>
+	<string name="name_default_system_device">
+		Dispositivo del sistema por defecto
+	</string>
 	<text name="Input">
 		Entrada
 	</text>
+	<text name="Output">
+		Salida
+	</text>
 	<text name="My volume label">
 		Mi volumen:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Por favor, espera
 	</text>
-	<text name="Output">
-		Salida
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
index b233fdd734..84d19c703b 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Cosas" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						Objetos recibidos ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						Objetos recibidos
+					</string>
+					<button label="Objetos recibidos" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] Nuevos
+					</text>
+					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+						<text name="inbox_inventory_placeholder">
+							Aquí se entregarán las compras realizadas en el mercado.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+			<layout_panel name="outbox_layout_panel">
+				<panel label="" name="marketplace_outbox">
+					<button label="Buzón de salida de comerciante" name="outbox_btn"/>
+					<button label="" name="outbox_sync_btn" tool_tip="Poner en el escaparate de Mi Mercado"/>
+					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
+						<text name="outbox_inventory_placeholder">
+							Configura tu cuenta de comerciante para utilizar esta función.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index b759eed738..2c33177ab4 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -25,6 +25,9 @@
 	<string name="StartupInitializingVFS">
 		Iniciando VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Error de inicialización de gráficos. Actualiza tu controlador de gráficos.
+	</string>
 	<string name="ProgressRestoring">
 		Restaurando...
 	</string>
@@ -79,6 +82,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime se ha iniciado adecuadamente.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Solicitando capacidades de la región...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Solicitando capacidades de la región, intento [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Esperando la conexión con la región...
 	</string>
@@ -1171,6 +1180,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InventoryNoTexture">
 		No tienes en tu inventario una copia de esta textura
 	</string>
+	<string name="InventoryInboxNoItems">
+		Aquí se entregarán los objetos comprados en el mercado.
+	</string>
+	<string name="InventoryOutboxNoItems">
+		Arrastra objetos aquí para preparar una lista del escaparate de tu mercado.
+	</string>
 	<string name="no_transfer" value="(no transferible)"/>
 	<string name="no_modify" value="(no modificable)"/>
 	<string name="no_copy" value="(no copiable)"/>
@@ -1211,9 +1226,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InvFolder My Inventory">
 		Mi Inventario
 	</string>
-	<string name="InvFolder My Favorites">
-		Mis Favoritos
-	</string>
 	<string name="InvFolder Library">
 		Biblioteca
 	</string>
@@ -1272,10 +1284,10 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		Gestos
 	</string>
 	<string name="InvFolder Favorite">
-		Favoritos
+		Mis Favoritos
 	</string>
 	<string name="InvFolder favorite">
-		Favoritos
+		Mis Favoritos
 	</string>
 	<string name="InvFolder Current Outfit">
 		Vestuario actual
@@ -1298,6 +1310,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InvFolder All">
 		Todas
 	</string>
+	<string name="no_attachments">
+		No tienes puestos anexos
+	</string>
 	<string name="Buy">
 		Comprar
 	</string>
@@ -1607,6 +1622,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	</string>
 	<string name="SummaryForTheWeek" value="Resumen de esta semana, empezando el "/>
 	<string name="NextStipendDay" value=". El próximo día de pago es el "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="Grupo       Aportaciones individuales"/>
 	<string name="GroupColumn" value="Grupo"/>
 	<string name="Balance">
@@ -1633,6 +1651,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="IMTeen">
 		teen
 	</string>
+	<string name="Anyone">
+		cualquiera
+	</string>
 	<string name="RegionInfoError">
 		error
 	</string>
@@ -1849,6 +1870,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="Public">
 		Público
 	</string>
+	<string name="LocalSettings">
+		Configuración local
+	</string>
+	<string name="RegionSettings">
+		Configuración de la región
+	</string>
 	<string name="ClassifiedClicksTxt">
 		Clics: [TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil
 	</string>
@@ -1921,6 +1948,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDebits">
 		Débitos
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Contenidos
 	</string>
@@ -3640,6 +3670,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="LocationCtrlGeneralIconTooltip">
 		Región General
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		Los avatares están visibles y está permitido el chat fuera de esta parcela
+	</string>
 	<string name="UpdaterWindowTitle">
 		Actualizar [APP_NAME]
 	</string>
@@ -4056,6 +4089,87 @@ Denuncia de infracción
 	<string name="Female - Wow">
 		Mujer - Admiración
 	</string>
+	<string name="/bow">
+		/reverencia
+	</string>
+	<string name="/clap">
+		/aplaudir
+	</string>
+	<string name="/count">
+		/contar
+	</string>
+	<string name="/extinguish">
+		/apagar
+	</string>
+	<string name="/kmb">
+		/bmc
+	</string>
+	<string name="/muscle">
+		/músculo
+	</string>
+	<string name="/no">
+		/no
+	</string>
+	<string name="/no!">
+		/¡no!
+	</string>
+	<string name="/paper">
+		/papel
+	</string>
+	<string name="/pointme">
+		/señalarme
+	</string>
+	<string name="/pointyou">
+		/señalarte
+	</string>
+	<string name="/rock">
+		/piedra
+	</string>
+	<string name="/scissor">
+		/tijera
+	</string>
+	<string name="/smoke">
+		/fumar
+	</string>
+	<string name="/stretch">
+		/estirar
+	</string>
+	<string name="/whistle">
+		/silbar
+	</string>
+	<string name="/yes">
+		/sí
+	</string>
+	<string name="/yes!">
+		/¡sí!
+	</string>
+	<string name="afk">
+		ausente
+	</string>
+	<string name="dance1">
+		baile1
+	</string>
+	<string name="dance2">
+		baile2
+	</string>
+	<string name="dance3">
+		baile3
+	</string>
+	<string name="dance4">
+		baile4
+	</string>
+	<string name="dance5">
+		baile5
+	</string>
+	<string name="dance6">
+		baile6
+	</string>
+	<string name="dance7">
+		baile7
+	</string>
+	<string name="dance8">
+		baile8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index bef41bb1ba..55dd913a22 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -135,12 +135,12 @@
 				0
 			</text>
 			<button label="Acheter du terrain" label_selected="Acheter le terrain..." left_delta="60" name="Buy Land..." width="125"/>
+			<button label="Vente Linden" label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères."/>
 			<button label="Infos sur les scripts" name="Scripts..." width="110"/>
 			<button label="Acheter pour le groupe" label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
 			<button label="Acheter un pass" label_selected="Acheter un pass..." left_delta="-127" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
 			<button label="Abandonner le terrain" label_selected="Abandonner le terrain..." name="Abandon Land..."/>
 			<button label="Récupérer le terrain" label_selected="Redemander le terrain…" name="Reclaim Land..."/>
-			<button label="Vente Linden" label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères."/>
 		</panel>
 		<panel label="RÈGLEMENT" name="land_covenant_panel">
 			<panel.string name="can_resell">
@@ -312,6 +312,9 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			<panel.string name="push_restrict_region_text">
 				Pas de bousculades (les règles de la région priment)
 			</panel.string>
+			<panel.string name="see_avs_text">
+				Voir et chatter avec les résidents sur cette parcelle
+			</panel.string>
 			<text name="allow_label">
 				Autoriser les autres résidents à :
 			</text>
@@ -374,6 +377,10 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				Photo :
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
+			<text name="allow_label5">
+				Autoriser les résidents sur les autres parcelles à :
+			</text>
+			<check_box label="Voir les avatars" name="SeeAvatarsCheck" tool_tip="Permettre aux résidents présents sur d&apos;autres parcelles de voir et chatter avec les résidents présents sur cette parcelle et vous permettre de les voir et de chatter avec eux."/>
 			<text name="landing_point">
 				Lieu d&apos;arrivée : [LANDING]
 			</text>
@@ -434,6 +441,11 @@ musique :
 				Son :
 			</text>
 			<check_box label="Limiter les gestes et sons d&apos;objet à cette parcelle" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				Sons d&apos;avatar :
+			</text>
+			<check_box label="Tout le monde" name="all av sound check"/>
+			<check_box label="Groupe" name="group av sound check"/>
 			<text name="Voice settings:">
 				Voix :
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
index cad00ea866..a200ed192f 100644
--- a/indra/newview/skins/default/xui/fr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPTIONS DE LA GRILLE">
+	<floater.string name="grid_screen_text">
+		Écran
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Locale
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Monde
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Référence
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Élément attaché
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacité de la grille">
+		Mode
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Choisir le type d&apos;axe de grille pour le positionnement de l&apos;objet.">
+		<combo_box.item label="Grille du monde" name="World"/>
+		<combo_box.item label="Grille locale" name="Local"/>
+		<combo_box.item label="Grille de référence" name="Reference"/>
+	</combo_box>
 	<spinner label="Unités (mètres)" name="GridResolution"/>
-	<spinner label="Mesures (mètres)" name="GridDrawSize"/>
+	<spinner label="Étendue (mètres)" name="GridDrawSize"/>
 	<check_box label="Fixation des sous-unités" name="GridSubUnit"/>
 	<check_box label="Afficher les sections transversales" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacité de la grille">
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
deleted file mode 100644
index 0ce17b9dc6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITEUR DU CYCLE DU JOUR">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Cycle du jour" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				Min.
-			</text>
-			<text name="WL3am">
-				3h
-			</text>
-			<text name="WL6am">
-				6h
-			</text>
-			<text name="WL9amHash">
-				9h
-			</text>
-			<text name="WL12pmHash">
-				Midi
-			</text>
-			<text name="WL3pm">
-				15h
-			</text>
-			<text name="WL6pm">
-				18h
-			</text>
-			<text name="WL9pm">
-				21h
-			</text>
-			<text name="WL12am2">
-				Min.
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/>
-			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Réglages des images-clés :
-			</text>
-			<text name="WLCurKeyTimeText">
-				Heure de la clé :
-			</text>
-			<spinner label="Heure" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Préréglages clés :
-			</text>
-			<combo_box label="Préréglage" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap :
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Durée du cycle :
-			</text>
-			<spinner label="Heure" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sec" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Aperçu :
-			</text>
-			<button label="Lire" label_selected="Lire" name="WLAnimSky"/>
-			<button label="Arrêter" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Utiliser heure domaine" label_selected="Aller heure domaine" name="WLUseLindenTime"/>
-			<button label="Enregistrer jour test" label_selected="Enregistrer jour test" name="WLSaveDayCycle"/>
-			<button label="Charger jour test" label_selected="Charger jour test" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..035bdbe5f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="SUPPRIMER PRÉRÉGLAGE ENV.">
+	<string name="title_water">
+		Supprimer un préréglage de l&apos;eau
+	</string>
+	<string name="title_sky">
+		Supprimer un préréglage du ciel
+	</string>
+	<string name="title_day_cycle">
+		Supprimer un cycle du jour
+	</string>
+	<string name="label_water">
+		Préréglage :
+	</string>
+	<string name="label_sky">
+		Préréglage :
+	</string>
+	<string name="label_day_cycle">
+		Cycle du jour :
+	</string>
+	<string name="msg_confirm_deletion">
+		Voulez-vous vraiment supprimer le préréglage sélectionné ?
+	</string>
+	<string name="msg_sky_is_referenced">
+		Impossible de supprimer un préréglage référencé dans un ou plusieurs cycles du jour.
+	</string>
+	<string name="combo_label">
+		-Effectuer une sélection-
+	</string>
+	<text name="label">
+		Préréglage :
+	</text>
+	<button label="Supprimer" name="delete"/>
+	<button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..0100419bc5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="Modifier un cycle du jour">
+	<string name="title_new">
+		Créer un nouveau cycle du jour
+	</string>
+	<string name="title_edit">
+		Modifier un cycle du jour
+	</string>
+	<string name="hint_new">
+		Donnez un nom au cycle du jour, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer.
+	</string>
+	<string name="hint_edit">
+		Pour modifier le cycle du jour, ajustez les contrôles ci-dessous, puis cliquez sur Enregistrer.
+	</string>
+	<string name="combo_label">
+		-Effectuer une sélection-
+	</string>
+	<text name="label">
+		Nom du préréglage :
+	</text>
+	<text name="note">
+		Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
+	</text>
+	<text name="hint_item1">
+		- Cliquez sur un repère pour modifier le réglage du ciel et l&apos;heure associés.
+	</text>
+	<text name="hint_item2">
+		- Cliquez sur les repères et faites-les glisser afin de définir les heures de transition.
+	</text>
+	<text name="hint_item3">
+		- Déplacez le marqueur en forme de triangle pour afficher un aperçu du cycle du jour.
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/>
+		<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/>
+		<text name="WL12am">
+			Min.
+		</text>
+		<text name="WL3am">
+			3h
+		</text>
+		<text name="WL6am">
+			6h
+		</text>
+		<text name="WL9amHash">
+			9h
+		</text>
+		<text name="WL12pmHash">
+			Midi
+		</text>
+		<text name="WL3pm">
+			15h
+		</text>
+		<text name="WL6pm">
+			18h
+		</text>
+		<text name="WL9pm">
+			21h
+		</text>
+		<text name="WL12am2">
+			Min.
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		Réglage du ciel :
+	</text>
+	<combo_box label="Préréglage" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		Heure :
+	</text>
+	<time name="time" value="6h"/>
+	<check_box label="Appliquer ce nouveau cycle du jour" name="make_default_cb"/>
+	<button label="Enregistrer" name="save"/>
+	<button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..4ec9bbb3dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="Modifier un préréglage du ciel">
+	<string name="title_new">
+		Créer un nouveau préréglage du ciel
+	</string>
+	<string name="title_edit">
+		Modifier un préréglage du ciel
+	</string>
+	<string name="hint_new">
+		Donnez un nom à votre préréglage, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer.
+	</string>
+	<string name="hint_edit">
+		Pour modifier le préréglage du ciel, ajustez les contrôles, puis cliquez sur Enregistrer.
+	</string>
+	<string name="combo_label">
+		-Effectuer une sélection-
+	</string>
+	<text name="hint">
+		Pour modifier le préréglage, ajustez les contrôles, puis cliquez sur Enregistrer.
+	</text>
+	<text name="label">
+		Nom du préréglage :
+	</text>
+	<text name="note">
+		Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="ATMOSPHÈRE" name="Atmosphere">
+			<text name="BHText">
+				Bleu de l&apos;horizon
+			</text>
+			<text name="BDensText">
+				Quantité de brume
+			</text>
+			<text name="BDensText2">
+				Densité du bleu
+			</text>
+			<text name="HDText">
+				Densité de la brume
+			</text>
+			<text name="DensMultText">
+				Multiplicateur de densité
+			</text>
+			<text name="WLDistanceMultText">
+				Multiplicateur de distance
+			</text>
+			<text name="MaxAltText">
+				Altitude maximum
+			</text>
+		</panel>
+		<panel label="LUMIÈRE" name="Lighting">
+			<text name="SLCText">
+				Couleur soleil/lune
+			</text>
+			<text name="WLAmbientText">
+				Éclairage ambiant
+			</text>
+			<text name="SunGlowText">
+				Rayonnement du soleil
+			</text>
+			<slider label="Netteté" name="WLGlowB"/>
+			<slider label="Taille" name="WLGlowR"/>
+			<text name="WLStarText">
+				Éclat des étoiles
+			</text>
+			<text name="SceneGammaText">
+				Gamma de la scène
+			</text>
+			<text name="TODText">
+				Position soleil/lune
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				Min.
+			</text>
+			<text name="WL6am">
+				6h
+			</text>
+			<text name="WL12pmHash">
+				Midi
+			</text>
+			<text name="WL6pm">
+				18h
+			</text>
+			<text name="WL12am2">
+				Min.
+			</text>
+			<time name="WLDayTime" value="6h"/>
+			<text name="WLEastAngleText">
+				Angle du levant
+			</text>
+		</panel>
+		<panel label="NUAGES" name="Clouds">
+			<text name="WLCloudColorText">
+				Couleur des nuages
+			</text>
+			<text name="WLCloudColorText2">
+				Nuages - XY/Densité
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				Couverture nuageuse
+			</text>
+			<text name="WLCloudScaleText">
+				Altitude des nuages
+			</text>
+			<text name="WLCloudDetailText">
+				Détails des nuages - XY/Densité
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				Direction et vitesse X
+			</text>
+			<check_box label="Verrouiller" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				Direction et vitesse Y
+			</text>
+			<check_box label="Verrouiller" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="Appliquer ce nouveau préréglage pour le ciel" name="make_default_cb"/>
+	<button label="Enregistrer" name="save"/>
+	<button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..81d9d34cfb
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="Modifier un préréglage de l&apos;eau">
+	<string name="title_new">
+		Créer un nouveau préréglage de l&apos;eau
+	</string>
+	<string name="title_edit">
+		Modifier un préréglage de l&apos;eau
+	</string>
+	<string name="hint_new">
+		Donnez un nom à votre préréglage, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer.
+	</string>
+	<string name="hint_edit">
+		Pour modifier le préréglage de l&apos;eau, ajustez les contrôles, puis cliquez sur Enregistrer.
+	</string>
+	<string name="combo_label">
+		-Effectuer une sélection-
+	</string>
+	<text name="hint">
+		Pour modifier le préréglage, ajustez les contrôles, puis cliquez sur Enregistrer.
+	</text>
+	<text name="label">
+		Nom du préréglage :
+	</text>
+	<text name="note">
+		Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			Couleur du brouillard dans l&apos;eau
+		</text>
+		<text name="water_fog_density_label">
+			Densité du brouillard
+		</text>
+		<text name="underwater_fog_modifier_label">
+			Brouillard sous-marin
+		</text>
+		<text name="BHText">
+			Direction grande vague
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			Échelle des vaguelettes
+		</text>
+		<text name="HDText">
+			Échelle Fresnel
+		</text>
+		<text name="FresnelOffsetText">
+			Décalage Fresnel
+		</text>
+		<text name="BHText2">
+			Direction petite vague
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			Réfraction au-dessus
+		</text>
+		<text name="WaterScaleBelowText">
+			Réfraction en dessous
+		</text>
+		<text name="MaxAltText">
+			Multiplicateur de flou
+		</text>
+		<text name="BHText3">
+			Normal Map
+		</text>
+	</panel>
+	<check_box label="Appliquer ce nouveau préréglage pour l&apos;eau" name="make_default_cb"/>
+	<button label="Enregistrer" name="save"/>
+	<button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
deleted file mode 100644
index dd714e85b6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ÉDITEUR D&apos;ENVIRONNEMENT">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text bottom="-45" name="EnvTimeText" top="29">
-		Heure de la
-journée
-	</text>
-	<text bottom_delta="-36" name="EnvTimeText2">
-		Midi
-	</text>
-	<text name="EnvCloudText">
-		Couverture
-nuageuse
-	</text>
-	<text bottom="-45" name="EnvWaterColorText" top="29">
-		Couleur de
-l&apos;eau
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
-	<text name="EnvWaterFogText">
-		Brouillard
-dans l&apos;eau
-	</text>
-	<button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="152"/>
-	<button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/>
-	<button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
new file mode 100644
index 0000000000..9ea47a3dd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="PARAMÈTRES D&apos;ENVIRONNEMENT">
+	<text name="note">
+		Utilisez les options ci-dessous pour personnaliser l&apos;environnement de votre client.
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Utiliser les réglages de la région" name="use_region_settings"/>
+		<radio_item label="Personnaliser mon environnement" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			Remarque : les autres utilisateurs ne pourront pas voir votre configuration personnalisée.
+		</text>
+		<text name="water_settings_title">
+			Réglage de l&apos;eau
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciel / Cycle du jour
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Ciel fixe" name="my_sky_settings"/>
+			<radio_item label="Cycle du jour" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="OK" name="ok_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index 213847bbd0..2639339be5 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -3,6 +3,9 @@
 	<string name="status_idle">
 		Inactif
 	</string>
+	<string name="status_parse_error">
+		Problème d&apos;analyse de fichier .dae ; reportez-vous au journal pour plus de détails.
+	</string>
 	<string name="status_reading_file">
 		Chargement...
 	</string>
@@ -12,6 +15,9 @@
 	<string name="status_vertex_number_overflow">
 		Erreur : valeur de sommet supérieure à 65534. Opération abandonnée.
 	</string>
+	<string name="bad_element">
+		Erreur : élément non valide
+	</string>
 	<string name="high">
 		Élevé
 	</string>
@@ -54,6 +60,9 @@
 	<string name="simplifying">
 		Simplification...
 	</string>
+	<string name="tbd">
+		TBD
+	</string>
 	<text name="name_label">
 		Nom :
 	</text>
@@ -74,23 +83,26 @@
 			Niveau de détail : Le plus faible
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Coût de la ressource : [COST]
-		</text>
-		<text name="physics cost">
-			Coût des propriétés physiques : [COST]
-		</text>
-		<text name="upload fee">
-			Frais de chargement : N/A
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		AVERTISSEMENT :
+	</text>
+	<text name="warning_message">
+		Vous ne pourrez pas effectuer le chargement final du modèle sur les serveurs Second Life. [[VURL] Découvrez comment] activer le chargement des modèles de maillage.
+	</text>
+	<text name="weights_text">
+		Téléchargement :
+Propriétés physiques :
+Serveur :
+
+Équiv. en prims :
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Valeurs par défaut" name="reset_btn" tool_tip="Rétablir les valeurs par défaut."/>
-	<button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/>
-	<button label="Annuler" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Niveau de détail" name="lod_panel">
 			<text name="lod_table_header">
@@ -228,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Frais de chargement : [FEE] L$
+	</text>
+	<button label="Réinitialiser" name="reset_btn" tool_tip="Rétablir les paramètres par défaut."/>
+	<button label="Calculer les poids et les frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
+	<button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/>
+	<button label="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
index bb64361959..f564b6f71a 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="ASSISTANT DE CHARGEMENT DE MODÈLE">
 	<button label="5. Chargement" name="upload_btn"/>
 	<button label="4. Vérification" name="review_btn"/>
-	<button label="3. Propriétés physiques" name="physics2_btn"/>
 	<button label="3. Propriétés physiques" name="physics_btn"/>
 	<button label="2. Optimisation" name="optimize_btn"/>
 	<button label="1. Sélection du fichier" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Charger le modèle
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Choisir un fichier de modèle
 			</text>
 		</panel>
-		<text name="description">
-			Cet Assistant vous aidera à importer des modèles de maillage dans Second Life. Commencez par spécifier un fichier contenant le modèle à importer. Second Life prend en charge les fichiers COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nom du fichier :
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Utilisateurs expérimentés : si vous êtes habitué à utiliser des outils de création de contenu en 3D, l&apos;outil de chargement avancé est mis à votre disposition.
+			</text>
+			<button label="Passer à Avancé" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Choisir un fichier de modèle à charger
 			</text>
 			<button label="Parcourir..." label_selected="Parcourir..." name="browse"/>
+			<text name="support_collada_text">
+				Second Life prend en charge les fichiers COLLADA (.dae).
+			</text>
+			<text name="dimensions_label">
+				Dimensions (mètres) :
+			</text>
 			<text name="dimensions">
-				X :         Y :         Z :
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				AVERTISSEMENT :
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Vous ne pourrez pas effectuer l&apos;étape de chargement finale du modèle sur les serveurs Second Life. [secondlife:///app/floater/learn_more Découvrez comment] configurer votre compte pour les chargements de modèle de maillage.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimisation
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Optimiser le modèle
 			</text>
 		</panel>
-		<text name="description">
-			Cet Assistant a optimisé votre modèle afin d&apos;améliorer les performances. Vous pouvez ajuster les résultats du processus d&apos;optimisation ci-dessous ou cliquer sur Suiv. pour continuer.
+		<text name="optimize_hint">
+			Le modèle a été optimisé en termes de performances. Vous pouvez l&apos;ajuster si vous le souhaitez.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Génération du niveau de détail
+			</text>
 			<text name="high_detail_text">
 				Générer le niveau de détail : Élevé
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Aperçu du modèle :
+			<text name="optimize_performance_text">
+				Performances
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Élevé
+			<text name="optimize_faster_rendering_text">
+				Rendu plus rapide
+Moins de détail
+Poids en prims inférieur
+			</text>
+			<text name="optimize_accuracy_text">
+				Précision
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Rendu plus lent
+Plus de détail
+Poids en prims supérieur
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Recalcul géométrique" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Aperçu de la géométrie
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="preview_lod_high">
+					Niveau de détail élevé
 				</combo_item>
-				<combo_item name="medium">
-					Moyen
+				<combo_item name="preview_lod_medium">
+					Niveau de détail moyen
 				</combo_item>
-				<combo_item name="low">
-					Faible
+				<combo_item name="preview_lod_low">
+					Niveau de détail faible
 				</combo_item>
-				<combo_item name="lowest">
-					Le plus faible
+				<combo_item name="preview_lod_lowest">
+					Niveau de détail le plus faible
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Coût de la ressource :    [COST]
-			</text>
-			<text name="dimensions">
-				X :         Y :         Z :
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Propriétés physiques
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Ajuster les propriétés physiques
 			</text>
 		</panel>
-		<text name="description">
-			Cet Assistant créera une forme physique déterminant le mode d&apos;interaction de l&apos;objet avec les autres objets et avatars. Réglez le curseur sur le niveau de détail le plus approprié à l&apos;utilisation de l&apos;objet :
+		<text name="physics_hint">
+			Une forme va être créée pour l&apos;enveloppe externe du modèle. Ajustez le niveau de détail de la forme en fonction de l&apos;objectif souhaité pour votre modèle.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Coût de la ressource :       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Performances
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Propriétés physiques
+			<text name="physics_faster_rendering_text">
+				Rendu plus rapide
+Moins de détail
+Poids en prims inférieur
 			</text>
-		</panel>
-		<text name="description">
-			Prévisualisez la forme physique ci-dessous, puis cliquez sur Suiv. pour continuer. Le bouton Préc. permet de modifier cette forme, le cas échéant.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Aperçu du modèle :
+			<text name="physics_accuracy_text">
+				Précision
+			</text>
+			<text name="physics_slower_dendering_text">
+				Rendu plus lent
+Plus de détail
+Poids en prims supérieur
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Élevé
+			<text name="physics_example_1">
+				Exemples :
+Objets mobiles
+Objets volants
+Véhicules
+			</text>
+			<text name="physics_example_2">
+				Exemples :
+Petits objets statiques
+Objets moins détaillés
+Mobilier simple
+			</text>
+			<text name="physics_example_3">
+				Exemples :
+Objets statiques
+Objets détaillés
+Bâtiments
+			</text>
+			<button label="Recalcul physique" name="recalculate_physics_btn"/>
+			<button label="Recalcul en cours..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Aperçu des propriétés physiques
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="preview_lod2_high">
+					Niveau de détail élevé
 				</combo_item>
-				<combo_item name="medium">
-					Moyen
+				<combo_item name="preview_lod2_medium">
+					Niveau de détail moyen
 				</combo_item>
-				<combo_item name="low">
-					Faible
+				<combo_item name="preview_lod2_low">
+					Niveau de détail faible
 				</combo_item>
-				<combo_item name="lowest">
-					Le plus faible
+				<combo_item name="preview_lod2_lowest">
+					Niveau de détail le plus faible
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X :         Y :         Z :
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Coût de la ressource :       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Vérification
 			</text>
 		</panel>
-		<text name="description">
-			Vérifiez les détails ci-dessous, puis cliquez sur Charger pour charger le modèle. Votre solde en L$ sera alors débité.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Aperçu du modèle :
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impact sur la parcelle/région : équivalent à [EQUIV] prims
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Élevé
-				</combo_item>
-				<combo_item name="medium">
-					Moyen
-				</combo_item>
-				<combo_item name="low">
-					Faible
-				</combo_item>
-				<combo_item name="lowest">
-					Le plus faible
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X :         Y :         Z :
+			<text name="review_fee">
+				Votre compte sera débité de [FEE] L$ de frais de chargement.
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				En cliquant sur le bouton de chargement, vous confirmez que vous disposez des droits appropriés sur le contenu du modèle.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Coût de la ressource :         [COST]
-		</text>
-		<text name="physics cost">
-			Coût des propriétés physiques :        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Chargement terminé !
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Chargement terminé
 			</text>
 		</panel>
-		<text name="description">
-			Félicitations ! Votre modèle a été chargé. Il se trouve dans le dossier Objets de votre inventaire.
+		<text name="model_uploaded_text">
+			Votre modèle a été chargé.
+		</text>
+		<text name="inventory_text">
+			Vous le trouverez dans le dossier Objets de votre inventaire.
+		</text>
+		<text name="charged_fee">
+			Votre compte a été débité de [FEE] L$.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Préc." name="back"/>
 	<button label="Suiv. &gt;&gt;" name="next"/>
+	<button label="Calculer les poids et les frais &gt;&gt;" name="calculate"/>
+	<button label="Calcul en cours..." name="calculating"/>
 	<button label="Charger" name="upload" tool_tip="Charger dans le simulateur."/>
 	<button label="Annuler" name="cancel"/>
 	<button label="Fermer" name="close"/>
@@ -193,6 +219,9 @@
 	<string name="status_idle">
 		Inactif
 	</string>
+	<string name="status_parse_error">
+		Problème d&apos;analyse de fichier .dae ; reportez-vous au journal pour plus de détails.
+	</string>
 	<string name="status_reading_file">
 		Chargement...
 	</string>
@@ -202,6 +231,9 @@
 	<string name="status_vertex_number_overflow">
 		Erreur : valeur de sommet supérieure à 65534. Opération abandonnée.
 	</string>
+	<string name="bad_element">
+		Erreur : élément non valide
+	</string>
 	<string name="high">
 		Élevé
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
index 672024466a..32800182ea 100644
--- a/indra/newview/skins/default/xui/fr/floater_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="RECHERCHER">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Chargement...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 09d77a8d34..bf687c412b 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Cliquez et faites glisser pour sélectionner le terrain.
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Écran
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] objets ( [PRIM_COUNT] prims[PE_STRING] ) sélectionnés
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Monde
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Référence
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Pièce jointe
+	<floater.string name="status_selectprimequiv">
+		, équiv. prims de [SEL_WEIGHT]
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
 	<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
@@ -66,20 +57,12 @@
 	<check_box label="Modification liée" name="checkbox edit linked parts"/>
 	<button label="Lien" name="link_btn"/>
 	<button label="Annuler le lien" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
-		þ : [COUNT]
-	</text>
 	<check_box label="" 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 sur la grille" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Choisissez le type d&apos;axe de grille pour le positionnement de l&apos;objet">
-		<combo_box.item label="Grille du monde" name="World"/>
-		<combo_box.item label="Grille locale" name="Local"/>
-		<combo_box.item label="Grille de référence" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Fixer" name="checkbox snap to grid"/>
 	<button label="Options..." label_selected="Options..." name="Options..." tool_tip="Afficher d&apos;autres options de grille"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme droit"/>
@@ -119,23 +102,11 @@
 		Force
 	</text>
 	<button label="Appliquer" label_selected="Appliquer" left="176" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
-	<text name="obj_count">
-		Objets : [COUNT]
-	</text>
-	<text name="prim_count">
-		Prims : [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Groupes liés : [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Coût des groupes liés actuellement sélectionnés en tant que [prims],[physics complexity].">
-		Coût : [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Objets : [COUNT]
+	<text name="selection_empty">
+		Aucune sélection effectuée.
 	</text>
-	<text name="object_cost" tool_tip="Coût des objets actuellement sélectionnés en tant que [prims] / [physics complexity].">
-		Coût : [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Poids physique [PHYS_WEIGHT], Coût de rendu [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
@@ -353,7 +324,6 @@
 				<combo_box.item label="Tore" name="Torus"/>
 				<combo_box.item label="Plan" name="Plane"/>
 				<combo_box.item label="Cylindre" name="Cylinder"/>
-				<combo_box.item label="Maillage" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Attributs" name="Features">
@@ -405,7 +375,7 @@
 			</combo_box>
 			<spinner label="Gravité" name="Physics Gravity"/>
 			<spinner label="Friction" name="Physics Friction"/>
-			<spinner label="Densité" name="Physics Density"/>
+			<spinner label="Densité en 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
 		<panel label="Texture" name="Texture">
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index 56cb654440..92ee6ecf24 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Nouveau !)
 	</string>
+	<string name="effect_Arena">
+		Stade
+	</string>
+	<string name="effect_Beast">
+		Brute
+	</string>
+	<string name="effect_Buff">
+		Nasal
+	</string>
+	<string name="effect_Buzz">
+		Friture
+	</string>
+	<string name="effect_Camille">
+		Camille
+	</string>
+	<string name="effect_Creepy">
+		Effrayant
+	</string>
+	<string name="effect_CreepyBot">
+		BotEffrayant
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		BotGrave
+	</string>
+	<string name="effect_Demon">
+		Démon
+	</string>
+	<string name="effect_Flirty">
+		Flirt
+	</string>
+	<string name="effect_Foxy">
+		Séduction
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Halloween_2010_Bonus
+	</string>
+	<string name="effect_Helium">
+		Hélium
+	</string>
+	<string name="effect_Husky">
+		Rauque
+	</string>
+	<string name="effect_Intercom">
+		Interphone
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Cauchemar
+	</string>
+	<string name="effect_PopBot">
+		BotPop
+	</string>
+	<string name="effect_Rachel">
+		Rachel
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Robot
+	</string>
+	<string name="effect_Roxanne">
+		Roxanne
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samantha
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Petite voix
+	</string>
+	<string name="effect_Sneaky">
+		Sournois
+	</string>
+	<string name="effect_Stallion">
+		Étalon
+	</string>
+	<string name="effect_Sultry">
+		Sensuel
+	</string>
+	<string name="effect_Thunder">
+		Tonnerre
+	</string>
+	<string name="effect_Vixen">
+		Mégère
+	</string>
+	<string name="effect_WhinyBot">
+		BotPleurnichard
+	</string>
 	<text name="preview_text">
 		Aperçu
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
deleted file mode 100644
index 7d1e3cd65c..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ÉDITEUR D&apos;EAU AVANCÉ">
-	<floater.string name="WLDefaultWaterNames">
-		Valeur par défaut:Transparente:Bassin:Trouble:Première plaie:SERPENT !!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText" width="120">
-		Préréglages :
-	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/>
-	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/>
-	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="PARAMÈTRES" name="Settings">
-			<text name="BHText">
-				Couleur du brouillard dans l&apos;eau
-			</text>
-			<color_swatch left="75" name="WaterFogColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
-			<text name="WaterFogDensText">
-				Densité du brouillard
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Brouillard sous-marin
-			</text>
-			<text name="BDensText">
-				Échelle des vaguelettes
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Échelle Fresnel
-			</text>
-			<text name="FresnelOffsetText">
-				Décalage Fresnel
-			</text>
-			<text name="DensMultText">
-				Réfraction au-dessus
-			</text>
-			<text name="WaterScaleBelowText">
-				Réfraction en dessous
-			</text>
-			<text name="MaxAltText">
-				Multiplicateur de flou
-			</text>
-		</panel>
-		<panel label="IMAGE" name="Waves">
-			<text name="BHText">
-				Direction grande vague
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direction petite vague
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal Map
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
deleted file mode 100644
index 657e5f5051..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ÉDITEUR DE CIEL AVANCÉ" width="706">
-	<text name="KeyFramePresetsText">
-		Préréglages :
-	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/>
-	<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/>
-	<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/>
-	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/>
-	<tab_container name="WindLight Tabs" width="706">
-		<panel label="ATMOSPHÈRE" name="Atmosphere">
-			<text name="BHText">
-				Bleu de l&apos;horizon
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				V
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Quantité de brume
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densité du bleu
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				V
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densité de la brume
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Multiplicateur de densité
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Multiplicateur de distance
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitude maximum
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="LUMIÈRE" name="Lighting">
-			<text name="SLCText">
-				Couleur soleil/lune
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Position soleil/lune
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Éclairage ambiant
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				V
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Angle du levant
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Rayonnement du soleil
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Netteté " name="WLGlowB"/>
-			<slider label="Taille    " name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma de la scène
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Éclat des étoiles
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUAGES" name="Clouds">
-			<text name="WLCloudColorText">
-				Couleur des nuages
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Nuages XY/densité
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Couverture nuageuse
-			</text>
-			<button label="?" left="407" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Altitude des nuages
-			</text>
-			<button label="?" left="407" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Détails nuages (XY/densité)
-			</text>
-			<button bottom_delta="-2" label="?" left="407" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Direction et vitesse X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Verrouiller" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Direction et vitesse Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Verrouiller" name="WLCloudLockY"/>
-			<check_box label="Nuages classiques" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-Minuit:A-Midi:A-3h:A-15h:A-16h30:A-6h:A-18h:A-9h:A-21h:Barcelone:Blizzard:Bleu mi-journée:Après-midi sur la côte:Coucher de soleil (côte):Valeur par défaut:Coucher de soleil (désert):Belle journée:Gros nuages floconneux:Brumeux:Funky Funky:Funky Funky Funky:Gelatto:Fantôme:Vérités incohérentes:Mi-journée 1:Mi-journée 2:Mi-journée 3:Mi-journée 4:Nuit:Pirate:Mauve:Rêve de navigateur:Sensualité pure
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 400c77e51a..6b96a16e75 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -18,7 +18,7 @@
 		<menu_item_call label="Afficher les conditions d&apos;utilisation" name="TOS"/>
 		<menu_item_call label="Afficher le message critique" name="Critical"/>
 		<menu_item_call label="Test du navigateur de médias" name="Web Browser Test"/>
-		<menu_item_call label="Test de la fenêtre flottante du contenu Web" name="Web Content Floater Test"/>
+		<menu_item_call label="Test de débogage de la fenêtre flottante du contenu Web" name="Web Content Floater Debug Test"/>
 		<menu_item_check label="Afficher le sélecteur de grille" name="Show Grid Picker"/>
 		<menu_item_call label="Afficher la console des notifications" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
index 45f97e062e..0aad174fbd 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
+<toggleable_menu name="menu_group_plus">
 	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
 	<menu_item_check label="Trier par nom" name="sort_name"/>
 	<menu_item_check label="Trier par distance" name="sort_distance"/>
 	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher la carte" name="view_map"/>
 	<menu_item_call label="Afficher les résidents et les objets interdits" name="show_blocked_list"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index d614cfe00c..46adc79a00 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="Mes groupes" name="My Groups"/>
 		<menu_item_check label="Chat près de moi" name="Nearby Chat"/>
 		<menu_item_call label="Personnes près de moi" name="Active Speakers"/>
+		<menu_item_check label="Chat vocal près de vous" name="Nearby Voice"/>
 	</menu>
 	<menu label="Monde" name="World">
 		<menu_item_check label="Mini-carte" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="Milieu de journée" name="Noon"/>
 			<menu_item_call label="Coucher de soleil" name="Sunset"/>
 			<menu_item_call label="Minuit" name="Midnight"/>
-			<menu_item_call label="Heure du domaine" name="Revert to Region Default"/>
-			<menu_item_call label="Éditeur d&apos;environnement" name="Environment Editor"/>
+		</menu>
+		<menu label="Éditeur d&apos;environnement" name="Enviroment Editor">
+			<menu_item_call label="Paramètres d&apos;environnement..." name="Enviroment Settings"/>
+			<menu label="Préréglages de l&apos;eau" name="Water Presets">
+				<menu_item_call label="Nouveau préréglage..." name="new_water_preset"/>
+				<menu_item_call label="Modifier un préréglage..." name="edit_water_preset"/>
+				<menu_item_call label="Supprimer un préréglage..." name="delete_water_preset"/>
+			</menu>
+			<menu label="Préréglages du ciel" name="Sky Presets">
+				<menu_item_call label="Nouveau préréglage..." name="new_sky_preset"/>
+				<menu_item_call label="Modifier un préréglage..." name="edit_sky_preset"/>
+				<menu_item_call label="Supprimer un préréglage..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="Préréglages du jour" name="Day Presets">
+				<menu_item_call label="Nouveau préréglage..." name="new_day_preset"/>
+				<menu_item_call label="Modifier un préréglage..." name="edit_day_preset"/>
+				<menu_item_call label="Supprimer un préréglage..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="Construire" name="BuildTools">
@@ -142,7 +159,6 @@
 		<menu_item_check label="Désactiver les contraintes de la caméra" name="Disable Camera Distance"/>
 		<menu_item_check label="Photo haute résolution" name="HighResSnapshot"/>
 		<menu_item_check label="Photos discrètes sur disque" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Compresser les photos sur disque" name="CompressSnapshotsToDisk"/>
 		<menu label="Outils de performance" name="Performance Tools">
 			<menu_item_call label="Mesure du lag" name="Lag Meter"/>
 			<menu_item_check label="Barre de statistiques" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
index 0ca9fe1879..c3d9d908b0 100644
--- a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
+<toggleable_menu name="Gear Wearing">
 	<menu_item_call label="Modifier la tenue" name="edit"/>
 	<menu_item_call label="Enlever" name="takeoff"/>
-</menu>
+	<menu_item_call label="Copier la liste de la tenue dans le presse-papiers" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 6bfab25087..ef95a1a389 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1550,6 +1550,11 @@ Veuillez réessayer ultérieurement.
 			<button name="Cancel" text="Annuler"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		Vous avez essayé d&apos;effectuer [OFFERS] offres de téléportation,
+or ce nombre dépasse la limite autorisée fixée à [LIMIT].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
 		Exiger du résident qu&apos;il vienne vous rejoindre ?
 		<form name="form">
@@ -1971,6 +1976,10 @@ Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
 		Êtes-vous certain de vouloir supprimer l&apos;historique de vos visites et recherches ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		Voulez-vous vraiment vider le cache de votre client ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		Êtes-vous certain de vouloir supprimer vos cookies ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
@@ -1996,48 +2005,30 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		Voulez-vous écraser l&apos;option précédemment enregistrée ?
 		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		Voulez-vous supprimer [SKY] ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
 	<notification name="WLNoEditDefault">
 		Vous ne pouvez pas modifier ou supprimer un préréglage par défaut.
 	</notification>
 	<notification name="WLMissingSky">
 		Une dossier semble manquer au Cycle du jour : [SKY].
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		Certains effets post-traitement existent. Voulez-vous quand même écraser ce fichier ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	<notification name="WLRegionApplyFail">
+		Impossible d&apos;appliquer les réglages à la région. Le problème est parfois résolu en quittant la région puis en y revenant. Motif fourni : [FAIL_REASON]
 	</notification>
-	<notification name="NewSkyPreset">
-		Nommez le nouveau ciel.
-		<form name="form">
-			<input name="message">
-				Nouveau préréglage
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		Ce préréglage existe déjà !
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		Impossible de supprimer la dernière clé de ce cycle du jour car ce dernier ne peut pas être vide. Modifiez la dernière clé restante au lieu d&apos;essayer de la supprimer puis d&apos;en créer une nouvelle.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		Nommez ce nouveau préréglage d&apos;eau.
-		<form name="form">
-			<input name="message">
-				Nouveau préréglage
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		Impossible d&apos;ajouter plus d&apos;images-clés à ce cycle du jour. Un maximum de [MAX] images-clés peut être associé aux cycles du jour de type [SCOPE].
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		Ce préréglage existe déjà !
+	<notification name="EnvUpdateRate">
+		Vous ne pouvez mettre à jour les paramètres d&apos;environnement d&apos;une région que toutes les [WAIT] secondes. Veuillez patienter pendant au moins ce délai avant de réessayer.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		Vous ne pouvez pas modifier ou supprimer un préréglage par défaut.
+	<notification name="PPSaveEffectAlert">
+		Certains effets post-traitement existent. Voulez-vous quand même écraser ce fichier ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		Impossible de démarrer une nouvelle session de chat avec [RECIPIENT].
@@ -2066,13 +2057,14 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		<usetemplate ignoretext="Porter automatiquement tout en modifiant mon apparence" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Pour pouvoir pénétrer dans cette zone, vous devez avoir procédé à la vérification de votre âge.  Souhaitez-vous aller sur [SECOND_LIFE] et procéder à la vérification de votre âge ?
+		Vous devez avoir au moins 18 ans pour accéder au contenu et aux zones Adulte dans Second Life. Visitez la page de vérification de l&apos;âge afin de confirmer que vous avez plus de 18 ans. 
+Cette opération lancera votre navigateur Web.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=fr
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Non" yestext="Oui"/>
+		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Annuler" yestext="Accéder à la page de vérification de l&apos;âge"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Pour pouvoir pénétrer dans cette zone, vous devez avoir enregistré vos informations de paiement.  Souhaitez-vous aller sur [SECOND_LIFE] et enregistrer vos informations de paiement ?
@@ -2329,6 +2321,9 @@ Vous ne pouvez pas voler ici.
 	<notification name="NoBuild">
 		La construction est interdite dans cette zone. Vous ne pouvez pas construite ou rezzer d&apos;objets ici.
 	</notification>
+	<notification name="SeeAvatars">
+		Cette parcelle masque les avatars et le chat écrit des autres parcelles. Vous ne pouvez pas voir les résidents qui se trouvent en dehors, et ceux qui se trouvent en dehors ne peuvent pas vous voir. Le chat écrit habituel sur le canal 0 est également bloqué.
+	</notification>
 	<notification name="ScriptsStopped">
 		Un administrateur a temporairement stoppé les scripts dans cette région.
 	</notification>
@@ -2423,7 +2418,7 @@ Veuillez réessayer dans quelques minutes.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Un objet nommé &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; appartenant à [NAME_SLURL] vous a donné un objet de type [OBJECTTYPE] :
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Garder"/>
 			<button name="Discard" text="Jeter"/>
@@ -2756,7 +2751,15 @@ Le bouton sera affiché quand il y aura suffisamment de place.
 		Sélectionnez les résidents avec lesquels partager l&apos;élément.
 	</notification>
 	<notification name="MeshUploadError">
-		Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+		Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER] 
+
+Voir le fichier journal pour plus de détails.
+	</notification>
+	<notification name="MeshUploadPermError">
+		Erreur lors de la demande des autorisations de chargement de maillage.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Impossible d&apos;obtenir la capacité de région : [CAPABILITY].
 	</notification>
 	<notification name="ShareItemsConfirmation">
 		Voulez-vous vraiment partager les articles suivants :
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
index 2364d9bbb2..247e18da82 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Enregistrer" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annuler" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
index ab352deec4..416353e1d4 100644
--- a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/all/[SEARCH_TERM] Rechercher]."/>
+		<no_visible_tabs_text name="no_outfits_msg" value="Aucune tenue n&apos;est actuellement en votre possession. Essayez [secondlife:///app/search/all Rechercher]."/>
+	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
+		<menu_button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
 		<button name="trash_btn" tool_tip="Supprimer la tenue sélectionnée"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 166f04b3e4..f035853efc 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -66,17 +66,17 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident"/>
+			<layout_panel name="call_btn_lp">
+				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire"/>
+			<layout_panel name="share_btn_lp">
+				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation"/>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
index 3c2c1b9d37..30be838896 100644
--- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
@@ -68,6 +68,8 @@
 						<text name="scripts_value" value="Activé"/>
 						<text name="damage_label" value="Dégâts :"/>
 						<text name="damage_value" value="Désactivé"/>
+						<text name="see_avatars_label" value="Voir les avatars :"/>
+						<text name="see_avatars_value" value="Désactivé"/>
 						<button label="À propos du terrain" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
index e252c224f8..5ec48c44c7 100644
--- a/indra/newview/skins/default/xui/fr/panel_places.xml
+++ b/indra/newview/skins/default/xui/fr/panel_places.xml
@@ -24,9 +24,9 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Afficher d&apos;autres options"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
-						<button label="Profil" name="profile_btn" tool_tip="Afficher le profil de l&apos;endroit"/>
+						<button label="Profil" name="profile_btn" tool_tip="Afficher le profil de l&apos;endroit."/>
 					</layout_panel>
 				</layout_stack>
 				<layout_stack name="bottom_bar_close_ls3">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
index 3468afbafe..3f3d0f51f4 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		Cache :
+	</text>
+	<spinner label="Taille du cache (64 - 9984 Mo)" name="cachesizespinner"/>
+	<text name="text_box5">
+		Mo
+	</text>
+	<button label="Vider le cache" label_selected="Vider le cache" name="clear_cache"/>
+	<text name="Cache location">
+		Emplacement du cache :
+	</text>
+	<button label="Parcourir" label_selected="Parcourir" name="set_cache"/>
+	<button label="Par défaut" label_selected="Par défaut" name="default_cache_location"/>
 	<text name="UI Size:">
 		Taille d&apos;interface :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index a404aae483..deaec2e14f 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -19,6 +19,7 @@
 	<check_box label="Activé" name="enable_voice_check"/>
 	<check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="true"/>
 	<check_box label="Lecture du média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="true"/>
+	<check_box label="Lire les sons des gestes" name="gesture_audio_play_btn" tool_tip="Cochez cette case pour entendre les sons associés aux gestes." value="true"/>
 	<text name="voice_chat_settings">
 		Paramètres du chat vocal
 	</text>
@@ -35,28 +36,5 @@
 	<button label="Définir la touche" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Réinitialiser sur le bouton central de la souris"/>
 	<button label="Périphériques d&apos;entrée/de sortie" name="device_settings_btn"/>
-	<panel label="Paramètres du matériel" name="device_settings_panel">
-		<panel.string name="default_text">
-			Défaut
-		</panel.string>
-		<panel.string name="default system device">
-			Périphérique système par défaut
-		</panel.string>
-		<panel.string name="no device">
-			Aucun périphérique
-		</panel.string>
-		<text name="Input">
-			Entrée
-		</text>
-		<text name="My volume label">
-			Mon volume :
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Régler le volume avec le curseur"/>
-		<text name="wait_text">
-			Veuillez patienter
-		</text>
-		<text name="Output">
-			Sortie
-		</text>
-	</panel>
+	<panel label="Paramètres du matériel" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
new file mode 100644
index 0000000000..d18503db86
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Environnement" name="panel_env_info">
+	<text name="water_settings_title">
+		Sélectionnez les réglages d&apos;eau et de ciel/cycle du jour que vous souhaitez afficher pour tous les résidents visitant votre région. En savoir plus
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Utiliser les réglages par défaut de Second Life" name="use_sl_default_settings"/>
+		<radio_item label="Utiliser les réglages suivants" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Réglage de l&apos;eau
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciel / Cycle du jour
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Ciel fixe" name="my_sky_settings"/>
+			<radio_item label="Cycle du jour" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="Appliquer" name="apply_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 4d7652eb6f..d7e321d06d 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -7,21 +7,56 @@
 		(inconnue)
 	</text>
 	<spinner label="Niveau de l&apos;eau" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Limite d&apos;élévation du &#10;terrain" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite d&apos;abaissement &#10;du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Soleil fixe" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Phase" name="sun_hour_slider"/>
-	<button label="Appliquer" name="apply_btn"/>
+	<spinner label="Limite d&apos;élévation du 
+terrain" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Limite d&apos;abaissement 
+du terrain" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Textures du terrain (fichiers .tga 512 x 512, 24 bit requis)
+	</text>
+	<text name="height_text_lbl">
+		1 (Bas)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Haut)
+	</text>
+	<text name="height_text_lbl5">
+		Limites d&apos;élévation de texture
+	</text>
+	<text name="height_text_lbl10">
+		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
+	</text>
+	<text name="height_text_lbl11">
+		En mètres, la valeur BAS correspond à la hauteur MAXIMUM de la texture n°1 et la valeur HAUT à la hauteur MINIMUM de la texture n°4.
+	</text>
+	<text name="height_text_lbl6">
+		Nord-ouest
+	</text>
+	<text name="height_text_lbl7">
+		Nord-est
+	</text>
+	<spinner label="Bas" name="height_start_spin_1"/>
+	<spinner label="Bas" name="height_start_spin_3"/>
+	<spinner label="Haut" name="height_range_spin_1"/>
+	<spinner label="Haut" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sud-ouest
+	</text>
+	<text name="height_text_lbl9">
+		Sud-est
+	</text>
+	<spinner label="Bas" name="height_start_spin_0"/>
+	<spinner label="Bas" name="height_start_spin_2"/>
+	<spinner label="Haut" name="height_range_spin_0"/>
+	<spinner label="Haut" name="height_range_spin_2"/>
 	<button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
-	<button label="?" name="download_raw_help" left="246" />
 	<button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
-	<button label="?" name="upload_raw_help" left="246" />
 	<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d&apos;élévation/abaissement"/>
-	<button label="?" name="bake_terrain_help"/>
+	<button label="Appliquer" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
index a9802312dc..460b269f7c 100644
--- a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Valeur par défaut
 	</panel.string>
+	<string name="name_no_device">
+		Aucun périphérique
+	</string>
+	<string name="name_default_system_device">
+		Périphérique système par défaut
+	</string>
 	<text name="Input">
 		Entrée
 	</text>
+	<text name="Output">
+		Sortie
+	</text>
 	<text name="My volume label">
 		Mon volume :
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Veuillez patienter
 	</text>
-	<text name="Output">
-		Sortie
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
index 3c4d2626c1..83543e3d0b 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Choses" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						Articles reçus ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						Articles reçus
+					</string>
+					<button label="Articles reçus" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] nouv.
+					</text>
+					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+						<text name="inbox_inventory_placeholder">
+							Ici seront livrés les achats effectués sur la Place du marché.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+			<layout_panel name="outbox_layout_panel">
+				<panel label="" name="marketplace_outbox">
+					<button label="Boîte d&apos;envoi vendeur" name="outbox_btn"/>
+					<button label="" name="outbox_sync_btn" tool_tip="Vers ma vitrine de la Place du marché"/>
+					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
+						<text name="outbox_inventory_placeholder">
+							Configurez votre compte de vendeur de façon à pouvoir utiliser cette fonctionnalité.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 3ec85551da..e6d407f727 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -34,6 +34,9 @@
 	<string name="StartupInitializingVFS">
 		Initialisation VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Échec d&apos;initialisation des graphiques. Veuillez mettre votre pilote graphique à jour.
+	</string>
 	<string name="ProgressRestoring">
 		Restauration...
 	</string>
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		Initialisation de Quicktime réussie.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Capacités de la région demandées...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Capacités de la région demandées... Tentative n° [NUMBER].
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Liaison avec la région en cours de création...
 	</string>
@@ -1192,6 +1201,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InventoryNoTexture">
 		Vous n&apos;avez pas de copie de cette texture dans votre inventaire
 	</string>
+	<string name="InventoryInboxNoItems">
+		Ici seront livrés les articles achetés sur la Place du marché.
+	</string>
+	<string name="InventoryOutboxNoItems">
+		Faites glisser des articles ici en vue de les publier sur votre vitrine de la Place du marché.
+	</string>
 	<string name="no_transfer" value=" (pas de transfert)"/>
 	<string name="no_modify" value=" (pas de modification)"/>
 	<string name="no_copy" value=" (pas de copie)"/>
@@ -1238,9 +1253,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InvFolder My Inventory">
 		Mon inventaire
 	</string>
-	<string name="InvFolder My Favorites">
-		Mes Favoris
-	</string>
 	<string name="InvFolder Library">
 		Bibliothèque
 	</string>
@@ -1299,10 +1311,10 @@ Veuillez réessayer de vous connecter dans une minute.
 		Gestes
 	</string>
 	<string name="InvFolder Favorite">
-		Favoris
+		Mes Favoris
 	</string>
 	<string name="InvFolder favorite">
-		Favoris
+		Mes Favoris
 	</string>
 	<string name="InvFolder Current Outfit">
 		Tenue actuelle
@@ -1325,6 +1337,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InvFolder All">
 		Tout
 	</string>
+	<string name="no_attachments">
+		Aucun élément attaché porté
+	</string>
 	<string name="Buy">
 		Acheter
 	</string>
@@ -1634,6 +1649,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	</string>
 	<string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
 	<string name="NextStipendDay" value=". Prochaine prime le "/>
+	<string name="GroupPlanningDate">
+		[day,datetime,utc]/[mthnum,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="                      Groupe    Part individuelle"/>
 	<string name="GroupColumn" value="Groupe"/>
 	<string name="Balance">
@@ -1660,6 +1678,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="IMTeen">
 		teen
 	</string>
+	<string name="Anyone">
+		n&apos;importe qui
+	</string>
 	<string name="RegionInfoError">
 		erreur
 	</string>
@@ -1882,6 +1903,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="Public">
 		Public
 	</string>
+	<string name="LocalSettings">
+		Réglages locaux
+	</string>
+	<string name="RegionSettings">
+		Réglages de la région
+	</string>
 	<string name="ClassifiedClicksTxt">
 		Clics : [TELEPORT] téléportation, [MAP] carte, [PROFILE] profil
 	</string>
@@ -1954,6 +1981,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDebits">
 		Débits
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Contenus
 	</string>
@@ -3727,6 +3757,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="LocationCtrlGeneralIconTooltip">
 		Région de type Général
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		Avatars visibles et chat autorisé en dehors de cette parcelle
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] - Mise à jour
 	</string>
@@ -4152,6 +4185,87 @@ de l&apos;infraction signalée
 	<string name="Female - Wow">
 		Femme - Ouah !
 	</string>
+	<string name="/bow">
+		/s&apos;incliner
+	</string>
+	<string name="/clap">
+		/applaudir
+	</string>
+	<string name="/count">
+		/compter
+	</string>
+	<string name="/extinguish">
+		/éteindre
+	</string>
+	<string name="/kmb">
+		/vatefairevoir
+	</string>
+	<string name="/muscle">
+		/montrersesmuscles
+	</string>
+	<string name="/no">
+		/non
+	</string>
+	<string name="/no!">
+		/non !
+	</string>
+	<string name="/paper">
+		/papier
+	</string>
+	<string name="/pointme">
+		/memontrerdudoigt
+	</string>
+	<string name="/pointyou">
+		/montrerl&apos;autredudoigt
+	</string>
+	<string name="/rock">
+		/pierre
+	</string>
+	<string name="/scissor">
+		/ciseaux
+	</string>
+	<string name="/smoke">
+		/fumer
+	</string>
+	<string name="/stretch">
+		/s&apos;étirer
+	</string>
+	<string name="/whistle">
+		/siffler
+	</string>
+	<string name="/yes">
+		/oui
+	</string>
+	<string name="/yes!">
+		/oui !
+	</string>
+	<string name="afk">
+		absent
+	</string>
+	<string name="dance1">
+		danse1
+	</string>
+	<string name="dance2">
+		danse2
+	</string>
+	<string name="dance3">
+		danse3
+	</string>
+	<string name="dance4">
+		danse4
+	</string>
+	<string name="dance5">
+		danse5
+	</string>
+	<string name="dance6">
+		danse6
+	</string>
+	<string name="dance7">
+		danse7
+	</string>
+	<string name="dance8">
+		danse8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index a96433d7aa..cf0f8f2f6f 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -136,12 +136,12 @@ Vai al menu Mondo &gt; Informazioni sul terreno oppure seleziona un altro appezz
 				0
 			</text>
 			<button label="Acquista il terreno..." label_selected="Acquista il terreno..." left="130" name="Buy Land..." width="125"/>
+			<button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere di proprietà, con contenuto impostato, e non già messa all&apos;asta."/>
 			<button label="Informazioni script" name="Scripts..."/>
 			<button label="Acquista per il gruppo" name="Buy For Group..."/>
 			<button label="Compra Pass..." label_selected="Compra Pass..." left="130" name="Buy Pass..." tool_tip="Un pass ti da un accesso temporaneo in questo territorio." width="125"/>
 			<button label="Abbandona la terra" name="Abandon Land..."/>
 			<button label="Reclama la terra" name="Reclaim Land..."/>
-			<button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere di proprietà, con contenuto impostato, e non già messa all&apos;asta."/>
 		</panel>
 		<panel label="REGOLAMENTO" name="land_covenant_panel">
 			<panel.string name="can_resell">
@@ -313,6 +313,9 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 			<panel.string name="push_restrict_region_text">
 				Nessuna spinta (Impostazione regionale)
 			</panel.string>
+			<panel.string name="see_avs_text">
+				Vedi i residenti in questo lotto e chatta con loro
+			</panel.string>
 			<text name="allow_label">
 				Permetti ad altri residenti di:
 			</text>
@@ -375,6 +378,10 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 				Fotografia:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clicca per scegliere una immagine"/>
+			<text name="allow_label5">
+				Permetti ai residenti in altri lotti di:
+			</text>
+			<check_box label="Vedi avatar" name="SeeAvatarsCheck" tool_tip="Consente ai residenti in altri lotti di vedere i residenti in questo lotto e chattare con loro, e ti consente di vederli e chattare con loro."/>
 			<text name="landing_point">
 				Punto di atterraggio: [LANDING]
 			</text>
@@ -434,6 +441,11 @@ Media:
 				Audio:
 			</text>
 			<check_box label="Limita l&apos;audio per oggetti e gesture a questo lotto" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				Suoni avatar:
+			</text>
+			<check_box label="Tutti" name="all av sound check"/>
+			<check_box label="Gruppo" name="group av sound check"/>
 			<text name="Voice settings:">
 				Voce:
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
index 326aab1a31..080e396642 100644
--- a/indra/newview/skins/default/xui/it/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPZIONI DELLA GRIGLIA">
-	<spinner label="Unità griglia (metri)" label_width="192" name="GridResolution" width="250"/>
-	<spinner label="Estensione della griglia (metri)" label_width="192" name="GridDrawSize" width="250"/>
+	<floater.string name="grid_screen_text">
+		Schermo
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Locale
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Mondo
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Riferimento
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Allegato
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacità della griglia">
+		Modalità
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">
+		<combo_box.item label="Griglia del mondo" name="World"/>
+		<combo_box.item label="Griglia locale" name="Local"/>
+		<combo_box.item label="Griglia di riferimento" name="Reference"/>
+	</combo_box>
+	<spinner label="Unità (metri)" label_width="192" name="GridResolution" width="250"/>
+	<spinner label="Ampiezza (metri)" label_width="192" name="GridDrawSize" width="250"/>
 	<check_box label="Usa sottounità" name="GridSubUnit"/>
 	<check_box label="Guarda le sezioni trasversali" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacità della griglia">
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
deleted file mode 100644
index 98c385d29f..0000000000
--- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITOR DELLE CICLO GIORNO/NOTTE">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo giorno/notte" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				0:00
-			</text>
-			<text name="WL3am">
-				3:00
-			</text>
-			<text name="WL6am">
-				6:00
-			</text>
-			<text name="WL9amHash">
-				9:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				24:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
-			<button label_selected="Cancella voce" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Impostazioni del fotogramma chiave:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Tempo:
-			</text>
-			<spinner label="Ora" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Impostazione chiave:
-			</text>
-			<combo_box label="Programma:" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Raggruppa:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Lunghezza del ciclo:
-			</text>
-			<spinner label="Ore" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sec" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Anteprima:
-			</text>
-			<button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
-			<button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
-			<button label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
-			<button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
-			<button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..71071825af
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="CANCELLA PREDEFINITO AMB">
+	<string name="title_water">
+		Cancella valore predefinito acqua
+	</string>
+	<string name="title_sky">
+		Cancella valore predefinito cielo
+	</string>
+	<string name="title_day_cycle">
+		Cancella ciclo giornata
+	</string>
+	<string name="label_water">
+		Valori predefiniti:
+	</string>
+	<string name="label_sky">
+		Valori predefiniti:
+	</string>
+	<string name="label_day_cycle">
+		Ciclo giornata:
+	</string>
+	<string name="msg_confirm_deletion">
+		Sei sicuro di volere eliminare il valore predefinito selezionato?
+	</string>
+	<string name="msg_sky_is_referenced">
+		Impossibile rimuovere un valore predefinito che viene utilizzato in uno o più cicli di giornata.
+	</string>
+	<string name="combo_label">
+		-Seleziona un valore predefinito-
+	</string>
+	<text name="label">
+		Valori predefiniti:
+	</text>
+	<button label="Elimina" name="delete"/>
+	<button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..c922b2e4f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="Modifica ciclo giornata">
+	<string name="title_new">
+		Crea un nuovo ciclo giornata
+	</string>
+	<string name="title_edit">
+		Modifica ciclo giornata
+	</string>
+	<string name="hint_new">
+		Dai un nome al ciclo della giornata, modifica i controlli per crearlo e fai clic su &quot;Salva&quot;.
+	</string>
+	<string name="hint_edit">
+		Per modificare il ciclo della giornata, modifica i controlli seguenti e fai clic su &quot;Salva&quot;.
+	</string>
+	<string name="combo_label">
+		-Seleziona un valore predefinito-
+	</string>
+	<text name="label">
+		Nome predefinito:
+	</text>
+	<text name="note">
+		Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato.
+	</text>
+	<text name="hint_item1">
+		- Fai clic su una scheda per modificare gli orari e le impostazioni cielo specifiche.
+	</text>
+	<text name="hint_item2">
+		- Fai clic e trascina le schede per impostare i tempi di transizione.
+	</text>
+	<text name="hint_item3">
+		- Usa lo scrubber per visualizzare in anteprima il ciclo giornata.
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="Aggiungi chiave" label_selected="Aggiungi chiave" name="WLAddKey"/>
+		<button label="Tasto cancella" label_selected="Tasto cancella" name="WLDeleteKey"/>
+		<text name="WL12am">
+			00:00
+		</text>
+		<text name="WL3am">
+			03:00:00
+		</text>
+		<text name="WL6am">
+			06:00:00
+		</text>
+		<text name="WL9amHash">
+			09:00:00
+		</text>
+		<text name="WL12pmHash">
+			12:00:00
+		</text>
+		<text name="WL3pm">
+			15:00:00
+		</text>
+		<text name="WL6pm">
+			18:00:00
+		</text>
+		<text name="WL9pm">
+			21:00:00
+		</text>
+		<text name="WL12am2">
+			00:00
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		Impostazioni cielo:
+	</text>
+	<combo_box label="Valori predefiniti" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		Giorno/ora:
+	</text>
+	<time name="time" value="06:00:00"/>
+	<check_box label="Usa come nuovo ciclo giornata" name="make_default_cb"/>
+	<button label="Salva" name="save"/>
+	<button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..571027fd29
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="Modifica predefiniti cielo">
+	<string name="title_new">
+		Crea un nuovo valore predefinito per il cielo
+	</string>
+	<string name="title_edit">
+		Modifica predefiniti cielo
+	</string>
+	<string name="hint_new">
+		Dai un nome al valore predefinito, modifica i controlli per crearlo e fai clic su &quot;Salva&quot;.
+	</string>
+	<string name="hint_edit">
+		Per modificare il valore predefinito per il cielo, modifica i controlli e fai clic su &quot;Salva&quot;.
+	</string>
+	<string name="combo_label">
+		-Seleziona un valore predefinito-
+	</string>
+	<text name="hint">
+		Per modificare i valori predefiniti, modifica i controlli e quindi fai clic su &quot;Salva&quot;
+	</text>
+	<text name="label">
+		Nome predefinito:
+	</text>
+	<text name="note">
+		Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato.
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="ATMOSFERA" name="Atmosphere">
+			<text name="BHText">
+				Orizzonte blu
+			</text>
+			<text name="BDensText">
+				Orizzonte foschia
+			</text>
+			<text name="BDensText2">
+				Densità blu
+			</text>
+			<text name="HDText">
+				Densità foschia
+			</text>
+			<text name="DensMultText">
+				Fattore moltiplicativo densità
+			</text>
+			<text name="WLDistanceMultText">
+				Fattore moltiplicativo distanza
+			</text>
+			<text name="MaxAltText">
+				Altitudine massima
+			</text>
+		</panel>
+		<panel label="ILLUMINAZIONE" name="Lighting">
+			<text name="SLCText">
+				Colore sole/luna
+			</text>
+			<text name="WLAmbientText">
+				Ambiente
+			</text>
+			<text name="SunGlowText">
+				Bagliore sole
+			</text>
+			<slider label="Centro focale" name="WLGlowB"/>
+			<slider label="Dimensioni" name="WLGlowR"/>
+			<text name="WLStarText">
+				Luminosità cielo
+			</text>
+			<text name="SceneGammaText">
+				Gamma scena
+			</text>
+			<text name="TODText">
+				Posizione sole/luna
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				00:00
+			</text>
+			<text name="WL6am">
+				06:00:00
+			</text>
+			<text name="WL12pmHash">
+				12:00:00
+			</text>
+			<text name="WL6pm">
+				18:00:00
+			</text>
+			<text name="WL12am2">
+				00:00
+			</text>
+			<time name="WLDayTime" value="06:00:00"/>
+			<text name="WLEastAngleText">
+				Angolo est
+			</text>
+		</panel>
+		<panel label="NUVOLE" name="Clouds">
+			<text name="WLCloudColorText">
+				Colore nuvole
+			</text>
+			<text name="WLCloudColorText2">
+				XY/Densità nuvole
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				Copertura nuvole
+			</text>
+			<text name="WLCloudScaleText">
+				Scala nuvole
+			</text>
+			<text name="WLCloudDetailText">
+				Dettaglio nuvole (XY/Densità)
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				Scorrimento nuvole X
+			</text>
+			<check_box label="Blocca" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				Scorrimento nuvole Y
+			</text>
+			<check_box label="Blocca" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="Usa questo valore predefinito come nuova impostazione per il cielo" name="make_default_cb"/>
+	<button label="Salva" name="save"/>
+	<button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..7bffc60ba2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="Modifica un valore predefinito acqua">
+	<string name="title_new">
+		Crea un nuovo valore predefinito per l&apos;acqua
+	</string>
+	<string name="title_edit">
+		Modifica un valore predefinito per l&apos;acqua
+	</string>
+	<string name="hint_new">
+		Dai un nome al valore predefinito, modifica i controlli per crearlo e fai clic su &quot;Salva&quot;.
+	</string>
+	<string name="hint_edit">
+		Per modificare il valore predefinito per l&apos;acqua, modifica i controlli e fai clic su &quot;Salva&quot;.
+	</string>
+	<string name="combo_label">
+		-Seleziona un valore predefinito-
+	</string>
+	<text name="hint">
+		Per modificare i valori predefiniti, modifica i controlli e quindi fai clic su &quot;Salva&quot;
+	</text>
+	<text name="label">
+		Nome predefinito:
+	</text>
+	<text name="note">
+		Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato.
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			Colore nebbia acqua
+		</text>
+		<text name="water_fog_density_label">
+			Esponente densità nebbia
+		</text>
+		<text name="underwater_fog_modifier_label">
+			Modificatore nebbia sott&apos;acqua
+		</text>
+		<text name="BHText">
+			Direzione onda grande
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			Scala wavelet riflesso
+		</text>
+		<text name="HDText">
+			Scala Fresnel
+		</text>
+		<text name="FresnelOffsetText">
+			Spostamento Fresnel
+		</text>
+		<text name="BHText2">
+			Direzione onda piccola
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			Scala wavelet sopra
+		</text>
+		<text name="WaterScaleBelowText">
+			Scala wavelet sotto
+		</text>
+		<text name="MaxAltText">
+			Fattore moltiplicativo blu
+		</text>
+		<text name="BHText3">
+			Mappa normale
+		</text>
+	</panel>
+	<check_box label="Usa questo valore predefinito come nuova impostazione per l&apos;acqua" name="make_default_cb"/>
+	<button label="Salva" name="save"/>
+	<button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_env_settings.xml b/indra/newview/skins/default/xui/it/floater_env_settings.xml
deleted file mode 100644
index 1c17c18e84..0000000000
--- a/indra/newview/skins/default/xui/it/floater_env_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDITOR DELL&apos;AMBIENTE">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Ora del
-giorno
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Intensità delle
-Nuvole
-	</text>
-	<text name="EnvWaterColorText">
-		Colore
-dell&apos;Acqua
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Clicca per aprire il selettore dei colori"/>
-	<text name="EnvWaterFogText">
-		Nebbiosità
-dell&apos;acqua
-	</text>
-	<button bottom="-144" label="Usa orario della regione" name="EnvUseEstateTimeButton" width="145"/>
-	<button label="Cielo avanzato" name="EnvAdvancedSkyButton"/>
-	<button label="Acqua avanzata" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
new file mode 100644
index 0000000000..f191078fad
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="IMPOSTAZIONI AMBIENTE">
+	<text name="note">
+		Usa le opzioni seguenti per personalizzare le impostazioni dell&apos;ambiente per il tuo  viewer.
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Usa impostazioni regione" name="use_region_settings"/>
+		<radio_item label="Personalizza il mio ambiente" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			Nota: gli altri utenti non vedranno le tue impostazioni personalizzate.
+		</text>
+		<text name="water_settings_title">
+			Impostazione Acqua
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciclo giornata / cielo
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Cielo fisso" name="my_sky_settings"/>
+			<radio_item label="Ciclo giornata" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="OK" name="ok_btn"/>
+	<button label="Annulla" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
index a17b8b36c2..931fe7d382 100644
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -3,6 +3,9 @@
 	<string name="status_idle">
 		Pausa
 	</string>
+	<string name="status_parse_error">
+		Problema nell&apos;elaborazione DAE - vedi il registro per informazioni al riguardo.
+	</string>
 	<string name="status_reading_file">
 		Caricamento in corso...
 	</string>
@@ -12,6 +15,9 @@
 	<string name="status_vertex_number_overflow">
 		Errore: numero di vertici maggiore di 65534, annullato.
 	</string>
+	<string name="bad_element">
+		Errore: elemento non valido
+	</string>
 	<string name="high">
 		Alto
 	</string>
@@ -54,6 +60,9 @@
 	<string name="simplifying">
 		Semplificazione in corso...
 	</string>
+	<string name="tbd">
+		Da definire
+	</string>
 	<text name="name_label">
 		Nome:
 	</text>
@@ -74,23 +83,26 @@
 			Livello di dettaglio: Bassissimo
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Costo risorsa: [COST]
-		</text>
-		<text name="physics cost">
-			Costo fisica: [COST]
-		</text>
-		<text name="upload fee">
-			Costo caricamento: N/D
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		ATTENZIONE:
+	</text>
+	<text name="warning_message">
+		Non sarà possibile completare il caricamento finale di questo modello sui server di Second Life. [[VURL] Scopri come] ricevere l&apos;autorizzazione per il caricamento dei modelli con reticolo.
+	</text>
+	<text name="weights_text">
+		Download:
+Fisica:
+Server:
+
+Prim equivalenti:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Predefiniti" name="reset_btn" tool_tip="Ripristina predefiniti"/>
-	<button label="Carica sul server" name="ok_btn" tool_tip="Carica al simulatore"/>
-	<button label="Annulla" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Livello di dettaglio" name="lod_panel">
 			<text name="lod_table_header">
@@ -228,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Costo caricamento: L$ [FEE]
+	</text>
+	<button label="Imposta sui valori predefiniti" name="reset_btn" tool_tip="Imposta sui valori predefiniti"/>
+	<button label="Calcolare pesi e tariffa" name="calculate_btn" tool_tip="Calcolare pesi e tariffa"/>
+	<button label="Carica sul server" name="ok_btn" tool_tip="Carica al simulatore"/>
+	<button label="Annulla" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_model_wizard.xml b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
index b17f731089..dbf41e2daf 100644
--- a/indra/newview/skins/default/xui/it/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="PROCEDURA GUIDATA CARICA MODELLO">
 	<button label="5. Carica sul server" name="upload_btn"/>
 	<button label="4. Rivedi" name="review_btn"/>
-	<button label="3. Fisica" name="physics2_btn"/>
 	<button label="3. Fisica" name="physics_btn"/>
 	<button label="2. Ottimizza" name="optimize_btn"/>
 	<button label="1. Seleziona file" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carica modello
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Seleziona file modello
 			</text>
 		</panel>
-		<text name="description">
-			Questa procedura guidata permette di importare modelli di reticoli in Second Life.  Specificare prima un  file che contiene il modello da importare.  Second Life supporta file COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nome file:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Utenti avanzati: Gli utenti che hanno dimestichezza con gli strumenti di creazione 3D possono usare le opzioni di caricamento avanzate.
+			</text>
+			<button label="Passa a modalità avanzata" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Scegli il file del modello da caricare
 			</text>
 			<button label="Sfoglia..." label_selected="Sfoglia..." name="browse"/>
+			<text name="support_collada_text">
+				Second Life supporta file COLLADA (.dae)
+			</text>
+			<text name="dimensions_label">
+				Dimensioni (metri):
+			</text>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				ATTENZIONE:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Non sarà possibile completare il passaggio finale per il caricamento finale di questo modello sui server di Second Life. [secondlife:///app/floater/learn_more Scopri come] impostare l&apos;account per il caricamento di modelli con reticolo.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Ottimizza
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Ottimizza modello
 			</text>
 		</panel>
-		<text name="description">
-			Questa procedura guidata ha ottimizzato il modello per migliorare le prestazioni. Si possono variare i risultati dell&apos;ottimizzazione in basso o fare clic su Avanti per continuare.
+		<text name="optimize_hint">
+			Abbiamo ottimizzato il modello per migliorare le prestazioni. Se necessario, può essere regolato ulteriormente.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Generazione livello di dettaglio
+			</text>
 			<text name="high_detail_text">
 				Genera livello di dettaglio: Alto
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Anteprima modello:
+			<text name="optimize_performance_text">
+				Prestazioni
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Alto
+			<text name="optimize_faster_rendering_text">
+				Rendering più veloce
+Meno dettagli
+Peso prim più basso
+			</text>
+			<text name="optimize_accuracy_text">
+				Fedeltà
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Rendering più lento
+Più dettagli
+Peso prim più elevato
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Ricalcola geometria" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Anteprima geometria
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="preview_lod_high">
+					Molti dettagli
 				</combo_item>
-				<combo_item name="medium">
-					Medio
+				<combo_item name="preview_lod_medium">
+					Dettagli medi
 				</combo_item>
-				<combo_item name="low">
-					Basso
+				<combo_item name="preview_lod_low">
+					Meno dettagli
 				</combo_item>
-				<combo_item name="lowest">
-					Bassissimo
+				<combo_item name="preview_lod_lowest">
+					Dettaglio minimo
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Costo risorsa:    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Fisica
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Modifica fisica
 			</text>
 		</panel>
-		<text name="description">
-			La procedura guidata permette di creare una forma fisica che determina come l&apos;oggetto interagisce con altri oggetti e avatar. Impostare il comando a scorrimento sul livello di dettaglio appropriato per l&apos;uso dell&apos;oggetto:
+		<text name="physics_hint">
+			Verrà creata una forma per lo scafo esterno del modello. Regola il livello di dettaglio della forma in base al fine desiderato del modello.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Costo risorsa:       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Prestazioni
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Fisica
+			<text name="physics_faster_rendering_text">
+				Rendering più veloce
+Meno dettagli
+Peso prim più basso
 			</text>
-		</panel>
-		<text name="description">
-			Visualizza in anteprima la forma fisica in basso, quindi fai clic su Avanti per continuare.  Per modificare la forma fisica, fare clic su Indietro.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Anteprima modello:
+			<text name="physics_accuracy_text">
+				Fedeltà
+			</text>
+			<text name="physics_slower_dendering_text">
+				Rendering più lento
+Più dettagli
+Peso prim più elevato
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Alto
+			<text name="physics_example_1">
+				Esempi:
+Oggetti in movimento
+Oggetti in volo
+Veicoli
+			</text>
+			<text name="physics_example_2">
+				Esempi:
+Piccoli oggetti statici
+Oggetti meno dettagliati
+Mobili semplici
+			</text>
+			<text name="physics_example_3">
+				Esempi:
+Oggetti statici
+Oggetti dettagliati
+Edifici
+			</text>
+			<button label="Ricalcola fisica" name="recalculate_physics_btn"/>
+			<button label="Ricalcolo in corso..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Anteprima fisica
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="preview_lod2_high">
+					Molti dettagli
 				</combo_item>
-				<combo_item name="medium">
-					Medio
+				<combo_item name="preview_lod2_medium">
+					Dettagli medi
 				</combo_item>
-				<combo_item name="low">
-					Basso
+				<combo_item name="preview_lod2_low">
+					Meno dettagli
 				</combo_item>
-				<combo_item name="lowest">
-					Bassissimo
+				<combo_item name="preview_lod2_lowest">
+					Dettaglio minimo
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Costo risorsa:       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Rivedi
 			</text>
 		</panel>
-		<text name="description">
-			Rivedere i dettagli in basso, quindi fare clic su Carica per caricare il modello. Il tuo saldo in L$ verrà addebitato quando fai clic su Carica.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Anteprima modello:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impatto sul lotto o sulla regione: [EQUIV] prim equivalenti
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Alto
-				</combo_item>
-				<combo_item name="medium">
-					Medio
-				</combo_item>
-				<combo_item name="low">
-					Basso
-				</combo_item>
-				<combo_item name="lowest">
-					Bassissimo
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				All&apos;account verrà accreditata una tariffa di caricamento pari a L$ [FEE].
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Facendo clic sul pulsante Carica, confermi di possedere i diritti relativi ai materiali contenuti nel modello.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Costo risorsa:         [COST]
-		</text>
-		<text name="physics cost">
-			Costo fisica:        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Caricamento completato.
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Caricamento completato
 			</text>
 		</panel>
-		<text name="description">
-			Congratulazioni. Il modello è stato caricato correttamente  e ora puoi trovarlo nella cartella Oggetti nel tuo inventario.
+		<text name="model_uploaded_text">
+			Il modello è stato caricato.
+		</text>
+		<text name="inventory_text">
+			Puoi trovarlo nella cartella Oggetti nel tuo inventario.
+		</text>
+		<text name="charged_fee">
+			La somma di L$ [FEE] è stata addebitata sul tuo account.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Indietro" name="back"/>
 	<button label="Avanti &gt;&gt;" name="next"/>
+	<button label="Calcolare pesi e tariffa &gt;&gt;" name="calculate"/>
+	<button label="Calcolo in corso..." name="calculating"/>
 	<button label="Carica" name="upload" tool_tip="Carica al simulatore"/>
 	<button label="Annulla" name="cancel"/>
 	<button label="Chiudi" name="close"/>
@@ -193,6 +219,9 @@
 	<string name="status_idle">
 		Pausa
 	</string>
+	<string name="status_parse_error">
+		Problema nell&apos;elaborazione DAE - vedi il registro per informazioni al riguardo.
+	</string>
 	<string name="status_reading_file">
 		Caricamento in corso...
 	</string>
@@ -202,6 +231,9 @@
 	<string name="status_vertex_number_overflow">
 		Errore: numero di vertici maggiore di 65534, annullato.
 	</string>
+	<string name="bad_element">
+		Errore: elemento non valido
+	</string>
 	<string name="high">
 		Alto
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
index 05f5dfe719..ac3dc17aa3 100644
--- a/indra/newview/skins/default/xui/it/floater_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="TROVA">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Caricamento in corso...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
index aab00a26ce..489d52d3b8 100644
--- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="PARAMETRI DI DEBUG">
 	<radio_group name="boolean_combo">
-		<radio_item label="VERO" name="TRUE" value="vero"/>
-		<radio_item label="FALSO" name="FALSE" value=""/>
+		<radio_item label="VERO" name="TRUE" />
+		<radio_item label="FALSO" name="FALSE" />
 	</radio_group>
 	<color_swatch label="Colore" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index 23e01a3943..d3b1503742 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Clicca e trascina per selezionare il terreno
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Schermo
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] oggetti ( [PRIM_COUNT] prim [PE_STRING] ) selezionati
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Locale
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Globale
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Riferimento
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Accessorio
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] prim equivalenti
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Ingrandisci"/>
 	<button label="" label_selected="" name="button move" tool_tip="Sposta"/>
@@ -66,20 +57,12 @@
 	<check_box label="Modifica parti collegate" name="checkbox edit linked parts"/>
 	<button label="Collegamento" name="link_btn"/>
 	<button label="Scollega" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
-		þ: [COUNT]
-	</text>
 	<check_box label="" 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="Posiziona nella griglia" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">
-		<combo_box.item label="Rete del mondo" name="World"/>
-		<combo_box.item label="Rete locale" name="Local"/>
-		<combo_box.item label="Griglia di riferimento" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Scatto" name="checkbox snap to grid"/>
 	<button label="Opzioni..." label_selected="Opzioni..." name="Options..." tool_tip="Vedi più opzioni della griglia"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -120,23 +103,11 @@
 		Potenza
 	</text>
 	<button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/>
-	<text name="obj_count">
-		Oggetti: [COUNT]
-	</text>
-	<text name="prim_count">
-		Prim: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Set collegati: [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Costo dei set collegati attualmente selezionati come [prim],[complessità fisica]">
-		Costo: [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Oggetti: [COUNT]
+	<text name="selection_empty">
+		Nessuna selezione.
 	</text>
-	<text name="object_cost" tool_tip="Costo degli oggetti attualmente selezionati come [prim] / [complessità fisica]">
-		Costo: [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Peso fisica [PHYS_WEIGHT], costo rendering [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Generale" name="General">
@@ -360,7 +331,6 @@
 				<combo_box.item label="Toroidale" name="Torus"/>
 				<combo_box.item label="Piana" name="Plane"/>
 				<combo_box.item label="Cilindrica" name="Cylinder"/>
-				<combo_box.item label="Reticolo" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Caratteristiche" name="Features">
@@ -412,7 +382,7 @@
 			</combo_box>
 			<spinner label="Gravità" name="Physics Gravity"/>
 			<spinner label="Frizione" name="Physics Friction"/>
-			<spinner label="Densità" name="Physics Density"/>
+			<spinner label="Densità in 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restituzione" name="Physics Restitution"/>
 		</panel>
 		<panel label="Texture" name="Texture">
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index 4c440c45b6..a0e49525ea 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Nuovo!)
 	</string>
+	<string name="effect_Arena">
+		Arena
+	</string>
+	<string name="effect_Beast">
+		Bestia
+	</string>
+	<string name="effect_Buff">
+		Appassionato
+	</string>
+	<string name="effect_Buzz">
+		Euforia
+	</string>
+	<string name="effect_Camille">
+		Camilla
+	</string>
+	<string name="effect_Creepy">
+		Terrificante
+	</string>
+	<string name="effect_CreepyBot">
+		TerrificanteBot
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		ProfondoBot
+	</string>
+	<string name="effect_Demon">
+		Demonio
+	</string>
+	<string name="effect_Flirty">
+		Civettuolo
+	</string>
+	<string name="effect_Foxy">
+		Scaltro
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Halloween_2010_Bonus
+	</string>
+	<string name="effect_Helium">
+		Elio
+	</string>
+	<string name="effect_Husky">
+		Fusto
+	</string>
+	<string name="effect_Intercom">
+		Interfono
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Incubo
+	</string>
+	<string name="effect_PopBot">
+		PopBot
+	</string>
+	<string name="effect_Rachel">
+		Rachele
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Robot
+	</string>
+	<string name="effect_Roxanne">
+		Rosanna
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samanta
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Bassotto
+	</string>
+	<string name="effect_Sneaky">
+		Vile
+	</string>
+	<string name="effect_Stallion">
+		Stallone
+	</string>
+	<string name="effect_Sultry">
+		Focoso
+	</string>
+	<string name="effect_Thunder">
+		Tuono
+	</string>
+	<string name="effect_Vixen">
+		Maliziosa
+	</string>
+	<string name="effect_WhinyBot">
+		PiangiBot
+	</string>
 	<text name="preview_text">
 		Per l&apos;anteprima
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml
deleted file mode 100644
index b25f0a6266..0000000000
--- a/indra/newview/skins/default/xui/it/floater_water.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="EDITOR AVANZATO DELL&apos;ACQUA">
-	<text name="KeyFramePresetsText" width="245">
-		Impostazioni predeterminate dell&apos;acqua:
-	</text>
-	<combo_box left_delta="245" name="WaterPresetsCombo" width="150"/>
-	<button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/>
-	<button label="Salva" label_selected="Salva" name="WaterSavePreset"/>
-	<button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="IMPOSTAZIONI" name="Settings">
-			<text name="BHText">
-				Colore della nebbiosità dell&apos;acqua
-			</text>
-			<button label="?" left="209" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Clicca per aprire il selettore dei colori"/>
-			<text font="SansSerifSmall" name="WaterFogDensText">
-				Esponente di densità della nebbia
- dell&apos;acqua
-			</text>
-			<slider bottom_delta="-40" name="WaterFogDensity"/>
-			<button label="?" left="209" name="WaterFogDensityHelp"/>
-			<text bottom="-140" font="SansSerifSmall" name="WaterUnderWaterFogModText">
-				Regolatore effetto nebbia subacquea
-			</text>
-			<button label="?" left="209" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Scala di riflessione delle onde
-			</text>
-			<button label="?" left="415" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Scala Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Offset Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelOffsetHelp"/>
-			<text font="SansSerifSmall" name="DensMultText">
-				Scala di rifrazione nell&apos;acqua
- dall&apos;alto
-			</text>
-			<slider bottom_delta="-40" name="WaterScaleAbove"/>
-			<button label="?" left="650" name="WaterScaleAboveHelp"/>
-			<text bottom="-70" font="SansSerifSmall" name="WaterScaleBelowText">
-				Scala di rifrazione nell&apos;acqua
- dal basso
-			</text>
-			<slider bottom_delta="-40" name="WaterScaleBelow"/>
-			<button label="?" left="650" name="WaterScaleBelowHelp"/>
-			<text bottom="-122" name="MaxAltText">
-				Moltiplicatore della sfocatura
-			</text>
-			<button label="?" left="650" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="IMMAGINE" name="Waves">
-			<text name="BHText">
-				Direzione della grande onda
-			</text>
-			<button label="?" left="170" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direzione della piccola onda
-			</text>
-			<button label="?" left="170" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Mappatura normale
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml
deleted file mode 100644
index 6828d05be0..0000000000
--- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="EDITOR AVANZATO DEL CIELO">
-	<text name="KeyFramePresetsText" width="105">
-		Cieli predefiniti:
-	</text>
-	<combo_box left_delta="105" name="WLPresetsCombo"/>
-	<button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/>
-	<button label="Salva" label_selected="Salva" left_delta="72" name="WLSavePreset"/>
-	<button label="Elimina" label_selected="Elimina" left_delta="72" name="WLDeletePreset"/>
-	<button font="SansSerifSmall" label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" left_delta="85" name="WLDayCycleMenuButton" width="165"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFERA" name="Atmosphere">
-			<text name="BHText">
-				Blu dell&apos;Orizzonte
-			</text>
-			<button label="?" left="189" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text font="SansSerifSmall" name="BDensText">
-				Altezza della Foschia all&apos;Orizzonte
-			</text>
-			<button label="?" left="189" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densità del Blu
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densità  della Foschia
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Moltiplicatore di Densità
-			</text>
-			<button label="?" left="645" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Moltiplicatore della Distanza
-			</text>
-			<button label="?" left="645" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitudine Massima
-			</text>
-			<button label="?" left="645" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="ILLUMINAZIONE" name="Lighting">
-			<text name="SLCText">
-				Colore Sole/Luna
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posizione Sole/Luna
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiente
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Angolo Est
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Corona intorno al sole
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Focus" name="WLGlowB"/>
-			<slider label="Grandezza" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma della Scena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Luminosità  delle stelle
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUVOLE" name="Clouds">
-			<text name="WLCloudColorText">
-				Colore delle Nuvole
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Nuvole XY/Densità
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Copertura delle Nuvole
-			</text>
-			<button label="?" left="415" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Altitudine delle Nuvole
-			</text>
-			<button label="?" left="415" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Dettagli Nuvole (XY/ Densità)
-			</text>
-			<button label="?" left="415" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Scorrimento delle X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Blocca" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Scorrimento delle Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Blocca" name="WLCloudLockY"/>
-			<check_box label="Mostra le Nuvole Classiche" name="DrawClassicClouds"/>
-			<button label="?" left="645" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index bdf7d2094f..fe8bf703aa 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -17,7 +17,7 @@
 		<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
 		<menu_item_call label="Mostra messaggio critico" name="Critical"/>
 		<menu_item_call label="Test browser multimedia" name="Web Browser Test"/>
-		<menu_item_call label="Test finestra contenuti Web" name="Web Content Floater Test"/>
+		<menu_item_call label="Test debug finestra contenuti Web" name="Web Content Floater Debug Test"/>
 		<menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/>
 		<menu_item_call label="Mostra Console notifiche" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
index aae2313702..2b5c235706 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
+<toggleable_menu name="menu_group_plus">
 	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
 	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
 	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
 	<menu_item_check label="Icone persone" name="view_icons"/>
+	<menu_item_check label="Visualizza mappa" name="view_map"/>
 	<menu_item_call label="Mostra oggetti e residenti bloccati" name="show_blocked_list"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index e4df0630d9..ef40cbda7c 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="I miei gruppi" name="My Groups"/>
 		<menu_item_check label="Chat nei dintorni" name="Nearby Chat"/>
 		<menu_item_call label="Persone vicine" name="Active Speakers"/>
+		<menu_item_check label="Voce nei dintorni" name="Nearby Voice"/>
 	</menu>
 	<menu label="Mondo" name="World">
 		<menu_item_check label="Mini mappa" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="Mezzogiorno" name="Noon"/>
 			<menu_item_call label="Tramonto" name="Sunset"/>
 			<menu_item_call label="Mezzanotte" name="Midnight"/>
-			<menu_item_call label="Orario della proprietà" name="Revert to Region Default"/>
-			<menu_item_call label="Editor dell&apos;ambiente" name="Environment Editor"/>
+		</menu>
+		<menu label="Editor ambiente" name="Enviroment Editor">
+			<menu_item_call label="Impostazioni ambiente..." name="Enviroment Settings"/>
+			<menu label="Valori predefiniti acqua" name="Water Presets">
+				<menu_item_call label="Nuovo valore predefinito..." name="new_water_preset"/>
+				<menu_item_call label="Modifica valori predefiniti..." name="edit_water_preset"/>
+				<menu_item_call label="Cancella valore predefinito..." name="delete_water_preset"/>
+			</menu>
+			<menu label="Valori predefiniti cielo" name="Sky Presets">
+				<menu_item_call label="Nuovo valore predefinito..." name="new_sky_preset"/>
+				<menu_item_call label="Modifica valori predefiniti..." name="edit_sky_preset"/>
+				<menu_item_call label="Cancella valore predefinito..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="Valori predefiniti giornata" name="Day Presets">
+				<menu_item_call label="Nuovo valore predefinito..." name="new_day_preset"/>
+				<menu_item_call label="Modifica valori predefiniti..." name="edit_day_preset"/>
+				<menu_item_call label="Cancella valore predefinito..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="Costruisci" name="BuildTools">
@@ -142,7 +159,6 @@
 		<menu_item_check label="Disabilita vincoli fotocamera" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto ad alta risoluzione" name="HighResSnapshot"/>
 		<menu_item_check label="Manda foto su disco senza avvisi" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Comprimi le foto su disco" name="CompressSnapshotsToDisk"/>
 		<menu label="Strumenti di performance" name="Performance Tools">
 			<menu_item_call label="Misuratore lag" name="Lag Meter"/>
 			<menu_item_check label="Barra statistiche" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
index 7c8eef64e5..de25f88aca 100644
--- a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
+<toggleable_menu name="Gear Wearing">
 	<menu_item_call label="Modifica vestiario" name="edit"/>
 	<menu_item_call label="Togli" name="takeoff"/>
-</menu>
+	<menu_item_call label="Copia gruppo vestiti negli Appunti" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index f50051c004..d09f207af2 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -1555,6 +1555,11 @@ Riprova più tardi.
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		Hai cercato di fare [OFFERS] offerte di teleport,
+più del limite [LIMIT].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
 		Chiedere, in qualità di Admin, al residente di raggiungerti?
 		<form name="form">
@@ -1977,6 +1982,10 @@ Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare quest
 		Vuoi veramente eliminare la cronologia viaggi, web e ricerche fatte?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		Sei sicuro di volere cancellare la cache del viewer?
+		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		Confermi di volere cancellare i tuoi cookie?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Si"/>
@@ -2002,48 +2011,30 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 		Vuoi sovrascrivere le preimpostazioni salvate?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		Vuoi cancellare [SKY]?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
-	</notification>
 	<notification name="WLNoEditDefault">
 		Non puoi modificare o cancellare una preimpostazione di fabbrica.
 	</notification>
 	<notification name="WLMissingSky">
 		Questo file di ciclo giornaliero fa riferimento ad un file di cielo mancante: [SKY].
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		Effetto di post elaborazione già presente. Vuoi sovrascrivere?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
+	<notification name="WLRegionApplyFail">
+		Queste impostazioni non possono essere applicare alla regione.  Uscendo dalla regione e ritornandoci potrebbe risolvere il problema.  Il motivo fornito: [FAIL_REASON]
 	</notification>
-	<notification name="NewSkyPreset">
-		Fornisci il nome per il nuovo cielo.
-		<form name="form">
-			<input name="message">
-				Nuova preimpostazione
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annulla"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		La preimpostazione esiste già!
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		Impossibile cancellare l&apos;ultima chiave in questo ciclo giornata. Il ciclo giornata non può essere vuoto.  Invece di cancellare la chiave restante, modificala e quindi creane una nuova.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		Fornisci il nome per la nuova preregolazione del livello dell&apos;acqua.
-		<form name="form">
-			<input name="message">
-				Nuova preimpostazione
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annulla"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		Non puoi aggiungere altri frame chiave a questo ciclo giornata.  Il numero massimo di frame chiave per i cicli giornata nell&apos;ambito [SCOPE] è [MAX].
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		La preimpostazione esiste già!
+	<notification name="EnvUpdateRate">
+		Puoi aggiornare le impostazioni dell&apos;ambiente della regione ogni [WAIT] secondi.  Attendi e riprova.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		Non puoi modificare o cancellare una preimpostazione.
+	<notification name="PPSaveEffectAlert">
+		Effetto di post elaborazione già presente. Vuoi sovrascrivere?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		Impossibile iniziare una nuova sessione di chat con [RECIPIENT].
@@ -2072,13 +2063,14 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 		<usetemplate ignoretext="Indossare gli abiti che creo mentre modifico il mio aspetto" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Per entrare in questa zona, devi avere eseguito la verifica dell&apos;età.  Vuoi andare sul sito di [SECOND_LIFE] per verificare la tua età?
+		Per accedere ai contenuti e alle aree per adulti in Second Life devi avere almeno 18 anni. Visita la pagina di verifica dell&apos;età per confermare di avere almeno 18 anni. 
+Verrà avviato il browser Web.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=it
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="Annulla" yestext="Passa alla verifica dell&apos;età"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Per poter visitare questa zona devi avere devi aver fornito informazioni di pagamento a Linden Lab.  Vuoi andare sul sito di [SECOND_LIFE] ed impostarle?
@@ -2334,6 +2326,9 @@ Qui non puoi volare.
 	<notification name="NoBuild">
 		In questa zona è proibita la costruzione. Qui non puoi costruire né rezzare oggetti.
 	</notification>
+	<notification name="SeeAvatars">
+		In questo lotto non si possono vedere avatar e chat di testo presenti in altri lotti.   Non puoi vedere altri residenti fuori dal lotto e loro non possono vederti.  Viene bloccata anche la normale chat di testo sul canale 0.
+	</notification>
 	<notification name="ScriptsStopped">
 		Un amministratore ha temporaneamente disabilitato gli script in questa regione.
 	</notification>
@@ -2425,7 +2420,7 @@ Riprova tra qualche istante.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Un oggetto denominato &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; di proprietà di [NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Prendi"/>
 			<button name="Discard" text="Rifiuta"/>
@@ -2758,7 +2753,15 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 		Scegli i residenti con i quali condividere.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+		[LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER] 
+
+Per informazioni dettagliate, vedi il file del registro.
+	</notification>
+	<notification name="MeshUploadPermError">
+		Errore durante la richiesta di autorizzazione al caricamento del reticolo.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Non è stata ottenuta la capacità della regione &apos;[CAPABILITY]&apos;.
 	</notification>
 	<notification name="ShareItemsConfirmation">
 		Sei sicuro di volere condividere gli oggetti
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
index 8e464ca037..145b8cf4e3 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Salva luogo preferito" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annulla" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml
index e5194e95d7..d0c275e29f 100644
--- a/indra/newview/skins/default/xui/it/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_list.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/all/[SEARCH_TERM] Cerca]."/>
+		<no_visible_tabs_text name="no_outfits_msg" value="Non hai ancora vestiario da indossare. Prova [secondlife:///app/search/all Cerca]."/>
+	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/>
+		<menu_button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/>
 		<button name="trash_btn" tool_tip="Elimina il vestiario selezionato"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index b24a4055f7..f903ae6e2c 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -66,16 +66,16 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
index c4ffe6af85..890dfc2458 100644
--- a/indra/newview/skins/default/xui/it/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml
@@ -64,6 +64,8 @@
 						<text name="scripts_value" value="Attivo"/>
 						<text name="damage_label" value="Danni:"/>
 						<text name="damage_value" value="Disattivato"/>
+						<text name="see_avatars_label" value="Vedi avatar:"/>
+						<text name="see_avatars_value" value="Disattiva"/>
 						<button label="Informazioni sui terreni" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml
index 61830f186f..69995fb5de 100644
--- a/indra/newview/skins/default/xui/it/panel_places.xml
+++ b/indra/newview/skins/default/xui/it/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Mostra ulteriori opzioni"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="Profilo" name="profile_btn" tool_tip="Mostra il profilo del luogo"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
index b628a29206..224780f234 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		Cache:
+	</text>
+	<spinner label="Dimensione cache (64 - 9984 MB)" name="cachesizespinner"/>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="Pulizia della cache" label_selected="Pulizia della cache" name="clear_cache"/>
+	<text name="Cache location">
+		Ubicazione della cache:
+	</text>
+	<button label="Sfoglia" label_selected="Sfoglia" name="set_cache"/>
+	<button label="Posizione predefinita" label_selected="Posizione predefinita" name="default_cache_location"/>
 	<text name="UI Size:">
 		Dimensioni UI:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
index bbfae5e9e8..d00512aaf7 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
@@ -19,6 +19,7 @@
 	<check_box label="Abilitato" name="enable_voice_check"/>
 	<check_box label="Consenti riproduzione multimediale automatica" name="media_auto_play_btn" tool_tip="Seleziona qui per consentire la riproduzione multimediale automatica" value="true"/>
 	<check_box label="Riproduci media in uso da altri avatar" name="media_show_on_others_btn" tool_tip="Deseleziona qui per nascondere i media in uso dagli altri avatar nei dintorni" value="true"/>
+	<check_box label="Riproduci suoni dai gesti" name="gesture_audio_play_btn" tool_tip="Seleziona per ascoltare i suoni dai gesti" value="true"/>
 	<text name="voice_chat_settings">
 		Impostazioni Chat vocale
 	</text>
@@ -35,28 +36,5 @@
 	<button label="Imposta tasto" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Reimposta sul pulsante centrale del mouse"/>
 	<button label="Dispositivi di Input/Output" name="device_settings_btn" width="165"/>
-	<panel label="Impostazioni del dispositivo" name="device_settings_panel">
-		<panel.string name="default_text">
-			Predefinito
-		</panel.string>
-		<panel.string name="default system device">
-			Dispositivo di sistema predefinito
-		</panel.string>
-		<panel.string name="no device">
-			Nessun dispositivo
-		</panel.string>
-		<text name="Input">
-			Input
-		</text>
-		<text name="My volume label">
-			Il mio volume:
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia il volume utilizzando questa barra"/>
-		<text name="wait_text">
-			Attendi
-		</text>
-		<text name="Output">
-			Output
-		</text>
-	</panel>
+	<panel label="Impostazioni del dispositivo" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml
new file mode 100644
index 0000000000..81bc8253f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ambiente" name="panel_env_info">
+	<text name="water_settings_title">
+		Seleziona le impostazioni del ciclo dell&apos;acqua e del cielo/giornata che vuoi che vedano tutti coloro che visitano la tua regione.  Maggiori informazioni
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Usa valori predefiniti di Second Life" name="use_sl_default_settings"/>
+		<radio_item label="Usa le impostazioni seguenti" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Impostazione Acqua
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciclo cielo / giornata
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Cielo fisso" name="my_sky_settings"/>
+			<radio_item label="Ciclo giornata" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Seleziona un valore predefinito-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="Applica" name="apply_btn"/>
+	<button label="Annulla" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index 92044bae11..c61ac3ecce 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -7,21 +7,56 @@
 		sconosciuto
 	</text>
 	<spinner label="Altezza dell&apos;acqua" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Limite di altezza del &#10;terreno" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite di abbassamento &#10;del terreno" name="terrain_lower_spin" bottom_delta="-34"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Usa il sole della regione" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Sole fisso" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Fase" name="sun_hour_slider"/>
-	<button label="Applica" name="apply_btn"/>
+	<spinner label="Limite di altezza del 
+terreno" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Limite di abbassamento 
+del terreno" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Texture terreno (richiede file 512x512, 24 bit .tga)
+	</text>
+	<text name="height_text_lbl">
+		1 (basso)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Alto)
+	</text>
+	<text name="height_text_lbl5">
+		Intervalli altitudine texture
+	</text>
+	<text name="height_text_lbl10">
+		Questi valori indicano la gamma di miscele per le texture di cui sopra.
+	</text>
+	<text name="height_text_lbl11">
+		Misurato in metri, il valore BASSO è la MASSIMA altezza della texture n. 1, e il valore ALTO è l&apos;altezza MINIMA della texture n. 4.
+	</text>
+	<text name="height_text_lbl6">
+		Nordovest
+	</text>
+	<text name="height_text_lbl7">
+		Nordest
+	</text>
+	<spinner label="Basso" name="height_start_spin_1"/>
+	<spinner label="Basso" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sudovest
+	</text>
+	<text name="height_text_lbl9">
+		Sudest
+	</text>
+	<spinner label="Basso" name="height_start_spin_0"/>
+	<spinner label="Basso" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
 	<button label="Scarica terreno RAW..." name="download_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
-	<button label="?" name="download_raw_help"/>
 	<button label="Carica terreno RAW..." name="upload_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/>
-	<button label="?" name="upload_raw_help"/>
-	<button width="170" label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/>
-	<button left="190" label="?" name="bake_terrain_help"/>
+	<button label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento" width="170"/>
+	<button label="Applica" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
index 8e7f0c8dc5..b1934fd515 100644
--- a/indra/newview/skins/default/xui/it/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Predefinito
 	</panel.string>
+	<string name="name_no_device">
+		Nessun dispositivo
+	</string>
+	<string name="name_default_system_device">
+		Dispositivo di sistema predefinito
+	</string>
 	<text name="Input">
 		Input
 	</text>
+	<text name="Output">
+		Output
+	</text>
 	<text name="My volume label">
 		Il mio volume:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Attendi
 	</text>
-	<text name="Output">
-		Output
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
index 1c1744d94b..72ca2f6d68 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Cose" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						Elementi ricevuti ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						Elementi ricevuti
+					</string>
+					<button label="Elementi ricevuti" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] nuovi
+					</text>
+					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+						<text name="inbox_inventory_placeholder">
+							Gli acquisti dal mercato verranno consegnati qui.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+			<layout_panel name="outbox_layout_panel">
+				<panel label="" name="marketplace_outbox">
+					<button label="Casella uscita commercianti" name="outbox_btn"/>
+					<button label="" name="outbox_sync_btn" tool_tip="Sposta al mercato"/>
+					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
+						<text name="outbox_inventory_placeholder">
+							Imposta il tuo account commercianti per usare questa funzione.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index cbe8ef24c4..1d335e55a6 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -31,6 +31,9 @@
 	<string name="StartupInitializingVFS">
 		Inizializzazione VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica!
+	</string>
 	<string name="ProgressRestoring">
 		Ripristino in corso...
 	</string>
@@ -85,6 +88,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime configurato con successo.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Richiesta capacità regione...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Richiesta capacità regione, tentativo [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		In attesa della risposta della regione...
 	</string>
@@ -1177,6 +1186,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="InventoryNoTexture">
 		Non hai una copia di questa texture nel tuo inventario
 	</string>
+	<string name="InventoryInboxNoItems">
+		Gli elementi acquistati attraverso il mercato verranno consegnati qui
+	</string>
+	<string name="InventoryOutboxNoItems">
+		Trascina gli elementi qui per poi elencarli nel tuo mercato.
+	</string>
 	<string name="no_transfer" value="(nessun trasferimento)"/>
 	<string name="no_modify" value="(nessuna modifica)"/>
 	<string name="no_copy" value="(nessuna copia)"/>
@@ -1217,9 +1232,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="InvFolder My Inventory">
 		Il mio inventario
 	</string>
-	<string name="InvFolder My Favorites">
-		I miei preferiti
-	</string>
 	<string name="InvFolder Library">
 		Libreria
 	</string>
@@ -1278,10 +1290,10 @@ Prova ad accedere nuovamente tra un minuto.
 		Gesture
 	</string>
 	<string name="InvFolder Favorite">
-		Preferiti
+		I miei preferiti
 	</string>
 	<string name="InvFolder favorite">
-		Preferiti
+		I miei preferiti
 	</string>
 	<string name="InvFolder Current Outfit">
 		Abbigliamento attuale
@@ -1304,6 +1316,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="InvFolder All">
 		Tutto
 	</string>
+	<string name="no_attachments">
+		Nessun allegato indossato
+	</string>
 	<string name="Buy">
 		Acquista
 	</string>
@@ -1613,6 +1628,9 @@ Prova ad accedere nuovamente tra un minuto.
 	</string>
 	<string name="SummaryForTheWeek" value="Riassunto della settimana, partendo dal "/>
 	<string name="NextStipendDay" value=". Il prossimo giorno di stipendio è "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="Gruppo       Dividendi individuali"/>
 	<string name="GroupColumn" value="Gruppo"/>
 	<string name="Balance">
@@ -1639,6 +1657,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="IMTeen">
 		teen
 	</string>
+	<string name="Anyone">
+		chiunque
+	</string>
 	<string name="RegionInfoError">
 		errore
 	</string>
@@ -1846,7 +1867,7 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="RegionNoCovenantOtherOwner">
 		Non esiste alcun regolamento per questa proprietà. Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab.  Contatta il proprietario del terreno per i dettagli della vendita.
 	</string>
-	<string name="covenant_last_modified" value="Ultima modifica:"/>
+	<string name="covenant_last_modified" value="Ultima modifica: "/>
 	<string name="none_text" value="(nessuno)"/>
 	<string name="never_text" value="(mai)"/>
 	<string name="GroupOwned">
@@ -1855,6 +1876,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="Public">
 		Pubblica
 	</string>
+	<string name="LocalSettings">
+		Impostazioni locali
+	</string>
+	<string name="RegionSettings">
+		Impostazioni regione
+	</string>
 	<string name="ClassifiedClicksTxt">
 		Clicca: [TELEPORT] teleport, [MAP] mappa, [PROFILE] profilo
 	</string>
@@ -1927,6 +1954,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDebits">
 		Debiti
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Contenuto
 	</string>
@@ -3643,6 +3673,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="LocationCtrlGeneralIconTooltip">
 		Regione generale
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		Avatar visibili e chat consentita fuori di questo lotto
+	</string>
 	<string name="UpdaterWindowTitle">
 		Aggiornamento [APP_NAME]
 	</string>
@@ -4056,6 +4089,87 @@ Segnala abuso
 	<string name="Female - Wow">
 		Femmina - Accipicchia
 	</string>
+	<string name="/bow">
+		/inchino
+	</string>
+	<string name="/clap">
+		/applausi
+	</string>
+	<string name="/count">
+		/numero
+	</string>
+	<string name="/extinguish">
+		/estingui
+	</string>
+	<string name="/kmb">
+		/chissene
+	</string>
+	<string name="/muscle">
+		/muscolo
+	</string>
+	<string name="/no">
+		/no
+	</string>
+	<string name="/no!">
+		/no!
+	</string>
+	<string name="/paper">
+		/carta
+	</string>
+	<string name="/pointme">
+		/indicome
+	</string>
+	<string name="/pointyou">
+		/indicotu
+	</string>
+	<string name="/rock">
+		/sasso
+	</string>
+	<string name="/scissor">
+		/forbici
+	</string>
+	<string name="/smoke">
+		/fumo
+	</string>
+	<string name="/stretch">
+		/stiracchiata
+	</string>
+	<string name="/whistle">
+		/fischietto
+	</string>
+	<string name="/yes">
+		/si
+	</string>
+	<string name="/yes!">
+		/si!
+	</string>
+	<string name="afk">
+		non alla tastiera
+	</string>
+	<string name="dance1">
+		danza1
+	</string>
+	<string name="dance2">
+		danza2
+	</string>
+	<string name="dance3">
+		danza3
+	</string>
+	<string name="dance4">
+		danza4
+	</string>
+	<string name="dance5">
+		danza5
+	</string>
+	<string name="dance6">
+		danza6
+	</string>
+	<string name="dance7">
+		danza7
+	</string>
+	<string name="dance8">
+		danza8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 2f578862d3..e870a8ace9 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -133,12 +133,12 @@
 				誤
 			</text>
 			<button label="土地の購入" label_selected="土地を購入..." left="130" name="Buy Land..." width="100"/>
+			<button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
 			<button label="スクリプト情報" name="Scripts..." width="100"/>
 			<button label="グループに購入" label_selected="グループ用に購入..." name="Buy For Group..."/>
 			<button label="入場許可を購入" label_selected="入場許可を購入..." left="130" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="100"/>
 			<button label="土地の放棄" label_selected="土地を放棄..." name="Abandon Land..."/>
 			<button label="土地を取り戻す" label_selected="土地の返還を要求..." name="Reclaim Land..."/>
-			<button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
 		</panel>
 		<panel label="約款" name="land_covenant_panel">
 			<panel.string name="can_resell">
@@ -310,6 +310,9 @@
 			<panel.string name="push_restrict_region_text">
 				プッシュ禁止 （地域設定優先）
 			</panel.string>
+			<panel.string name="see_avs_text">
+				この区画にいる住人と会ってチャットする
+			</panel.string>
 			<text name="allow_label">
 				他の住人への許可：
 			</text>
@@ -372,6 +375,10 @@
 				スナップショット：
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
+			<text name="allow_label5">
+				他の区画にいる住人への許可：
+			</text>
+			<check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="他の区画の住人が、この区画にいる住人に会ってチャットすることを許可し、あなたもそれら住人に会ってチャットできるようにします。"/>
 			<text name="landing_point">
 				着地点: [LANDING]
 			</text>
@@ -428,6 +435,11 @@
 				サウンド：
 			</text>
 			<check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				アバターのサウンド：
+			</text>
+			<check_box label="全員" name="all av sound check"/>
+			<check_box label="グループ" name="group av sound check"/>
 			<text name="Voice settings:">
 				ボイス：
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 8cb67ca521..6865409e7a 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="グリッドオプション">
-	<spinner label="グリッド単位（メートル）" name="GridResolution"/>
-	<spinner label="グリッドﾞ範囲（メートル）" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		画面
+	</floater.string>
+	<floater.string name="grid_local_text">
+		ローカル
+	</floater.string>
+	<floater.string name="grid_world_text">
+		世界
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		リファレンス
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		アタッチメント
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="グリッドの不透明度">
+		モード
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択">
+		<combo_box.item label="インワールドグリッド" name="World"/>
+		<combo_box.item label="ローカルグリッド" name="Local"/>
+		<combo_box.item label="リファレンスグリッド" name="Reference"/>
+	</combo_box>
+	<spinner label="単位（メートル）" name="GridResolution"/>
+	<spinner label="範囲（メートル）" name="GridDrawSize"/>
 	<check_box label="より細かい単位でスナップフィット" name="GridSubUnit"/>
 	<check_box label="横断面を表示" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="グリッドの不透明度">
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
deleted file mode 100644
index b0949cd4e0..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="デイサイクル編集">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="デイサイクル" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				深夜 12時
-			</text>
-			<text name="WL3am">
-				午前 3時
-			</text>
-			<text name="WL6am">
-				午前 6時
-			</text>
-			<text name="WL9amHash">
-				午前 9時
-			</text>
-			<text name="WL12pmHash">
-				正午 12時
-			</text>
-			<text name="WL3pm">
-				午後 3時
-			</text>
-			<text name="WL6pm">
-				午後 6時
-			</text>
-			<text name="WL9pm">
-				午後 9時
-			</text>
-			<text name="WL12am2">
-				深夜 12時
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="キーの追加" label_selected="キーの追加" name="WLAddKey"/>
-			<button label="キーの削除" label_selected="キーの削除" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				キーフレームの設定：
-			</text>
-			<text name="WLCurKeyTimeText">
-				キータイム：
-			</text>
-			<spinner label="時間" name="WLCurKeyHour"/>
-			<spinner label="分" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				キーの事前設定：
-			</text>
-			<combo_box label="事前設定" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				スナップ：
-			</text>
-			<combo_box label="5 分" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				サイクルの長さ：
-			</text>
-			<spinner label="時間" name="WLLengthOfDayHour"/>
-			<spinner label="分" name="WLLengthOfDayMin"/>
-			<spinner label="秒" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				プレビュー：
-			</text>
-			<button label="再生" label_selected="再生" name="WLAnimSky"/>
-			<button label="停止" label_selected="停止" name="WLStopAnimSky"/>
-			<button label="不動産の時刻を使用" label_selected="不動産の時刻に変更" name="WLUseLindenTime"/>
-			<button label="デイテストを保存" label_selected="デイテストを保存" name="WLSaveDayCycle"/>
-			<button label="デイテストをロード" label_selected="デイテストをロード" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..eb39d1b336
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="環境の事前設定を削除">
+	<string name="title_water">
+		水の事前設定を削除
+	</string>
+	<string name="title_sky">
+		空の事前設定を削除
+	</string>
+	<string name="title_day_cycle">
+		デイサイクルを削除
+	</string>
+	<string name="label_water">
+		事前設定：
+	</string>
+	<string name="label_sky">
+		事前設定：
+	</string>
+	<string name="label_day_cycle">
+		デイサイクル：
+	</string>
+	<string name="msg_confirm_deletion">
+		選択された事前設定を削除しますか？
+	</string>
+	<string name="msg_sky_is_referenced">
+		デイサイクルの参照先として使われている事前設定は削除できません。
+	</string>
+	<string name="combo_label">
+		- 事前設定を選択 -
+	</string>
+	<text name="label">
+		事前設定：
+	</text>
+	<button label="削除" name="delete"/>
+	<button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..fd601672b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="デイサイクルを編集">
+	<string name="title_new">
+		新たなデイサイクルを作成
+	</string>
+	<string name="title_edit">
+		デイサイクルを編集
+	</string>
+	<string name="hint_new">
+		新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="hint_edit">
+		自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="combo_label">
+		- 事前設定を選択 -
+	</string>
+	<text name="label">
+		事前設定の名前：
+	</text>
+	<text name="note">
+		注意：自分で作成した事前設定の名前を変更すると、新しい事前設定が別に作成されるだけで、元の事前設定は変更されません。
+	</text>
+	<text name="hint_item1">
+		- 特定の空の設定や時間を編集するにはタブを1つクリックします。
+	</text>
+	<text name="hint_item2">
+		- 移行時間を設定するにはタブをクリックしてドラッグします。
+	</text>
+	<text name="hint_item3">
+		- デイサイクルをプレビューするにはスクラバーを使います。
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="キーの追加" label_selected="キーの追加" name="WLAddKey"/>
+		<button label="キーの削除" label_selected="キーの削除" name="WLDeleteKey"/>
+		<text name="WL12am">
+			12am
+		</text>
+		<text name="WL3am">
+			3am
+		</text>
+		<text name="WL6am">
+			6am
+		</text>
+		<text name="WL9amHash">
+			9am
+		</text>
+		<text name="WL12pmHash">
+			12pm
+		</text>
+		<text name="WL3pm">
+			3pm
+		</text>
+		<text name="WL6pm">
+			6pm
+		</text>
+		<text name="WL9pm">
+			9pm
+		</text>
+		<text name="WL12am2">
+			12am
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		空の設定：
+	</text>
+	<combo_box label="事前設定" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		時間：
+	</text>
+	<time name="time" value="6:00 AM"/>
+	<check_box label="これを新しいデイサイクルにする" name="make_default_cb"/>
+	<button label="保存" name="save"/>
+	<button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..68d0c70baa
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="空の事前設定を編集">
+	<string name="title_new">
+		新しい空の事前設定を作成
+	</string>
+	<string name="title_edit">
+		空の事前設定を編集
+	</string>
+	<string name="hint_new">
+		新しい事前設定に名前をつけ、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="hint_edit">
+		空の事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="combo_label">
+		- 事前設定を選択 -
+	</string>
+	<text name="hint">
+		事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。
+	</text>
+	<text name="label">
+		事前設定の名前：
+	</text>
+	<text name="note">
+		注意：自分で作成した事前設定の名前を変更すると、新しい事前設定が別に作成されるだけで、元の事前設定は変更されません。
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="大気" name="Atmosphere">
+			<text name="BHText">
+				空の配色
+			</text>
+			<text name="BDensText">
+				空と遠景の露光
+			</text>
+			<text name="BDensText2">
+				空の配色と濃度
+			</text>
+			<text name="HDText">
+				大気の不透明度
+			</text>
+			<text name="DensMultText">
+				大気の不透明度の増幅
+			</text>
+			<text name="WLDistanceMultText">
+				視界の増幅
+			</text>
+			<text name="MaxAltText">
+				最大高度
+			</text>
+		</panel>
+		<panel label="ライティング" name="Lighting">
+			<text name="SLCText">
+				太陽/月の色
+			</text>
+			<text name="WLAmbientText">
+				風
+			</text>
+			<text name="SunGlowText">
+				太陽の輝き
+			</text>
+			<slider label="焦点" name="WLGlowB"/>
+			<slider label="サイズ" name="WLGlowR"/>
+			<text name="WLStarText">
+				星の輝き
+			</text>
+			<text name="SceneGammaText">
+				風景ガンマ
+			</text>
+			<text name="TODText">
+				太陽/月の位置
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				12am
+			</text>
+			<text name="WL6am">
+				6am
+			</text>
+			<text name="WL12pmHash">
+				12pm
+			</text>
+			<text name="WL6pm">
+				6pm
+			</text>
+			<text name="WL12am2">
+				12am
+			</text>
+			<time name="WLDayTime" value="6:00 AM"/>
+			<text name="WLEastAngleText">
+				東の角度
+			</text>
+		</panel>
+		<panel label="雲" name="Clouds">
+			<text name="WLCloudColorText">
+				雲の色
+			</text>
+			<text name="WLCloudColorText2">
+				雲のXY/密度
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				雲の量
+			</text>
+			<text name="WLCloudScaleText">
+				雲のスケール
+			</text>
+			<text name="WLCloudDetailText">
+				雲の詳細（XY/密度）
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				雲の移動速度（X方向）
+			</text>
+			<check_box label="ロック" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				雲の移動速度（Y 方向）
+			</text>
+			<check_box label="ロック" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="この事前設定を新しい空の設定にする" name="make_default_cb"/>
+	<button label="保存" name="save"/>
+	<button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..eddfbd4298
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="水の事前設定を編集">
+	<string name="title_new">
+		新しい水の事前設定を作成
+	</string>
+	<string name="title_edit">
+		水の事前設定を編集
+	</string>
+	<string name="hint_new">
+		新しい事前設定に名前をつけ、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="hint_edit">
+		水の事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。
+	</string>
+	<string name="combo_label">
+		- 事前設定を選択 -
+	</string>
+	<text name="hint">
+		事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。
+	</text>
+	<text name="label">
+		事前設定の名前：
+	</text>
+	<text name="note">
+		注意：自分で作成した事前設定の名前を変更すると、新しい事前設定が別に作成されるだけで、元の事前設定は変更されません。
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			水中のフォグ効果の色
+		</text>
+		<text name="water_fog_density_label">
+			水中の透明度指数
+		</text>
+		<text name="underwater_fog_modifier_label">
+			水中のフォグ効果加減
+		</text>
+		<text name="BHText">
+			大波の方向
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			さざ波の反射スケール
+		</text>
+		<text name="HDText">
+			フレネル・スケール
+		</text>
+		<text name="FresnelOffsetText">
+			フレネル・オフセット
+		</text>
+		<text name="BHText2">
+			小波の方向
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			水面の屈折スケール
+		</text>
+		<text name="WaterScaleBelowText">
+			水中の屈折スケール
+		</text>
+		<text name="MaxAltText">
+			不透明度の増幅
+		</text>
+		<text name="BHText3">
+			ノーマル・マップ
+		</text>
+	</panel>
+	<check_box label="この事前設定を新しい水の設定にする" name="make_default_cb"/>
+	<button label="保存" name="save"/>
+	<button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_env_settings.xml b/indra/newview/skins/default/xui/ja/floater_env_settings.xml
deleted file mode 100644
index 1d5f26a6eb..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="自然環境エディター">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		時刻
-	</text>
-	<text name="EnvTimeText2">
-		正午 12:00
-	</text>
-	<text name="EnvCloudText">
-		雲の量
-	</text>
-	<text name="EnvWaterColorText">
-		水の色
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="クリックしてカラーピッカーを開きます"/>
-	<text name="EnvWaterFogText">
-		水中照度
-	</text>
-	<button label="不動産の時刻を使用" name="EnvUseEstateTimeButton"/>
-	<button label="空の高度な設定" name="EnvAdvancedSkyButton"/>
-	<button label="水の高度な設定" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
new file mode 100644
index 0000000000..0e3803119f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="自然環境の設定">
+	<text name="note">
+		ビューワの自然環境の設定は以下のオプションを使ってカスタマイズできます。
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="リージョンの設定を使用" name="use_region_settings"/>
+		<radio_item label="自然環境をカスタマイズ" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			注意：カスタム設定は他のユーザーには見えません。
+		</text>
+		<text name="water_settings_title">
+			水の設定
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="- 事前設定を選択 -" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			空 / デイサイクル
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="空の固定" name="my_sky_settings"/>
+			<radio_item label="デイサイクル" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="- 事前設定を選択 -" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="- 事前設定を選択 -" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="OK" name="ok_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 5eb141a28c..07667bb697 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -3,6 +3,9 @@
 	<string name="status_idle">
 		待機状態
 	</string>
+	<string name="status_parse_error">
+		Dae に問題が見つかりました - 詳細についてはログをご参照ください。
+	</string>
 	<string name="status_reading_file">
 		ローディング...
 	</string>
@@ -12,6 +15,9 @@
 	<string name="status_vertex_number_overflow">
 		エラー：頂点の数が65534を超過したので中止されました。
 	</string>
+	<string name="bad_element">
+		エラー：要素が無効です
+	</string>
 	<string name="high">
 		高
 	</string>
@@ -54,6 +60,9 @@
 	<string name="simplifying">
 		単純化
 	</string>
+	<string name="tbd">
+		未定
+	</string>
 	<text name="name_label">
 		名前：
 	</text>
@@ -74,23 +83,26 @@
 			描画詳細度：最低
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			リソース料金： [COST]
-		</text>
-		<text name="physics cost">
-			物理効果料金： [COST]
-		</text>
-		<text name="upload fee">
-			アップロード手数料：該当なし
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		警告：
+	</text>
+	<text name="warning_message">
+		このモデルを Second Life サーバーにアップロードすることはできません。メッシュモデルのアップロード手順については [[VURL] こちらを参照してください]。
+	</text>
+	<text name="weights_text">
+		ダウンロード：
+物理演算：
+サーバー負荷：
+
+プリム換算：
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="デフォルト" name="reset_btn" tool_tip="デフォルトにリセット"/>
-	<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
-	<button label="取り消し" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="描画詳細度" name="lod_panel">
 			<text name="lod_table_header">
@@ -228,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		アップロード料金：L$ [FEE]
+	</text>
+	<button label="デフォルトに設定" name="reset_btn" tool_tip="デフォルトに設定"/>
+	<button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算"/>
+	<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
+	<button label="取り消し" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
index a785172f20..2f336fcbde 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="モデルウィザードをアップロード">
 	<button label="5. アップロード" name="upload_btn"/>
 	<button label="4. 確認" name="review_btn"/>
-	<button label="3. 物理効果" name="physics2_btn"/>
 	<button label="3. 物理効果" name="physics_btn"/>
 	<button label="2. 最適化" name="optimize_btn"/>
 	<button label="1. ファイルを選択" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				モデルをアップロード
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				モデルファイルを選択
 			</text>
 		</panel>
-		<text name="description">
-			このウィザードを使うと、メッシュモデルを簡単にSecond Lifeにインポートできます。まず、インポートするモデルを含むファイルを指定します。Second Life は COLLADA (.dae) ファイルをサポートします。
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				ファイル名：
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				上級ユーザーの場合：3D コンテンツの制作ツールを使い慣れた方は、高度なアップローダーもお試しください。
+			</text>
+			<button label="アドバンスモードに切り替える" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				アップロードするモデルファイルの選択
 			</text>
 			<button label="参照" label_selected="参照" name="browse"/>
+			<text name="support_collada_text">
+				Second Life は COLLADA (.dae) ファイルをサポートします。
+			</text>
+			<text name="dimensions_label">
+				サイズ（メートル）：
+			</text>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				警告：
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				このモデルを Second Life サーバーにアップロードするための最終手順を実行できません。[secondlife:///app/floater/learn_more こちらを参照して]、メッシュモデルをアップロードできるようにアカウントを設定してください。
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				最適化
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				モデルを最適化
 			</text>
 		</panel>
-		<text name="description">
-			ウィザードがモデルを最適化し、パフォーマンスを改善しました。以下で最適化プロセスの結果を変更するか、「次へ」をクリックして続けます。
+		<text name="optimize_hint">
+			パフォーマンスを重視してモデルを最適化しました。必要に応じて調整してください。
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				次の描画詳細度を作成
+			</text>
 			<text name="high_detail_text">
 				次の描画詳細度を作成：高
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				モデルのプレビュー：
+			<text name="optimize_performance_text">
+				パフォーマンス
+			</text>
+			<text name="optimize_faster_rendering_text">
+				レンダリング速度の向上
+詳細度の低下
+プリム換算ウェイトの軽減
+			</text>
+			<text name="optimize_accuracy_text">
+				正確さ
+			</text>
+			<text name="optimize_slower_rendering_text">
+				レンダリング速度の低下
+詳細化
+プリム換算ウェイトの増加
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="プレビュー表示のLOD設定">
-				<combo_item name="high">
-					高
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="ジオメトリを再計算" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				ジオメトリのプレビュー
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="プレビュー表示の LOD 設定">
+				<combo_item name="preview_lod_high">
+					高い詳細度
 				</combo_item>
-				<combo_item name="medium">
-					中
+				<combo_item name="preview_lod_medium">
+					中の詳細度
 				</combo_item>
-				<combo_item name="low">
-					低
+				<combo_item name="preview_lod_low">
+					低い詳細度
 				</combo_item>
-				<combo_item name="lowest">
-					最低
+				<combo_item name="preview_lod_lowest">
+					最低の詳細度
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				リソース料金：    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				物理効果
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				物理作用の調整
 			</text>
 		</panel>
-		<text name="description">
-			ウィザードが作成する実像によって、オブジェクトが他のオブジェクトやアバターとどのようにインタラクションするかが決まります。オブジェクトの用途に最適な描画詳細度にスライダーを設定してください：
+		<text name="physics_hint">
+			モデルの外殻構造のシェイプは弊社が作成します。モデルの目的に応じてシェイプの詳細度を調整してください。
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				リソース料金：       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				パフォーマンス
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				物理効果
+			<text name="physics_faster_rendering_text">
+				レンダリング速度の向上
+詳細度の低下
+プリム換算ウェイトの軽減
 			</text>
-		</panel>
-		<text name="description">
-			下の実像をプレビューし、「次へ」をクリックして続けます。実像を修正するには「戻る」ボタンをクリックします。
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				モデルのプレビュー：
+			<text name="physics_accuracy_text">
+				正確
+			</text>
+			<text name="physics_slower_dendering_text">
+				レンダリング速度の低下
+詳細化
+プリム換算ウェイトの増加
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="プレビュー表示のLOD設定">
-				<combo_item name="high">
-					高
+			<text name="physics_example_1">
+				例：
+動くオブジェクト
+飛行オブジェクト
+車
+			</text>
+			<text name="physics_example_2">
+				例：
+小さな静止オブジェクト
+比較的詳細度の低いオブジェクト
+シンプルな家具
+			</text>
+			<text name="physics_example_3">
+				例：
+静止オブジェクト
+詳細なオブジェクト
+建物
+			</text>
+			<button label="物理演算ウェイトを再計算" name="recalculate_physics_btn"/>
+			<button label="再計算中..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				物理作用のプレビュー
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="プレビュー表示の LOD 設定">
+				<combo_item name="preview_lod2_high">
+					高い詳細度
 				</combo_item>
-				<combo_item name="medium">
-					中
+				<combo_item name="preview_lod2_medium">
+					中の詳細度
 				</combo_item>
-				<combo_item name="low">
-					低
+				<combo_item name="preview_lod2_low">
+					低い詳細度
 				</combo_item>
-				<combo_item name="lowest">
-					最低
+				<combo_item name="preview_lod2_lowest">
+					最低の詳細度
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				リソース料金：       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				確認
 			</text>
 		</panel>
-		<text name="description">
-			以下の詳細を確認してから、「アップロード」をクリックするとモデルがアップロードされます。「アップロード」をクリックした際に、料金があなたの L$ 残高から差し引かれます。
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				モデルのプレビュー：
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				区画/リージョンへの負荷：[EQUIV] プリム換算値
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
-				<combo_item name="high">
-					高
-				</combo_item>
-				<combo_item name="medium">
-					中
-				</combo_item>
-				<combo_item name="low">
-					低
-				</combo_item>
-				<combo_item name="lowest">
-					最低
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				L$ [FEE] のアップロード料金があなたのアカウントに請求されます。
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				アップロードボタンをクリックすると、モデルに含まれるマテリアルの所有権や使用許可を所持することを認めたことになります。
 			</text>
 		</panel>
-		<text name="streaming cost">
-			リソース料金：         [COST]
-		</text>
-		<text name="physics cost">
-			物理効果料金：        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				アップロード完了！
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				アップロード完了
 			</text>
 		</panel>
-		<text name="description">
-			おめでとうございます！モデルがアップロードされました。アップロードされたモデルは、持ち物の「オブジェクト」フォルダにあります。
+		<text name="model_uploaded_text">
+			モデルがアップロードされました。
+		</text>
+		<text name="inventory_text">
+			それは持ち物の「オブジェクト」フォルダにあります。
+		</text>
+		<text name="charged_fee">
+			あなたのアカウントに L$ [FEE] が請求されました。
 		</text>
 	</panel>
 	<button label="&lt;&lt; 戻る" name="back"/>
 	<button label="次へ&gt;&gt;" name="next"/>
+	<button label="ウェイトと料金の計算 &gt;&gt;" name="calculate"/>
+	<button label="計算中..." name="calculating"/>
 	<button label="アップロード" name="upload" tool_tip="シミュレーターにアップロード"/>
 	<button label="取り消し" name="cancel"/>
 	<button label="閉じる" name="close"/>
@@ -193,6 +219,9 @@
 	<string name="status_idle">
 		待機状態
 	</string>
+	<string name="status_parse_error">
+		Dae に問題が見つかりました - 詳細についてはログをご参照ください。
+	</string>
 	<string name="status_reading_file">
 		ローディング...
 	</string>
@@ -202,6 +231,9 @@
 	<string name="status_vertex_number_overflow">
 		エラー：頂点の数が65534を超過したので中止されました。
 	</string>
+	<string name="bad_element">
+		エラー：要素が無効です
+	</string>
 	<string name="high">
 		高
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 289098a343..0723be0068 100644
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="検索">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		ローディング...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index f7d77d351e..a8b5febd54 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		土地をクリックし、ドラッグして選択
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		画面
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] 個のオブジェクト（[PRIM_COUNT] 個のプリム [PE_STRING]）が選択されています
 	</floater.string>
-	<floater.string name="grid_local_text">
-		ローカル
-	</floater.string>
-	<floater.string name="grid_world_text">
-		インワールド
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		レファレンス
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		アタッチメント
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] プリム換算値
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="フォーカス"/>
 	<button label="" label_selected="" name="button move" tool_tip="動かす"/>
@@ -66,21 +57,13 @@
 	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
 	<button label="リンク" name="link_btn"/>
 	<button label="リンクを外す" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
-		þ: [COUNT]
-	</text>
 	<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="オブジェクトの配置に使うグリッドルーラを選択します" >
-		<combo_box.item label="インワールドグリッド" name="World"/>
-		<combo_box.item label="ローカルグリッド" name="Local"/>
-		<combo_box.item label="リファレンスグリッド" name="Reference"/>
-	</combo_box>
-	<button label="オプション" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/>
+	<check_box initial_value="true" label="スナップ" name="checkbox snap to grid"/>
+	<button label="オプション..." label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/>
@@ -119,25 +102,13 @@
 		強度
 	</text>
 	<button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します"/>
-	<text name="obj_count">
-		オブジェクト： [COUNT]
-	</text>
-	<text name="prim_count">
-		プリム： [COUNT]
-	</text>
-	<text name="linked_set_count">
-		リンクセット：[COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="[prims] / [physics complexity] として現在選択されているリンクセットのコスト">
-		料金： [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		オブジェクト： [COUNT]
+	<text name="selection_empty">
+		何も選択されていません。
 	</text>
-	<text name="object_cost" tool_tip="[prims] / [physics complexity] として現在選択されているオブジェクトのコスト">
-		料金： [COST] / [PHYSICS]
+	<text name="selection_weight">
+		物理演算ウェイト [PHYS_WEIGHT]、レンダリングコスト [DISP_WEIGHT]。
 	</text>
-	<tab_container name="Object Info Tabs" >
+	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
 			<panel.string name="text deed continued">
 				譲渡
@@ -359,7 +330,6 @@
 				<combo_box.item label="トーラス" name="Torus"/>
 				<combo_box.item label="平面" name="Plane"/>
 				<combo_box.item label="シリンダー" name="Cylinder"/>
-				<combo_box.item label="メッシュ" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="特徴" name="Features">
@@ -379,22 +349,22 @@
 				オブジェクトの特徴を編集：
 			</text>
 			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にします（クライアント側のみ）"/>
-			<spinner label="柔軟性" name="FlexNumSections" />
-			<spinner label="重力" name="FlexGravity" />
-			<spinner label="ドラッグ" name="FlexFriction" />
-			<spinner label="風" name="FlexWind" />
-			<spinner label="緊張" name="FlexTension" />
-			<spinner label="X 軸方向の力" name="FlexForceX" />
-			<spinner label="Y 軸方向の力" name="FlexForceY" />
-			<spinner label="Z 軸方向の力" name="FlexForceZ" />
+			<spinner label="柔軟性" name="FlexNumSections"/>
+			<spinner label="重力" name="FlexGravity"/>
+			<spinner label="ドラッグ" name="FlexFriction"/>
+			<spinner label="風" name="FlexWind"/>
+			<spinner label="緊張" name="FlexTension"/>
+			<spinner label="X 軸方向の力" name="FlexForceX"/>
+			<spinner label="Y 軸方向の力" name="FlexForceY"/>
+			<spinner label="Z 軸方向の力" name="FlexForceZ"/>
 			<check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/>
 			<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
 			<texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/>
-			<spinner label="輝度" name="Light Intensity" />
+			<spinner label="輝度" name="Light Intensity"/>
 			<spinner label="FOV" name="Light FOV"/>
-			<spinner label="半径" name="Light Radius" />
+			<spinner label="半径" name="Light Radius"/>
 			<spinner label="焦点" name="Light Focus"/>
-			<spinner label="弱まる" name="Light Falloff" />
+			<spinner label="弱まる" name="Light Falloff"/>
 			<spinner label="環境" name="Light Ambiance"/>
 			<text name="label physicsshapetype">
 				実像の種類：
@@ -411,7 +381,7 @@
 			</combo_box>
 			<spinner label="重力" name="Physics Gravity"/>
 			<spinner label="摩擦" name="Physics Friction"/>
-			<spinner label="密度" name="Physics Density"/>
+			<spinner label="密度（100 kg/m^3）" name="Physics Density"/>
 			<spinner label="復元" name="Physics Restitution"/>
 		</panel>
 		<panel label="材質" name="Texture">
@@ -496,18 +466,18 @@
 			</panel>
 		</panel>
 		<panel label="中身" name="Contents">
-			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script" />
-			<button label="権限" name="button permissions" />
+			<button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script"/>
+			<button label="権限" name="button permissions"/>
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
 		<text name="label_parcel_info">
 			区画情報
 		</text>
-		<text name="label_area_price" >
+		<text name="label_area_price">
 			価格： [AREA] 平方メートル L$ [PRICE]
 		</text>
-		<text name="label_area" >
+		<text name="label_area">
 			面積： [AREA] 平方メートル
 		</text>
 		<button label="土地情報" label_selected="土地情報" name="button about land"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index 4557815129..801b7a9db0 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		（新登場！）
 	</string>
+	<string name="effect_Arena">
+		アリーナ
+	</string>
+	<string name="effect_Beast">
+		野獣
+	</string>
+	<string name="effect_Buff">
+		がっしり
+	</string>
+	<string name="effect_Buzz">
+		ブザー
+	</string>
+	<string name="effect_Camille">
+		カミール
+	</string>
+	<string name="effect_Creepy">
+		気味の悪い
+	</string>
+	<string name="effect_CreepyBot">
+		気味わるボット
+	</string>
+	<string name="effect_Cyber">
+		サイバー
+	</string>
+	<string name="effect_DeepBot">
+		ディープボット
+	</string>
+	<string name="effect_Demon">
+		デーモン
+	</string>
+	<string name="effect_Flirty">
+		気のありそうな
+	</string>
+	<string name="effect_Foxy">
+		魅惑的
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		ハロウィン_2010_ボーナス
+	</string>
+	<string name="effect_Helium">
+		ヘリウム
+	</string>
+	<string name="effect_Husky">
+		ハスキー
+	</string>
+	<string name="effect_Intercom">
+		インターホン
+	</string>
+	<string name="effect_Macho">
+		マッチョ
+	</string>
+	<string name="effect_Micro">
+		ミクロ
+	</string>
+	<string name="effect_Mini">
+		ミニ
+	</string>
+	<string name="effect_Nano">
+		ナノ
+	</string>
+	<string name="effect_Nightmare">
+		悪夢
+	</string>
+	<string name="effect_PopBot">
+		ポップボット
+	</string>
+	<string name="effect_Rachel">
+		レイチェル
+	</string>
+	<string name="effect_Radio">
+		ラジオ
+	</string>
+	<string name="effect_Robot">
+		ロボット
+	</string>
+	<string name="effect_Roxanne">
+		ロクサン
+	</string>
+	<string name="effect_Sabrina">
+		サブリナ
+	</string>
+	<string name="effect_Samantha">
+		サマンサ
+	</string>
+	<string name="effect_Sexy">
+		セクシー
+	</string>
+	<string name="effect_Shorty">
+		チビ
+	</string>
+	<string name="effect_Sneaky">
+		コソコソ
+	</string>
+	<string name="effect_Stallion">
+		雄馬
+	</string>
+	<string name="effect_Sultry">
+		艶かしい
+	</string>
+	<string name="effect_Thunder">
+		サンダー
+	</string>
+	<string name="effect_Vixen">
+		性悪な
+	</string>
+	<string name="effect_WhinyBot">
+		不機嫌ボット
+	</string>
 	<text name="preview_text">
 		プレビュー
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml
deleted file mode 100644
index fb64332e79..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="水の高度な編集">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		水の事前設定：
-	</text>
-	<button label="新規" label_selected="新規" name="WaterNewPreset"/>
-	<button label="保存" label_selected="保存" name="WaterSavePreset"/>
-	<button label="削除" label_selected="削除" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="設定" name="Settings">
-			<text name="BHText">
-				水中のフォグ効果の色
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="クリックしてカラーピッカーを開きます"/>
-			<text name="WaterFogDensText">
-				水中の透明度指数
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				水中のフォグ効果加減
-			</text>
-			<text name="BDensText">
-				さざ波の反射スケール
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				フレネルのスケール
-			</text>
-			<text name="FresnelOffsetText">
-				フレネルのオフセット
-			</text>
-			<text name="DensMultText">
-				水面の屈折スケール
-			</text>
-			<text name="WaterScaleBelowText">
-				水中の屈折スケール
-			</text>
-			<text name="MaxAltText">
-				不透明度の増幅
-			</text>
-		</panel>
-		<panel label="画像" name="Waves">
-			<text name="BHText">
-				大波の方向
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				小波の方向
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				ノーマルマップ
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
deleted file mode 100644
index feb94ef73e..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="空の高度な編集">
-	<text name="KeyFramePresetsText">
-		空の事前設定：
-	</text>
-	<button label="新規" label_selected="新規" name="WLNewPreset"/>
-	<button label="保存" label_selected="保存" name="WLSavePreset"/>
-	<button label="削除" label_selected="削除" name="WLDeletePreset"/>
-	<button label="デイサイクル編集" label_selected="デイサイクル編集" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="大気" name="Atmosphere">
-			<text name="BHText">
-				空の配色
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				空と遠景の露光
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				空の配色と濃度
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				大気の不透明度
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				大気の不透明度の増幅
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				視界の増幅
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				最大高度
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="ライティング" name="Lighting">
-			<text name="SLCText">
-				太陽/月の色
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				太陽/月の位置
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				アンビエント
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				東の角度
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				太陽の輝き
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="フォーカス " name="WLGlowB"/>
-			<slider label="サイズ    " name="WLGlowR"/>
-			<text name="SceneGammaText">
-				風景ガンマ
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				星の輝き
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="雲" name="Clouds">
-			<text name="WLCloudColorText">
-				雲の色
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				雲の XY/密度
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				雲の量
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				雲のスケール
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				雲の詳細 (XY/密度)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				雲の移動速度 (X 方向)
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="ロック" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				雲の移動速度 (Y 方向)
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="ロック" name="WLCloudLockY"/>
-			<check_box label="従来の雲を描画" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index 265f3ebcd0..dca872e9b8 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -18,7 +18,7 @@
 		<menu_item_call label="利用規約を表示" name="TOS"/>
 		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
 		<menu_item_call label="メディアブラウザのテスト" name="Web Browser Test"/>
-		<menu_item_call label="Web コンテンツフローターのテスト" name="Web Content Floater Test"/>
+		<menu_item_call label="Web コンテンツフローターのデバッグテスト" name="Web Content Floater Debug Test"/>
 		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
 		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
index a31480158a..44c5438509 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
+<toggleable_menu name="menu_group_plus">
 	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
 	<menu_item_check label="名前で並べ替え" name="sort_name"/>
 	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
 	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="地図を表示" name="view_map"/>
 	<menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index ec9db02522..223c1e1f11 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="所属グループ" name="My Groups"/>
 		<menu_item_check label="近くのチャット" name="Nearby Chat"/>
 		<menu_item_call label="近くにいる人" name="Active Speakers"/>
+		<menu_item_check label="近くのボイス" name="Nearby Voice"/>
 	</menu>
 	<menu label="世界" name="World">
 		<menu_item_check label="ミニマップ" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="正午" name="Noon"/>
 			<menu_item_call label="日没" name="Sunset"/>
 			<menu_item_call label="深夜" name="Midnight"/>
-			<menu_item_call label="エステートタイム" name="Revert to Region Default"/>
-			<menu_item_call label="自然環境エディター" name="Environment Editor"/>
+		</menu>
+		<menu label="自然環境エディター" name="Enviroment Editor">
+			<menu_item_call label="環境の設定..." name="Enviroment Settings"/>
+			<menu label="水の事前設定" name="Water Presets">
+				<menu_item_call label="新しい事前設定..." name="new_water_preset"/>
+				<menu_item_call label="事前設定を編集..." name="edit_water_preset"/>
+				<menu_item_call label="事前設定を削除..." name="delete_water_preset"/>
+			</menu>
+			<menu label="空の事前設定" name="Sky Presets">
+				<menu_item_call label="新しい事前設定..." name="new_sky_preset"/>
+				<menu_item_call label="事前設定を編集..." name="edit_sky_preset"/>
+				<menu_item_call label="事前設定を削除..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="デイの事前設定" name="Day Presets">
+				<menu_item_call label="新しい事前設定..." name="new_day_preset"/>
+				<menu_item_call label="事前設定を編集..." name="edit_day_preset"/>
+				<menu_item_call label="事前設定を削除..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="制作" name="BuildTools">
@@ -142,7 +159,6 @@
 		<menu_item_check label="カメラの距離移動を制限しない" name="Disable Camera Distance"/>
 		<menu_item_check label="高解像度スナップショット" name="HighResSnapshot"/>
 		<menu_item_check label="シャッター音とアニメーションなしでスナップショットをディスクに保存する" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="圧縮してスナップショットをディスクに保存する" name="CompressSnapshotsToDisk"/>
 		<menu label="パフォーマンスツール" name="Performance Tools">
 			<menu_item_call label="ラグ計測器" name="Lag Meter"/>
 			<menu_item_check label="統計バー" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
index 7a97538117..5334042dc9 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
+<toggleable_menu name="Gear Wearing">
 	<menu_item_call label="アウトフットの編集" name="edit"/>
 	<menu_item_call label="取り外す" name="takeoff"/>
-</menu>
+	<menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index d63ca84035..6bff82bec4 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1590,6 +1590,11 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ�
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		[OFFERS] 回にわたってテレポートを送ろうとしましたが、
+それは限度数 [LIMIT] を超えています。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
 		現在地に住人をゴッドサモンしますか？
 		<form name="form">
@@ -2018,6 +2023,10 @@ Linden Lab
 		トラベル、Web、検索の履歴をすべて削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		ビューワのキャッシュをクリアしますか？
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		本当にクッキーをクリアしますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/>
@@ -2043,48 +2052,30 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		保存された事前設定を上書きしますか？
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		「 [SKY] 」を削除しますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
-	</notification>
 	<notification name="WLNoEditDefault">
 		デフォルトの設定を編集したり削除したりすることはできません。
 	</notification>
 	<notification name="WLMissingSky">
 		このデイサイクルのファイルは次の存在しない「空」ファイルを参照しています： [SKY]。
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		ポストプロセス効果が存在します。 上書きしますか？
-		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
+	<notification name="WLRegionApplyFail">
+		申し訳ございませんが、設定をリージョンに適用できませんでした。一度リージョンを出てから戻ると、問題が解決されるかもしれません。問題の発生した理由：[FAIL_REASON]
 	</notification>
-	<notification name="NewSkyPreset">
-		新しい空の名前を指定してください。
-		<form name="form">
-			<input name="message">
-				新しい事前設定
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		事前設定がすでに存在します！
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		新しい水の事前設定の名前を指定してください。
-		<form name="form">
-			<input name="message">
-				新しい事前設定
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="キャンセル"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE] の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		事前設定がすでに存在します！
+	<notification name="EnvUpdateRate">
+		リージョンの自然環境の設定は [WAIT] 秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		デフォルトの設定を編集したり削除したりすることはできません。
+	<notification name="PPSaveEffectAlert">
+		ポストプロセス効果が存在します。 上書きしますか？
+		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		[RECIPIENT] と新しいチャットを開始することができません。
@@ -2114,13 +2105,14 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		<usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		年齢確認を済ませていないとこの区画を訪れることができません。  [SECOND_LIFE] サイトで年齢の確認を行いますか？
+		Second Life で Adult 指定のコンテンツや領域にアクセスできるのは 18 歳以上のユーザーのみです。年齢確認ページで 18 歳以上であることを証明してください。 
+これをクリックするとウェブブラウザが開きます。
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=ja
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="年齢の確認を済ませていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
+		<usetemplate ignoretext="年齢の確認を済ませていないとき" name="okcancelignore" notext="取り消し" yestext="年齢確認ページを開く"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		支払情報が登録されていないとこのエリアを訪れることができません。  [SECOND_LIFE] サイトで登録を行いますか？
@@ -2378,6 +2370,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="NoBuild">
 		このエリアでは制作が禁止されています。 オブジェクトを制作したり Rez することはできません。
 	</notification>
+	<notification name="SeeAvatars">
+		この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル 0 での通常の文字チャットもブロックされます。
+	</notification>
 	<notification name="ScriptsStopped">
 		管理者がこのリージョンのスクリプトを一時停止しました。
 	</notification>
@@ -2472,7 +2467,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	</notification>
 	<notification name="ObjectGiveItem">
 		[NAME_SLURL] が所有する &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="受け取る"/>
 			<button name="Discard" text="破棄"/>
@@ -2802,7 +2797,15 @@ M キーを押して変更します。
 		共有する住人を選択します。
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] をアップロードできませんでした： [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+		[LABEL] をアップロードできませんでした：[MESSAGE] [IDENTIFIER] 
+
+詳細についてはログをご覧ください。
+	</notification>
+	<notification name="MeshUploadPermError">
+		メッシュのアップロード許可をリクエスト中にエラーが発生しました。
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		リージョンの &apos;[CAPABILITY]&apos; という機能を取得できませんでした。
 	</notification>
 	<notification name="ShareItemsConfirmation">
 		次のアイテムを共有しますか？
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
index 4fb031b677..39ea1df1e3 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="ピックを保存" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="取り消し" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
index e9e36e4842..df9ef40113 100644
--- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索] をお試しください。"/>
+		<no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索] をお試しください。"/>
+	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="オプションを表示します"/>
+		<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
 		<button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index c7f71c6de0..1c90f7327e 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -66,16 +66,16 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 8a40d7aa5a..7235bc0f18 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -68,6 +68,8 @@
 						<text name="scripts_value" value="オン"/>
 						<text name="damage_label" value="ダメージ："/>
 						<text name="damage_value" value="オフ"/>
+						<text name="see_avatars_label" value="アバターを表示："/>
+						<text name="see_avatars_value" value="オフ"/>
 						<button label="土地情報" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index e19b86e552..9d3925afdc 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="オプションを表示します"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="プロフィール" name="profile_btn" tool_tip="場所のプロフィールを表示"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index ccc5c3908b..dcaa23fee5 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		キャッシュ：
+	</text>
+	<spinner label="キャッシュサイズ（64～9,984MB）" name="cachesizespinner"/>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache"/>
+	<text name="Cache location">
+		キャッシュの保存場所：
+	</text>
+	<button label="参照" label_selected="参照" name="set_cache"/>
+	<button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location"/>
 	<text name="UI Size:">
 		UI サイズ：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index c11e636875..3a4c360ccc 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -19,6 +19,7 @@
 	<check_box label="有効" name="enable_voice_check"/>
 	<check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/>
 	<check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" value="true"/>
+	<check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" value="true"/>
 	<text name="voice_chat_settings">
 		ボイスチャットの設定
 	</text>
@@ -35,28 +36,5 @@
 	<button label="キー設定" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="マウスの中央ボタンにリセット"/>
 	<button label="入力・出力機器" name="device_settings_btn"/>
-	<panel label="機器の設定" name="device_settings_panel">
-		<panel.string name="default_text">
-			デフォルト
-		</panel.string>
-		<panel.string name="default system device">
-			デフォルトのシステム機器
-		</panel.string>
-		<panel.string name="no device">
-			機器が設定されていません
-		</panel.string>
-		<text name="Input">
-			入力
-		</text>
-		<text name="My volume label">
-			私の音量：
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使って音量を調節します"/>
-		<text name="wait_text">
-			しばらくお待ちください。
-		</text>
-		<text name="Output">
-			出力
-		</text>
-	</panel>
+	<panel label="機器の設定" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
new file mode 100644
index 0000000000..f6ef3f0934
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="環境" name="panel_env_info">
+	<text name="water_settings_title">
+		あなたのリージョンを訪れるユーザーに見せたい、水と空/デイサイクルの設定を選択します。詳細
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Second Life のデフォルト設定を使用" name="use_sl_default_settings"/>
+		<radio_item label="次の設定を使用" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			水の設定
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="- 事前設定を選択 -" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			空 / デイサイクル
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="空の固定" name="my_sky_settings"/>
+			<radio_item label="デイサイクル" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="- 事前設定を選択 -" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="- 事前設定を選択 -" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="適用" name="apply_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index 8df803b2dc..fb853c1925 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="地形" name="Terrain">
 	<text name="region_text_lbl">
 		地域：
@@ -6,25 +6,55 @@
 	<text name="region_text">
 		未知
 	</text>
-	<spinner label="水面の高さ" name="water_height_spin" />
-	<button label="?" name="water_height_help" />
-	<spinner label="地形の上昇限度" name="terrain_raise_spin" />
-	<button label="?" name="terrain_raise_help" />
-	<spinner label="地形の下降限度" name="terrain_lower_spin" />
-	<button label="?" name="terrain_lower_help" />
-	<check_box label="不動産太陽使用" name="use_estate_sun_check" />
-	<button label="?" name="use_estate_sun_help" />
-	<check_box label="太陽固定" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="段階" name="sun_hour_slider" />
-	<button label="適用" name="apply_btn" />
-	<button label="RAW 地形ダウンロード..." name="download_raw_btn"
-	     tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
-	<button label="?" name="download_raw_help" />
-	<button label="RAW 地形アップロード..." name="upload_raw_btn"
-	     tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" />
-	<button label="?" name="upload_raw_help" />
-	<button label="地形の構築" name="bake_terrain_btn"
-	     tool_tip="現在の地形を上昇・下降範囲の中間点として設定します" />
-	<button label="?" name="bake_terrain_help" />
+	<spinner label="水面の高さ" name="water_height_spin"/>
+	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
+	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		地形テクスチャ（512x512 の 24 bit .tga ファイル）
+	</text>
+	<text name="height_text_lbl">
+		1（低）
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4（高）
+	</text>
+	<text name="height_text_lbl5">
+		地形の隆起範囲
+	</text>
+	<text name="height_text_lbl10">
+		数値は上のテクスチャのブレンド範囲を示します。
+	</text>
+	<text name="height_text_lbl11">
+		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
+	</text>
+	<text name="height_text_lbl6">
+		北西
+	</text>
+	<text name="height_text_lbl7">
+		北東
+	</text>
+	<spinner label="低" name="height_start_spin_1"/>
+	<spinner label="低" name="height_start_spin_3"/>
+	<spinner label="高" name="height_range_spin_1"/>
+	<spinner label="高" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		南西
+	</text>
+	<text name="height_text_lbl9">
+		南東
+	</text>
+	<spinner label="低" name="height_start_spin_0"/>
+	<spinner label="低" name="height_start_spin_2"/>
+	<spinner label="高" name="height_range_spin_0"/>
+	<spinner label="高" name="height_range_spin_2"/>
+	<button label="RAW 地形ダウンロード..." name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
+	<button label="RAW 地形アップロード..." name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/>
+	<button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します"/>
+	<button label="適用" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index da103a2d60..0824504235 100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		デフォルト
 	</panel.string>
+	<string name="name_no_device">
+		機器が設定されていません
+	</string>
+	<string name="name_default_system_device">
+		デフォルトのシステム機器
+	</string>
 	<text name="Input">
 		入力
 	</text>
+	<text name="Output">
+		出力
+	</text>
 	<text name="My volume label">
 		私の音量：
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		しばらくお待ちください。
 	</text>
-	<text name="Output">
-		出力
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index e26d8717d1..7edda6e1a3 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						受け取った商品（[NUM]）
+					</string>
+					<string name="InboxLabelNoArg">
+						受け取った商品
+					</string>
+					<button label="受け取った商品" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] 新登場
+					</text>
+					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+						<text name="inbox_inventory_placeholder">
+							マーケットプレイスから購入した商品はここに配達されます。
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+			<layout_panel name="outbox_layout_panel">
+				<panel label="" name="marketplace_outbox">
+					<button label="マーチャントのアウトボックス" name="outbox_btn"/>
+					<button label="" name="outbox_sync_btn" tool_tip="自分のマーケットプレイス店頭に移動"/>
+					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
+						<text name="outbox_inventory_placeholder">
+							この機能を使用するには、マーチャントアカウントをセットアップしてください。
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index a6691fb764..f0c0d99a8e 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -34,6 +34,9 @@
 	<string name="StartupInitializingVFS">
 		VFS を初期化中です...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
+	</string>
 	<string name="ProgressRestoring">
 		復元中です...
 	</string>
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime が正常に初期化されました。
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		リージョンの機能をリクエストしています...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		リージョンの機能をリクエスト、試行 [NUMBER] 回....
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		リージョンのハンドシェイクを待っています...
 	</string>
@@ -1192,6 +1201,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="InventoryNoTexture">
 		「持ち物」内にこのテクスチャのコピーがありません
 	</string>
+	<string name="InventoryInboxNoItems">
+		マーケットプレイスで購入した商品はここに配達されます。
+	</string>
+	<string name="InventoryOutboxNoItems">
+		マーケットプレイス店頭に掲載するための準備として、ここに商品をドラッグします。
+	</string>
 	<string name="no_transfer" value=" （再販・プレゼント不可）"/>
 	<string name="no_modify" value=" （編集不可）"/>
 	<string name="no_copy" value=" （コピー不可）"/>
@@ -1238,9 +1253,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="InvFolder My Inventory">
 		持ち物
 	</string>
-	<string name="InvFolder My Favorites">
-		お気に入り
-	</string>
 	<string name="InvFolder Library">
 		ライブラリ
 	</string>
@@ -1325,6 +1337,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="InvFolder All">
 		全員
 	</string>
+	<string name="no_attachments">
+		着用しているアタッチメントはありません
+	</string>
 	<string name="Buy">
 		買う
 	</string>
@@ -1634,6 +1649,9 @@ support@secondlife.com にお問い合わせください。
 	</string>
 	<string name="SummaryForTheWeek" value="今週のまとめ。開始日は"/>
 	<string name="NextStipendDay" value="です。次回のお小遣い支給日："/>
+	<string name="GroupPlanningDate">
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="                      グループ       個人の割り当て"/>
 	<string name="GroupColumn" value="グループの設定"/>
 	<string name="Balance">
@@ -1660,6 +1678,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="IMTeen">
 		ティーン
 	</string>
+	<string name="Anyone">
+		全員
+	</string>
 	<string name="RegionInfoError">
 		エラー
 	</string>
@@ -1882,6 +1903,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="Public">
 		パブリック
 	</string>
+	<string name="LocalSettings">
+		ローカル設定
+	</string>
+	<string name="RegionSettings">
+		リージョン（地域）の設定
+	</string>
 	<string name="ClassifiedClicksTxt">
 		クリック数： [TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール
 	</string>
@@ -1954,6 +1981,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDebits">
 		支出
 	</string>
+	<string name="GroupMoneyDate">
+		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		内容
 	</string>
@@ -3727,6 +3757,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="LocationCtrlGeneralIconTooltip">
 		General リージョン
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		この区画外にアバターを見えるようにして、チャットも許可
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] アップデート
 	</string>
@@ -3821,7 +3854,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		アドホックコンファレンス
 	</string>
 	<string name="conference-title-incoming">
-		[AGENT_NAME]とコンファレンスする
+		[AGENT_NAME] とコンファレンスする
 	</string>
 	<string name="inventory_item_offered-im">
 		持ち物アイテムを送りました
@@ -4152,6 +4185,87 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Female - Wow">
 		女性 - Wow
 	</string>
+	<string name="/bow">
+		/おじぎする
+	</string>
+	<string name="/clap">
+		/拍手
+	</string>
+	<string name="/count">
+		/数える
+	</string>
+	<string name="/extinguish">
+		/消す
+	</string>
+	<string name="/kmb">
+		/くそくらえ
+	</string>
+	<string name="/muscle">
+		/筋肉もりもり
+	</string>
+	<string name="/no">
+		/いいえ
+	</string>
+	<string name="/no!">
+		/だめ！
+	</string>
+	<string name="/paper">
+		/パー
+	</string>
+	<string name="/pointme">
+		/自分を指差す
+	</string>
+	<string name="/pointyou">
+		/相手を指差す
+	</string>
+	<string name="/rock">
+		/グー
+	</string>
+	<string name="/scissor">
+		/チョキ
+	</string>
+	<string name="/smoke">
+		/タバコを吸う
+	</string>
+	<string name="/stretch">
+		/伸びをする
+	</string>
+	<string name="/whistle">
+		/口笛を吹く
+	</string>
+	<string name="/yes">
+		/はい
+	</string>
+	<string name="/yes!">
+		/イエス！
+	</string>
+	<string name="afk">
+		一時退席中
+	</string>
+	<string name="dance1">
+		ダンス1
+	</string>
+	<string name="dance2">
+		ダンス2
+	</string>
+	<string name="dance3">
+		ダンス3
+	</string>
+	<string name="dance4">
+		ダンス4
+	</string>
+	<string name="dance5">
+		ダンス5
+	</string>
+	<string name="dance6">
+		ダンス6
+	</string>
+	<string name="dance7">
+		ダンス7
+	</string>
+	<string name="dance8">
+		ダンス8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml
deleted file mode 100644
index 1f3e045a75..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="DAGCYCLUS EDITOR">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Dagcyclus" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				0:00
-			</text>
-			<text name="WL3am">
-				3:00
-			</text>
-			<text name="WL6am">
-				6:00
-			</text>
-			<text name="WL9amHash">
-				9:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				0:00
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Key toevoegen" label_selected="Key toevoegen" name="WLAddKey"/>
-			<button label="Key verwijderen" label_selected="Key verwijderen" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Gemarkeerde frame instelling:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Markering tijd:
-			</text>
-			<spinner label="Uur" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Markering voorinstelling:
-			</text>
-			<combo_box label="Voorinstelling" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Snap:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Lengte van cyclus:
-			</text>
-			<spinner label="Uur" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sec" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Voorbeeld:
-			</text>
-			<button label="Afspelen" label_selected="Afspelen" name="WLAnimSky"/>
-			<button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Gebruik estatetijd" label_selected="Ga naar Estate tijd" name="WLUseLindenTime"/>
-			<button label="Opslaan testdag" label_selected="Opslaan testdag" name="WLSaveDayCycle"/>
-			<button label="Laad testdag" label_selected="Laad testdag" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_env_settings.xml b/indra/newview/skins/default/xui/nl/floater_env_settings.xml
deleted file mode 100644
index 3c207040d2..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_env_settings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="OMGEVING EDITOR">
-	<text bottom="-42" name="EnvTimeText">
-		Tijd van de 
-dag
-	</text>
-	<text bottom_delta="-36" name="EnvTimeText2">
-		0:00
-	</text>
-	<text name="EnvCloudText">
-		Wolkendek
-	</text>
-	<text name="EnvWaterColorText">
-		Waterkleur
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik om de kleurkiezer te openen"/>
-	<text name="EnvWaterFogText">
-		Watermist
-	</text>
-	<button label="Gebruik estate tijd" name="EnvUseEstateTimeButton"/>
-	<button label="Geavanceerde lucht" name="EnvAdvancedSkyButton"/>
-	<button label="Geavanceerd water" name="EnvAdvancedWaterButton"/>
-	<button label="?" name="EnvSettingsHelpButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_water.xml b/indra/newview/skins/default/xui/nl/floater_water.xml
deleted file mode 100644
index 1fb1ca241b..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_water.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="GEAVANCEERDE WATER EDITOR">
-	<combo_box bottom="-50" height="18" left_delta="116" name="WaterPresetsCombo" width="150" />
-	<text name="KeyFramePresetsText">
-		Watervoorinstellingen
-	</text>
-	<button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset" left_delta="190"/>
-	<button label="Opslaan" label_selected="Opslaan" name="WaterSavePreset"/>
-	<button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset" width="80"/>
-	<tab_container name="Water Tabs">
-		<panel label="Instellingen" name="Settings">
-			<text name="BHText">
-				Watermistkleur
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Klik om de kleurkiezer te openen"/>
-			<text name="WaterFogDensText">
-				Mistdichtheidsexponent
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Onderwatermist wijziger
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Reflectie wavelet schaal
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Fresnelschaal
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Fresnelverplaatsing
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refractieschaal boven
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refractieschaal onder
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Wazigheidvermeerderaar
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="Afbeelding" name="Waves">
-			<text name="BHText">
-				Grote golven richting
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Kleine golf richting
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normaalmap
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
deleted file mode 100644
index b26dd7916e..0000000000
--- a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="GEAVANCEERDE LUCHT EDITOR">
-	<combo_box allow_text_entry="false" follows="left|top" mouse_opaque="true" name="WLPresetsCombo"/>
-	<text name="KeyFramePresetsText">
-		Lucht voorinstellingen
-	</text>
-	<button label="Nieuw" label_selected="Nieuw" name="WLNewPreset"/>
-	<button label="Opslaan" label_selected="Opslaan" name="WLSavePreset"/>
-	<button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset"/>
-	<button label="Dag cyclus editor" label_selected="Dag cyclus editor" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="Atmosfeer" name="Atmosphere">
-			<text name="BHText">
-				Blauw Horizon
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Nevel horizon
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Blauw dichtheid
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Nevel dichtheid
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Dichtheidsfactor
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Afstandsfactor
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Max hoogte
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="Licht" name="Lighting">
-			<text name="SLCText">
-				Zon/maan kleur
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Zon/maan positie
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Omgeving
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Oosthoek
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Zonnegloed
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Focus  " name="WLGlowB"/>
-			<slider label="Grootte" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Scenegamma
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Ster helderheid
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="Wolken" name="Clouds">
-			<text name="WLCloudColorText">
-				Wolkenkleur
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Wolken (XY/Dichtheid)
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Wolkenbedekking
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Wolkenschaal
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text name="WLCloudDetailText">
-				Wolkendetail (XY/Dichtheid)
-			</text>
-			<button label="?" name="WLCloudDetailHelp" left="404"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Wolk verplaatsing X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp" left="600"/>
-			<check_box label="Vastzetten" name="WLCloudLockX" left="622"/>
-			<text name="WLCloudScrollYText">
-				Wolk verplaatsing Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp" left="600"/>
-			<check_box label="Vastzetten" name="WLCloudLockY" left="622"/>
-			<check_box label="Teken klassieke wolken" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp" left="620"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml
index f27b83d3f9..06e6d8ae7a 100644
--- a/indra/newview/skins/default/xui/nl/notifications.xml
+++ b/indra/newview/skins/default/xui/nl/notifications.xml
@@ -2698,7 +2698,7 @@ Probeer het alstublieft opnieuw over enkele ogenblikken.
 		Geen geldig perceel kon gevonden worden.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Een object genaamd &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, eigendom van [NAME_SLURL], heeft u een [OBJECTTYPE] genaamd [ITEM_SLURL] gegeven.
+		Een object genaamd &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, eigendom van [NAME_SLURL], heeft u een [OBJECTTYPE] genaamd &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt; gegeven.
 		<form name="form">
 			<button name="Keep" text="Behouden"/>
 			<button name="Discard" text="Afwijzen"/>
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index a53c0769dc..ca6b8eb521 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -849,9 +849,6 @@
 	<string name="InvFolder My Inventory">
 		Mijn Inventaris
 	</string>
-	<string name="InvFolder My Favorites">
-		Mijn Favorieten
-	</string>
 	<string name="InvFolder Library">
 		Bibliotheek
 	</string>
@@ -910,10 +907,10 @@
 		Gebaren
 	</string>
 	<string name="InvFolder Favorite">
-		Favoriten
+		Mijn Favorieten
 	</string>
 	<string name="InvFolder favorite">
-		Favoriten
+		Mijn Favorieten
 	</string>
 	<string name="InvFolder Current Outfit">
 		Huidige Uitrusting
@@ -1303,9 +1300,7 @@
 	<string name="RegionNoCovenantOtherOwner">
 		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
 	</string>
-	<string name="covenant_last_modified">
-		Laatst bewerkt:
-	</string>
+	<string name="covenant_last_modified" value="Laatst bewerkt: " />
 	<string name="none_text" value="(none)"/>
 	<string name="never_text" value="(never)"/>
 	<string name="GroupOwned">
diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
deleted file mode 100644
index f3929df3e3..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDYTOR CYKLU DNIA">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Cykl dnia" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<multi_slider label="" name="WLTimeSlider"/>
-			<multi_slider label="" name="WLDayCycleKeys"/>
-			<text name="WL12am">
-				12am
-			</text>
-			<text name="WL3am">
-				3am
-			</text>
-			<text name="WL6am">
-				6am
-			</text>
-			<text name="WL9amHash">
-				9am
-			</text>
-			<text name="WL12pmHash">
-				12pm
-			</text>
-			<text name="WL3pm">
-				3pm
-			</text>
-			<text name="WL6pm">
-				6pm
-			</text>
-			<text name="WL9pm">
-				9pm
-			</text>
-			<text name="WL12am2">
-				12am
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Dodaj" label_selected="Dodaj" name="WLAddKey"/>
-			<button label="Usuń" label_selected="Usuń" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Preferencje czasu:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Czas:
-			</text>
-			<spinner label="Godz" name="WLCurKeyHour"/>
-			<spinner label="Min" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Ustawienia:
-			</text>
-			<combo_box label="Preset" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Przerwij:
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Długość cyklu:
-			</text>
-			<spinner label="Godz" name="WLLengthOfDayHour"/>
-			<spinner label="Min" name="WLLengthOfDayMin"/>
-			<spinner label="Sek" name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Przeglądaj:
-			</text>
-			<button label="Start" label_selected="Start" name="WLAnimSky"/>
-			<button label="Stop" label_selected="Stop" name="WLStopAnimSky"/>
-			<button label="Używaj czasu regionu" label_selected="Używaj czasu regionu" name="WLUseLindenTime"/>
-			<button label="Zapisz test dnia" label_selected="Zapisz test dnia" name="WLSaveDayCycle"/>
-			<button label="Załaduj test dnia" label_selected="Załaduj test dnia" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml
deleted file mode 100644
index 3ab854fbbb..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDYTOR ŚRODOWISKA">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Czas
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<slider label="" name="EnvTimeSlider"/>
-	<text name="EnvCloudText">
-		Chmury:
-	</text>
-	<slider label="" name="EnvCloudSlider"/>
-	<text name="EnvWaterColorText">
-		Kolor wody
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij aby wybrać kolor"/>
-	<text name="EnvWaterFogText">
-		Zamglenie:
-	</text>
-	<slider label="" name="EnvWaterFogSlider"/>
-	<button label="Używaj czasu regionu" name="EnvUseEstateTimeButton"/>
-	<button label="Zaawansowane niebo" name="EnvAdvancedSkyButton"/>
-	<button label="Zaawansowana woda" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
index 7c29d52e7b..131f92d56f 100644
--- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="USTAWIENIA DEBUGOWANIA">
 	<radio_group name="boolean_combo">
-		<radio_item label="PRAWDA" name="TRUE" value="prawda"/>
-		<radio_item label="NIEPRAWDA" name="FALSE" value=""/>
+		<radio_item label="PRAWDA" name="TRUE" />
+		<radio_item label="NIEPRAWDA" name="FALSE" />
 	</radio_group>
 	<color_swatch label="Kolor" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml
deleted file mode 100644
index 9720dae516..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_water.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ZAAWANSOWANY EDYTOR WODY">
-	<text name="KeyFramePresetsText">
-		Ustawienia wody:
-	</text>
-	<button label="Nowe" label_selected="Nowe" name="WaterNewPreset"/>
-	<button label="Zapisz" label_selected="Zapisz" name="WaterSavePreset"/>
-	<button label="Usuń" label_selected="Usuń" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="USTAWIENIA" name="Settings">
-			<text name="BHText">
-				Kolor podwodnej mgły
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Kliknij aby wybrać kolor"/>
-			<text name="WaterFogDensText">
-				Wykładnik gęstości mgły
-			</text>
-			<button label="?" name="WaterFogDensityHelp"/>
-			<slider label="" name="WaterFogDensity"/>
-			<text name="WaterUnderWaterFogModText">
-				Modyfikator mgły
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp"/>
-			<slider label="" name="WaterUnderWaterFogMod"/>
-			<text name="BDensText">
-				Skala zmarszczeń
-			</text>
-			<button label="?" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<slider label="" name="WaterNormalScaleX"/>
-			<slider label="" name="WaterNormalScaleY"/>
-			<slider label="" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Skala Fresnela
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp"/>
-			<slider label="" name="WaterFresnelScale"/>
-			<text name="FresnelOffsetText">
-				Przesunięcie Fresnela
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp"/>
-			<slider label="" name="WaterFresnelOffset"/>
-			<text name="DensMultText">
-				Górna refrakcja
-			</text>
-			<button label="?" name="WaterScaleAboveHelp"/>
-			<slider label="" name="WaterScaleAbove"/>
-			<text name="WaterScaleBelowText">
-				Dolna refrakcja
-			</text>
-			<button label="?" name="WaterScaleBelowHelp"/>
-			<slider label="" name="WaterScaleBelow"/>
-			<text name="MaxAltText">
-				Mnożnik rozmycia
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp"/>
-			<slider label="" name="WaterBlurMult"/>
-		</panel>
-		<panel label="OBRAZ" name="Waves">
-			<text name="BHText">
-				Kierunek dużych fal
-			</text>
-			<button label="?" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave1DirX"/>
-			<slider label="" name="WaterWave1DirY"/>
-			<text name="BHText2">
-				Kierunek małych fal
-			</text>
-			<button label="?" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<slider label="" name="WaterWave2DirX"/>
-			<slider label="" name="WaterWave2DirY"/>
-			<text name="BHText3">
-				Mapa normalnych
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-			<texture_picker label="" name="WaterNormalMap"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml
deleted file mode 100644
index 930e904464..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="ZAAWANSOWANY EDYTOR NIEBA">
-	<text name="KeyFramePresetsText">
-		Ustawienia nieba:
-	</text>
-	<button label="Nowe" label_selected="Nowe" name="WLNewPreset"/>
-	<button label="Zapisz" label_selected="Zapisz" name="WLSavePreset"/>
-	<button label="Usuń" label_selected="Usuń" name="WLDeletePreset"/>
-	<button label="Edytor cyklu dnia" label_selected="Edytor cyklu dnia" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFERA" name="Atmosphere">
-			<text name="BHText">
-				Horyzont błękitu
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<slider label="" name="WLBlueHorizonR"/>
-			<slider label="" name="WLBlueHorizonG"/>
-			<slider label="" name="WLBlueHorizonB"/>
-			<slider label="" name="WLBlueHorizonI"/>
-			<text name="BDensText">
-				Horyzont zamglenia
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<slider label="" name="WLHazeHorizon"/>
-			<text name="BDensText2">
-				Gęstość błękitu
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<slider label="" name="WLBlueDensityR"/>
-			<slider label="" name="WLBlueDensityG"/>
-			<slider label="" name="WLBlueDensityB"/>
-			<slider label="" name="WLBlueDensityI"/>
-			<text name="HDText">
-				Gęstość zamglenia
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<slider label="" name="WLHazeDensity"/>
-			<text name="DensMultText">
-				Mnożnik gęsości
-			</text>
-			<button label="?" name="WLDensityMultHelp"/>
-			<slider label="" name="WLDensityMult"/>
-			<text name="WLDistanceMultText">
-				Mnożnik dystansu
-			</text>
-			<button label="?" name="WLDistanceMultHelp"/>
-			<slider label="" name="WLDistanceMult"/>
-			<text name="MaxAltText">
-				Max wysokość
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp"/>
-			<slider label="" name="WLMaxAltitude"/>
-		</panel>
-		<panel label="ŚWIATŁO" name="Lighting">
-			<text name="SLCText">
-				Kolor Słońca/Księżyca
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLSunlightR"/>
-			<slider label="" name="WLSunlightG"/>
-			<slider label="" name="WLSunlightB"/>
-			<slider label="" name="WLSunlightI"/>
-			<text name="TODText">
-				Pozycja Słońca/Księżyca
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<slider label="" name="WLSunAngle"/>
-			<text name="WLAmbientText">
-				Otoczenie
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<slider label="" name="WLAmbientR"/>
-			<slider label="" name="WLAmbientG"/>
-			<slider label="" name="WLAmbientB"/>
-			<slider label="" name="WLAmbientI"/>
-			<text name="WLEastAngleText">
-				Pozycja wschodu
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<slider label="" name="WLEastAngle"/>
-			<text name="SunGlowText">
-				Blask Słońca
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Ostrość" name="WLGlowB"/>
-			<slider label="Rozmiar" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Jasność obrazu
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<slider label="" name="WLGamma"/>
-			<text name="WLStarText">
-				Blask gwiazd
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-			<slider label="" name="WLStarAlpha"/>
-		</panel>
-		<panel label="CHMURY" name="Clouds">
-			<text name="WLCloudColorText">
-				Kolor chmur
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<slider label="" name="WLCloudColorR"/>
-			<slider label="" name="WLCloudColorG"/>
-			<slider label="" name="WLCloudColorB"/>
-			<slider label="" name="WLCloudColorI"/>
-			<text name="WLCloudColorText2">
-				Chmury (XY/Gęstość)
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<slider label="" name="WLCloudX"/>
-			<slider label="" name="WLCloudY"/>
-			<slider label="" name="WLCloudDensity"/>
-			<text name="WLCloudCoverageText">
-				Pokrycie chmur
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<slider label="" name="WLCloudCoverage"/>
-			<text name="WLCloudScaleText">
-				Skala chmur
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<slider label="" name="WLCloudScale"/>
-			<text name="WLCloudDetailText">
-				Szczegóły (XY/gęstość)
-			</text>
-			<button label="?" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				G
-			</text>
-			<slider label="" name="WLCloudDetailX"/>
-			<slider label="" name="WLCloudDetailY"/>
-			<slider label="" name="WLCloudDetailDensity"/>
-			<text name="WLCloudScrollXText">
-				Przewijanie chmur X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Zablokuj" name="WLCloudLockX"/>
-			<slider label="" name="WLCloudScrollX"/>
-			<text name="WLCloudScrollYText">
-				Przewijanie chmur Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Zablokuj" name="WLCloudLockY"/>
-			<slider label="" name="WLCloudScrollY"/>
-			<check_box label="Klasyczne chmury" name="DrawClassicClouds"/>
-			<button label="?" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-	<string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e869806d04..fe4662c5a2 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -138,7 +138,6 @@
 		<menu_item_check label="Wyłącz ograniczenia zasięgu kamery" name="Disable Camera Distance"/>
 		<menu_item_check label="Wysoka rozdzielczość zdjęć" name="HighResSnapshot"/>
 		<menu_item_check label="Zapisuj zdjęcia na dysk twardy bez efektu dźwiękowego" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Skompresuj zdjęcie na dysk twardy" name="CompressSnapshotsToDisk"/>
 		<menu label="Narzędzia" name="Performance Tools">
 			<menu_item_call label="Pomiar lagów" name="Lag Meter"/>
 			<menu_item_check label="Statystyki" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 63f976a314..7d3225ea31 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2385,7 +2385,7 @@ Spróbuj ponowanie za kilka minut.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Obiekt o nazwie &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, należący do [NAME_SLURL] dał Tobie [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Zachowaj"/>
 			<button name="Discard" text="Wyrzuć"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
index 8a183c00cf..72c162f63d 100644
--- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Zapisz obrazek" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Cofnij" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
index da9f84cb2e..ef52e2148b 100644
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -66,16 +66,16 @@ Chcesz spotkać ludzi? Spróbuj [secondlife:///app/worldmap Mapa Świata].
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Pokaż zdjęcie, grupy i inne informacje o Rezydencie"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Otwórz wiadomości IM"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Dzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml
index 34c105225d..d69d137d23 100644
--- a/indra/newview/skins/default/xui/pl/panel_places.xml
+++ b/indra/newview/skins/default/xui/pl/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Pokaż opcje dodatkowe"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="Profil" name="profile_btn" tool_tip="Pokaż profil miejsca"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 6eceed46d3..6a8309cca5 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1072,9 +1072,6 @@
 	<string name="InvFolder My Inventory">
 		Moja Szafa
 	</string>
-	<string name="InvFolder My Favorites">
-		Moje ulubione
-	</string>
 	<string name="InvFolder Library">
 		Biblioteka
 	</string>
@@ -1133,10 +1130,10 @@
 		Gesturki
 	</string>
 	<string name="InvFolder Favorite">
-		Ulubione
+		Moje ulubione
 	</string>
 	<string name="InvFolder favorite">
-		Ulubione
+		Moje ulubione
 	</string>
 	<string name="InvFolder Current Outfit">
 		Obecny strój
@@ -1698,7 +1695,7 @@
 	<string name="RegionNoCovenantOtherOwner">
 		Brak umowy dla tego majątku. Każda posiadłość w tym majątku została sprzedana przez właściciela majątku nie Linden Lab. Skontaktuj się z właścicielem majątku w celu uzuskania szczegółów sprzedaży.
 	</string>
-	<string name="covenant_last_modified" value="Ostatnio modyfikowano:"/>
+	<string name="covenant_last_modified" value="Ostatnio modyfikowano: "/>
 	<string name="none_text" value=" (żadne) "/>
 	<string name="never_text" value=" (nigdy) "/>
 	<string name="GroupOwned">
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index e48cac7d1f..514c7382f8 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -133,12 +133,12 @@ Vá para o menu Mundo &gt; Sobre o terreno ou selecione outro lote para mostrar
 				0
 			</text>
 			<button label="Comprar terreno..." label_selected="Comprar terreno..." left="130" name="Buy Land..." width="125"/>
+			<button label="Venda Linden" name="Linden Sale..." tool_tip="O terreno precisa ser possuído, estar com o conteúdo configurado e não estar pronto para leilão."/>
 			<button label="Dados do script" name="Scripts..."/>
 			<button label="Comprar para o grupo" name="Buy For Group..."/>
 			<button label="Comprar passe..." label_selected="Comprar passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a este terreno." width="125"/>
 			<button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..."/>
 			<button label="Pedir terreno" name="Reclaim Land..."/>
-			<button label="Venda Linden" name="Linden Sale..." tool_tip="O terreno precisa ser possuído, estar com o conteúdo configurado e não estar pronto para leilão."/>
 		</panel>
 		<panel label="CONTRATO" name="land_covenant_panel">
 			<panel.string name="can_resell">
@@ -308,6 +308,9 @@ Apenas lotes maiores podem ser listados na busca.
 			<panel.string name="push_restrict_region_text">
 				Proibido empurrar (regulamento da região)
 			</panel.string>
+			<panel.string name="see_avs_text">
+				Veja e bata papo com os residentes deste terreno
+			</panel.string>
 			<text name="allow_label">
 				Autorizar outros residentes a:
 			</text>
@@ -370,6 +373,10 @@ Apenas lotes maiores podem ser listados na busca.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
+			<text name="allow_label5">
+				Permitir que residentes de outros terrenos:
+			</text>
+			<check_box label="Ver avatares" name="SeeAvatarsCheck" tool_tip="Permite que residentes de outros terrenos vejam e conversem com os residentes deste terreno e vice-versa."/>
 			<text name="landing_point">
 				Ponto de Aterrissagem: [LANDING]
 			</text>
@@ -429,6 +436,11 @@ Mídia:
 				Som:
 			</text>
 			<check_box label="Limitar sons de gestos e objetos a esta parcela" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				Áudio de avatares:
+			</text>
+			<check_box label="Todos" name="all av sound check"/>
+			<check_box label="Grupo" name="group av sound check"/>
 			<text name="Voice settings:">
 				Voz:
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 666e185819..acc462ea94 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPÇÕES DE GRADE">
-	<spinner label="Unidade da grade (metros)" name="GridResolution"/>
-	<spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		Tela
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Local
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Mundo
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Referência
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Anexo
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacidade da grade">
+		Modo
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado">
+		<combo_box.item label="Grid SL" name="World"/>
+		<combo_box.item label="Grid local" name="Local"/>
+		<combo_box.item label="Grid de referência" name="Reference"/>
+	</combo_box>
+	<spinner label="Unidades (metros):" name="GridResolution"/>
+	<spinner label="Extensões (metros)" name="GridDrawSize"/>
 	<check_box label="Encaixar em sub-unidades" name="GridSubUnit"/>
 	<check_box label="Ver corte transversal" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacidade da grade">
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
deleted file mode 100644
index 9560a3b418..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="EDITOR DE CICLO DE DIA">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Ciclo do dia" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp"/>
-			<text name="WL12am">
-				0:00
-			</text>
-			<text name="WL3am">
-				3:00
-			</text>
-			<text name="WL6am">
-				6:00
-			</text>
-			<text name="WL9amHash">
-				9:00
-			</text>
-			<text name="WL12pmHash">
-				12:00
-			</text>
-			<text name="WL3pm">
-				15:00
-			</text>
-			<text name="WL6pm">
-				18:00
-			</text>
-			<text name="WL9pm">
-				21:00
-			</text>
-			<text name="WL12am2">
-				24:00
-			</text>
-			<button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
-			<button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
-			<text name="WLCurKeyFrameText">
-				Configurações de Quadro-chave:
-			</text>
-			<text name="WLCurKeyTimeText">
-				Tempo-chave:
-			</text>
-			<spinner label="Hora" name="WLCurKeyHour"/>
-			<spinner label="Minutos" name="WLCurKeyMin"/>
-			<text name="WLCurKeyTimeText2">
-				Ajuste-chave:
-			</text>
-			<combo_box label="Ajuste" name="WLKeyPresets"/>
-			<text name="DayCycleText">
-				Grudar:
-			</text>
-			<combo_box label="5 minutos" name="WLSnapOptions"/>
-			<text name="DayCycleText2">
-				Duração do Ciclo:
-			</text>
-			<spinner label="Hora" name="WLLengthOfDayHour"/>
-			<spinner label="Min." name="WLLengthOfDayMin"/>
-			<spinner label="Seg." name="WLLengthOfDaySec"/>
-			<text name="DayCycleText3">
-				Visualizar
-			</text>
-			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
-			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
-			<button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
-			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
-			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
new file mode 100644
index 0000000000..a8b5d8f67d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="EXCLUIR CONF AMBIENTE">
+	<string name="title_water">
+		Excluir pré-configuração da água
+	</string>
+	<string name="title_sky">
+		Excluir pré-configuração de céu
+	</string>
+	<string name="title_day_cycle">
+		Excluir pré-configuração dos dias
+	</string>
+	<string name="label_water">
+		Pré-configuração:
+	</string>
+	<string name="label_sky">
+		Pré-configuração:
+	</string>
+	<string name="label_day_cycle">
+		Ciclo dia:
+	</string>
+	<string name="msg_confirm_deletion">
+		Tem certeza de que quer excluir esta pré-configuração?
+	</string>
+	<string name="msg_sky_is_referenced">
+		Impossível excluir pré-configuração utilizada por um ou mais ciclos de dia .
+	</string>
+	<string name="combo_label">
+		-Selecione uma pré-configuração-
+	</string>
+	<text name="label">
+		Pré-configuração:
+	</text>
+	<button label="Excluir" name="delete"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
new file mode 100644
index 0000000000..9e25938986
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="Editar ciclo dos dias">
+	<string name="title_new">
+		Criar novo ciclo de dias
+	</string>
+	<string name="title_edit">
+		Editar ciclo dos dias
+	</string>
+	<string name="hint_new">
+		Dê um nome ao seu ciclo dos dias, ajuste os controles para criá-lo e clique em &quot;Salvar&quot;.
+	</string>
+	<string name="hint_edit">
+		Para editar sua configuração do dia, ajuste os controles e clique em &quot;Salvar&quot;.
+	</string>
+	<string name="combo_label">
+		-Selecione uma pré-configuração-
+	</string>
+	<text name="label">
+		Nome:
+	</text>
+	<text name="note">
+		Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a uma pré-configuração atual.
+	</text>
+	<text name="hint_item1">
+		- Clique em uma guia para editar as configurações e horário de um céu.
+	</text>
+	<text name="hint_item2">
+		- Clique e arraste as guias para definir as transições.
+	</text>
+	<text name="hint_item3">
+		- Use a seta para rever o ciclo dos dias.
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
+		<button label="Excluir chave" label_selected="Excluir chave" name="WLDeleteKey"/>
+		<text name="WL12am">
+			24:00
+		</text>
+		<text name="WL3am">
+			03:00
+		</text>
+		<text name="WL6am">
+			06:00
+		</text>
+		<text name="WL9amHash">
+			09:00
+		</text>
+		<text name="WL12pmHash">
+			12:00
+		</text>
+		<text name="WL3pm">
+			15:00
+		</text>
+		<text name="WL6pm">
+			18:00
+		</text>
+		<text name="WL9pm">
+			21:00
+		</text>
+		<text name="WL12am2">
+			24:00
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		Configuração do céu:
+	</text>
+	<combo_box label="Pré-configuração" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		Hora:
+	</text>
+	<time name="time" value="06:00"/>
+	<check_box label="Usar como novo ciclo de dias" name="make_default_cb"/>
+	<button label="Salvar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
new file mode 100644
index 0000000000..1f1fbcce7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="Editar pré-configuração do céu">
+	<string name="title_new">
+		Criar nova pré-configuração de céu
+	</string>
+	<string name="title_edit">
+		Editar pré-configuração do céu
+	</string>
+	<string name="hint_new">
+		Dê um nome à sua pré-configuração, ajuste os controles para criá-la e clique em &quot;Salvar&quot;.
+	</string>
+	<string name="hint_edit">
+		Para editar sua pré-configuração do céu, ajuste os controles e clique em &quot;Salvar&quot;.
+	</string>
+	<string name="combo_label">
+		-Selecione uma pré-configuração-
+	</string>
+	<text name="hint">
+		Para editar sua pré-configuração do céu, ajuste os controles e clique em &quot;Salvar&quot;.
+	</text>
+	<text name="label">
+		Nome:
+	</text>
+	<text name="note">
+		Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a pré-configuração atual.
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="ATMOSFERA" name="Atmosphere">
+			<text name="BHText">
+				Horizonte azul
+			</text>
+			<text name="BDensText">
+				Horizonte com névoa
+			</text>
+			<text name="BDensText2">
+				Densidade azul
+			</text>
+			<text name="HDText">
+				Densidade da névoa
+			</text>
+			<text name="DensMultText">
+				Multiplicador de densidade
+			</text>
+			<text name="WLDistanceMultText">
+				Multiplicador de distância
+			</text>
+			<text name="MaxAltText">
+				Altitude máxima
+			</text>
+		</panel>
+		<panel label="ILUMINAÇÃO" name="Lighting">
+			<text name="SLCText">
+				Cor do sol/lua
+			</text>
+			<text name="WLAmbientText">
+				Ambiente
+			</text>
+			<text name="SunGlowText">
+				Brilho do sol
+			</text>
+			<slider label="Foco" name="WLGlowB"/>
+			<slider label="Tamanho" name="WLGlowR"/>
+			<text name="WLStarText">
+				Brilho das estrelas
+			</text>
+			<text name="SceneGammaText">
+				Raios gama
+			</text>
+			<text name="TODText">
+				Posição do sol/lua
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				24:00
+			</text>
+			<text name="WL6am">
+				06:00
+			</text>
+			<text name="WL12pmHash">
+				12:00
+			</text>
+			<text name="WL6pm">
+				18:00
+			</text>
+			<text name="WL12am2">
+				24:00
+			</text>
+			<time name="WLDayTime" value="06:00"/>
+			<text name="WLEastAngleText">
+				Ângulo leste
+			</text>
+		</panel>
+		<panel label="NUVENS" name="Clouds">
+			<text name="WLCloudColorText">
+				Cor das nuvens
+			</text>
+			<text name="WLCloudColorText2">
+				XY / densidade das nuvens
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				Cobertura das nuvens
+			</text>
+			<text name="WLCloudScaleText">
+				Escala das nuvens
+			</text>
+			<text name="WLCloudDetailText">
+				Detalhe das nuvens (XY / densidade)
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				Passagem das nuvens X
+			</text>
+			<check_box label="Fixar" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				Passagem das nuvens Y
+			</text>
+			<check_box label="Fixar" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="Usar esta pré-configuração como meu novo céu" name="make_default_cb"/>
+	<button label="Salvar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
new file mode 100644
index 0000000000..7bde22851e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="Editar pré-configuração da água">
+	<string name="title_new">
+		Criar nova pré-configuração de água
+	</string>
+	<string name="title_edit">
+		Editar pré-configuração da água
+	</string>
+	<string name="hint_new">
+		Dê um nome à sua pré-configuração, ajuste os controles para criá-la e clique em &quot;Salvar&quot;.
+	</string>
+	<string name="hint_edit">
+		Para editar sua pré-configuração de água, ajuste os controles e clique em &quot;Salvar&quot;.
+	</string>
+	<string name="combo_label">
+		-Selecione uma pré-configuração-
+	</string>
+	<text name="hint">
+		Para editar sua pré-configuração, ajuste os controles e clique em &quot;Salvar&quot;.
+	</text>
+	<text name="label">
+		Nome da pré-configuração:
+	</text>
+	<text name="note">
+		Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a configuração atual.
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			Cor da névoa da água
+		</text>
+		<text name="water_fog_density_label">
+			Expoente da densidade da névoa
+		</text>
+		<text name="underwater_fog_modifier_label">
+			Modificador de névoa submerso
+		</text>
+		<text name="BHText">
+			Direção de onda grande
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			Escala de ondas de reflexo
+		</text>
+		<text name="HDText">
+			Escala de Fresnel
+		</text>
+		<text name="FresnelOffsetText">
+			Recuo de Fresnel
+		</text>
+		<text name="BHText2">
+			Direção de onda pequena
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			Escala de refração acima
+		</text>
+		<text name="WaterScaleBelowText">
+			Escala de refração abaixo
+		</text>
+		<text name="MaxAltText">
+			Multiplicador de distorção
+		</text>
+		<text name="BHText3">
+			Mapa normal
+		</text>
+	</panel>
+	<check_box label="Usar esta pré-configuração na minha água" name="make_default_cb"/>
+	<button label="Salvar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
deleted file mode 100644
index 3ca8d934c9..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="EDITOR DO AMBIENTE">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Hora do Dia
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Cobertura de
-Nuvens
-	</text>
-	<text name="EnvWaterColorText">
-		Cor da água
-	</text>
-	<color_swatch label="" name="EnvWaterColor" tool_tip="Selecionar a cor"/>
-	<text name="EnvWaterFogText">
-		Névoa da
-água
-	</text>
-	<button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/>
-	<button label="Céu Avançado" left="167" name="EnvAdvancedSkyButton" width="155"/>
-	<button label="Água Avançada" left="326" name="EnvAdvancedWaterButton" width="155"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
new file mode 100644
index 0000000000..4055ba97ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="AMBIENTE">
+	<text name="note">
+		Use as opções abaixo para personalizar as configurações de ambiente no visualizador.
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Usar configurações da região" name="use_region_settings"/>
+		<radio_item label="Personalizar meu ambiente" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			Observação: suas configurações não se aplicam aos outros usuários.
+		</text>
+		<text name="water_settings_title">
+			Configuração de água
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Selecione uma pré-configuração-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciclo céu / dia
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Céu fixo" name="my_sky_settings"/>
+			<radio_item label="Ciclo dia" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Selecione uma pré-configuração-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Selecione uma pré-configuração-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="OK" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
index cdad55bded..4a537fafb1 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -3,6 +3,9 @@
 	<string name="status_idle">
 		Inativo
 	</string>
+	<string name="status_parse_error">
+		Dae parsing - erro, detalhes no log.
+	</string>
 	<string name="status_reading_file">
 		Carregando...
 	</string>
@@ -12,6 +15,9 @@
 	<string name="status_vertex_number_overflow">
 		Erro: Número de Vertex acima de 65534. Abortado.
 	</string>
+	<string name="bad_element">
+		Erro: elemento inválido
+	</string>
 	<string name="high">
 		Alto
 	</string>
@@ -54,6 +60,9 @@
 	<string name="simplifying">
 		Simplificando...
 	</string>
+	<string name="tbd">
+		A ser definido
+	</string>
 	<text name="name_label">
 		Nome:
 	</text>
@@ -74,23 +83,26 @@
 			Nível de detalhamento: Mais baixo
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Custo do recurso: [COST]
-		</text>
-		<text name="physics cost">
-			Custo físico: [COST]
-		</text>
-		<text name="upload fee">
-			Taxa de upload: N/D
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		AVISO:
+	</text>
+	<text name="warning_message">
+		Não será possível concluir o upload final desse modelo para os servidores do Second Life. [[VURL] Saiba como] ativar o upload de modelos mesh.
+	</text>
+	<text name="weights_text">
+		Download:
+Físico:
+Servidor:
+
+Equivalente em prims:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Padrão" name="reset_btn" tool_tip="Valores padrão"/>
-	<button label="Upload" name="ok_btn" tool_tip="Carregar no simulador"/>
-	<button label="Cancelar" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Nível de detalhamento:" name="lod_panel">
 			<text name="lod_table_header">
@@ -228,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Tarifa de upload: L$ [FEE]
+	</text>
+	<button label="Definir como padrão" name="reset_btn" tool_tip="Definir como padrão"/>
+	<button label="Calcular pesos e tarifa" name="calculate_btn" tool_tip="Calcular pesos e tarifa"/>
+	<button label="Upload" name="ok_btn" tool_tip="Carregar no simulador"/>
+	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
index 1064e16e83..a67a66a446 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
@@ -2,190 +2,216 @@
 <floater name="Model Wizard" title="CARREGAR ASSISTENTE DE MODELAGEM">
 	<button label="5. Carregar" name="upload_btn"/>
 	<button label="4. Revisar" name="review_btn"/>
-	<button label="3. Física" name="physics2_btn"/>
 	<button label="3. Física" name="physics_btn"/>
 	<button label="2. Otimizar" name="optimize_btn"/>
 	<button label="1. Selecionra arquivo" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carregar modelo
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Escolher arquivo de modelo
 			</text>
 		</panel>
-		<text name="description">
-			O assistente ajuda você a importar modelos mesh para o Second Life.  Para começar, especifique o arquivo com o modelo a ser importado.  O Second Life suporta arquivos COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nome do arquivo:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Usuários avançados: se você estiver familiarizado com ferramentas de criação de conteúdo 3D, use o Advanced Uploader.
+			</text>
+			<button label="Trocar para avançado" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Escolha o arquivo de modelo para upload
 			</text>
 			<button label="Procurar..." label_selected="Procurar..." name="browse"/>
+			<text name="support_collada_text">
+				O Second Life oferece suporte a arquivos COLLADA (.dae)
+			</text>
+			<text name="dimensions_label">
+				Dimensões (metros):
+			</text>
 			<text name="dimensions">
-				X         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				AVISO:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Não será possível concluir a etapa final do upload desse modelo para os servidores do Second Life. [secondlife:///app/floater/learn_more Saiba como] configurar sua conta para uploads de modelos mesh.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Otimizar
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Otimizar modelo
 			</text>
 		</panel>
-		<text name="description">
-			O assistente otimizou seu modelo para melhorar o desempenho.  Ajuste os resultados da otimização abaixou ou clique em Próximo para prosseguir.
+		<text name="optimize_hint">
+			O modelo foi ajustado para desempenho. Faça novos ajustes, se desejar.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Gerar nível de detalhes
+			</text>
 			<text name="high_detail_text">
-				Gerar nível de detalhamento: Alto
+				Gerar nível de detalhes: Alto
 			</text>
 			<text name="medium_detail_text">
-				Gerar nível de detalhamento: Médio
+				Gerar nível de detalhes: Médio
 			</text>
 			<text name="low_detail_text">
-				Gerar nível de detalhamento: Baixo
+				Gerar nível de detalhes: Baixo
 			</text>
 			<text name="lowest_detail_text">
-				Gerar nível de detalhamento: Mais baixo
+				Gerar nível de detalhes: mais baixo
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Visualizar modelo:
+			<text name="optimize_performance_text">
+				Desempenho
+			</text>
+			<text name="optimize_faster_rendering_text">
+				Renderização mais rápida
+Menos detalhes
+Peso menor do prim
+			</text>
+			<text name="optimize_accuracy_text">
+				Precisão
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Renderização mais lenta
+Mais detalhes
+Peso maior do prim
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="LOD para ver no renderizador de pré-visualização">
-				<combo_item name="high">
-					Alto
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Recalcular geometria" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Visualização da geometria
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="LOD para exibir na renderização de visualização">
+				<combo_item name="preview_lod_high">
+					Máximo de detalhes
 				</combo_item>
-				<combo_item name="medium">
-					Médio
+				<combo_item name="preview_lod_medium">
+					Detalhes médios
 				</combo_item>
-				<combo_item name="low">
-					Baixo
+				<combo_item name="preview_lod_low">
+					Poucos detalhes
 				</combo_item>
-				<combo_item name="lowest">
-					Mais baixo
+				<combo_item name="preview_lod_lowest">
+					Mínimo de detalhes
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Custo do recurso:    [COST]
-			</text>
-			<text name="dimensions">
-				X         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Ajustar físico
 			</text>
 		</panel>
-		<text name="description">
-			O assistente cria uma forma física que determina como o objeto interage com outros objetos e avatares.  Ajuste a barra para o nível de detalhamento mais apropriado para a finalidade do seu objeto:
+		<text name="physics_hint">
+			Criaremos uma forma para o corpo externo do modelo. Ajuste o nível de detalhes como necessário para a finalidade desejada de seu modelo.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Custo do recurso:       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Desempenho
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+			<text name="physics_faster_rendering_text">
+				Renderização mais rápida
+Menos detalhes
+Peso menor do prim
 			</text>
-		</panel>
-		<text name="description">
-			Veja a forma física abaixo e clique em Próximo para prosseguir.   Para modificar o formato físico, clique em Anterior.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Visualizar modelo:
+			<text name="physics_accuracy_text">
+				Precisão
+			</text>
+			<text name="physics_slower_dendering_text">
+				Renderização mais lenta
+Mais detalhes
+Peso maior do prim
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="LOD para ver no renderizador de pré-visualização">
-				<combo_item name="high">
-					Alto
+			<text name="physics_example_1">
+				Exemplos:
+Objetos em movimento
+Objetos voadores
+Veículos
+			</text>
+			<text name="physics_example_2">
+				Exemplos:
+Objetos estáticos pequenos
+Objetos menos detalhados
+Mobília simples
+			</text>
+			<text name="physics_example_3">
+				Exemplos:
+Objetos estáticos
+Objetos detalhados
+Construções
+			</text>
+			<button label="Recalcular físico" name="recalculate_physics_btn"/>
+			<button label="Recalculando..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Visualização do físico
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="LOD para exibir na renderização de visualização">
+				<combo_item name="preview_lod2_high">
+					Máximo de detalhes
 				</combo_item>
-				<combo_item name="medium">
-					Médio
+				<combo_item name="preview_lod2_medium">
+					Detalhes médios
 				</combo_item>
-				<combo_item name="low">
-					Baixo
+				<combo_item name="preview_lod2_low">
+					Poucos detalhes
 				</combo_item>
-				<combo_item name="lowest">
-					Mais baixo
+				<combo_item name="preview_lod2_lowest">
+					Mínimo de detalhes
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Custo do recurso:       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Revisar
 			</text>
 		</panel>
-		<text name="description">
-			Veja os detalhes abaixo e clique em  Carregar para carregar seu modelo. Seu saldo L$ será cobrado quando você clicar em Carregar.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Visualizar modelo:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impacto no lote/região: [EQUIV] equivalentes de prim
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="LOD para ver no renderizador de pré-visualização">
-				<combo_item name="high">
-					Alto
-				</combo_item>
-				<combo_item name="medium">
-					Médio
-				</combo_item>
-				<combo_item name="low">
-					Baixo
-				</combo_item>
-				<combo_item name="lowest">
-					Mais baixo
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X         Y:         Z:
+			<text name="review_fee">
+				Uma tarifa de upload de L$ [FEE] será debitada da sua conta.
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Ao clicar no botão de upload, você confirma que detém os direitos apropriados sobre o material contido no modelo.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Custo do recurso:         [COST]
-		</text>
-		<text name="physics cost">
-			Custo físico:        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carregado!
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Upload concluído
 			</text>
 		</panel>
-		<text name="description">
-			Parabéns! Seu modelo foi carregado com êxito.   Procure-o na pasta Objetos de seu inventário.
+		<text name="model_uploaded_text">
+			Seu modelo foi carregado.
+		</text>
+		<text name="inventory_text">
+			Disponível na pasta Objetos do seu inventário.
+		</text>
+		<text name="charged_fee">
+			L$ [FEE] foram debitados da sua conta.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Voltar" name="back"/>
 	<button label="Próximo &gt;&gt;" name="next"/>
+	<button label="Calcular pesos e tarifa &gt;&gt;" name="calculate"/>
+	<button label="Calculando..." name="calculating"/>
 	<button label="Carregar" name="upload" tool_tip="Carregar no simulador"/>
 	<button label="Cancelar" name="cancel"/>
 	<button label="Fechar" name="close"/>
@@ -193,6 +219,9 @@
 	<string name="status_idle">
 		Inativo
 	</string>
+	<string name="status_parse_error">
+		Dae parsing - erro, detalhes no log.
+	</string>
 	<string name="status_reading_file">
 		Carregando...
 	</string>
@@ -202,6 +231,9 @@
 	<string name="status_vertex_number_overflow">
 		Erro: Número de Vertex acima de 65534. Abortado.
 	</string>
+	<string name="bad_element">
+		Erro: elemento inválido
+	</string>
 	<string name="high">
 		Alto
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml
index 4bf7181180..3509cb786d 100644
--- a/indra/newview/skins/default/xui/pt/floater_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="BUSCAR">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Carregando...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index c6694d13b2..83f7b24572 100644
--- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="DEBUG SETTINGS">
 	<radio_group name="boolean_combo">
-		<radio_item label="TRUE" name="TRUE" value="verdadeiro"/>
-		<radio_item label="FALSE" name="FALSE" value=""/>
+		<radio_item label="TRUE" name="TRUE" />
+		<radio_item label="FALSE" name="FALSE" />
 	</radio_group>
 	<color_swatch label="Cor" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index ed273d9f28..6850bf2d7c 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Clicar e arrastar para selecionar a terra
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Tela
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] objetos ( [PRIM_COUNT] prims[PE_STRING] ) selecionados
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Mundo
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Referência
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Anexo
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] equivalentes de prims
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Foco"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
@@ -66,20 +57,12 @@
 	<check_box label="Editar partes linkadas" name="checkbox edit linked parts"/>
 	<button label="Link" name="link_btn"/>
 	<button label="Desconectar links" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto">
-		þ: [COUNT]
-	</text>
 	<check_box label="" 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="Mostrar na grade" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Selecione a régua da grade onde o objeto será colocado">
-		<combo_box.item label="Grade SL" name="World"/>
-		<combo_box.item label="Local" name="Local"/>
-		<combo_box.item label="Referência" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Ajustar" name="checkbox snap to grid"/>
 	<button label="Opções..." label_selected="Opções..." name="Options..." tool_tip="Mais opções de grade"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -119,23 +102,11 @@
 		Força
 	</text>
 	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar a terra selecionada"/>
-	<text left="134" name="obj_count">
-		Objetos: [COUNT]
-	</text>
-	<text left="134" name="prim_count">
-		Prims: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Conjuntos linkados: [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Custo dos conjuntos selecionados [prims],[complexidade física]">
-		Custo: [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Objetos: [COUNT]
+	<text name="selection_empty">
+		Nada selecionado.
 	</text>
-	<text name="object_cost" tool_tip="Custo dos objetos selecionados [prims] / [complexidade física]">
-		Custo: [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Peso do físico [PHYS_WEIGHT], custo de renderização [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs" tab_max_width="60" tab_min_width="30" width="288">
 		<panel label="Comum" name="General">
@@ -353,7 +324,6 @@
 				<combo_box.item label="Toróide" name="Torus"/>
 				<combo_box.item label="Plano" name="Plane"/>
 				<combo_box.item label="Cilindro" name="Cylinder"/>
-				<combo_box.item label="Mesh" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Recursos" name="Features">
@@ -405,7 +375,7 @@
 			</combo_box>
 			<spinner label="Gravidade" name="Physics Gravity"/>
 			<spinner label="Fricção" name="Physics Friction"/>
-			<spinner label="Densidade" name="Physics Density"/>
+			<spinner label="Densidade em 100 kg/m^3" name="Physics Density"/>
 			<spinner label="Restituição" name="Physics Restitution"/>
 		</panel>
 		<panel label="Textura" name="Texture">
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index cb9b3c8c0d..4f01600d9f 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Novo!)
 	</string>
+	<string name="effect_Arena">
+		Arena
+	</string>
+	<string name="effect_Beast">
+		Fera
+	</string>
+	<string name="effect_Buff">
+		Entusiasmado
+	</string>
+	<string name="effect_Buzz">
+		Zumbido
+	</string>
+	<string name="effect_Camille">
+		Camille
+	</string>
+	<string name="effect_Creepy">
+		Assustador
+	</string>
+	<string name="effect_CreepyBot">
+		RobôAssustador
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		RobôVozGrossa
+	</string>
+	<string name="effect_Demon">
+		Demônio
+	</string>
+	<string name="effect_Flirty">
+		Paquerador
+	</string>
+	<string name="effect_Foxy">
+		Sensual
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Bônus_Halloween_2010
+	</string>
+	<string name="effect_Helium">
+		Hélio
+	</string>
+	<string name="effect_Husky">
+		Rouco
+	</string>
+	<string name="effect_Intercom">
+		Interfone
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Pesadelo
+	</string>
+	<string name="effect_PopBot">
+		RobôPop
+	</string>
+	<string name="effect_Rachel">
+		Rachel
+	</string>
+	<string name="effect_Radio">
+		Rádio
+	</string>
+	<string name="effect_Robot">
+		Robô
+	</string>
+	<string name="effect_Roxanne">
+		Roxanne
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samantha
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Baixinho
+	</string>
+	<string name="effect_Sneaky">
+		Sorrateiro
+	</string>
+	<string name="effect_Stallion">
+		Garanhão
+	</string>
+	<string name="effect_Sultry">
+		Ardente
+	</string>
+	<string name="effect_Thunder">
+		Trovão
+	</string>
+	<string name="effect_Vixen">
+		Maliciosa
+	</string>
+	<string name="effect_WhinyBot">
+		RobôReclamão
+	</string>
 	<text name="preview_text">
 		Visualizar
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
deleted file mode 100644
index b2a06f4ff2..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_water.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="EDITOR DE ÁGUA AVANÇADO">
-	<text name="KeyFramePresetsText" width="175">
-		Pré-configurações da Água:
-	</text>
-	<combo_box left_delta="175" name="WaterPresetsCombo" width="150"/>
-	<button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="DEFINIÇÕES" name="Settings">
-			<text name="BHText">
-				Cor da névoa da Água
-			</text>
-			<button label="?" name="WaterFogColorHelp"/>
-			<color_swatch label="" name="WaterFogColor" tool_tip="Selecionar a cor"/>
-			<text name="WaterFogDensText">
-				Expoente da Densidade de névoa
-			</text>
-			<button label="?" left="209" name="WaterFogDensityHelp"/>
-			<text name="WaterUnderWaterFogModText">
-				Modificador da névoa Subaquática
-			</text>
-			<button label="?" left="209" name="WaterUnderWaterFogModHelp"/>
-			<text name="BDensText">
-				Escala da Marola de Reflexão
-			</text>
-			<button label="?" left="415" name="WaterNormalScaleHelp"/>
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Escala de Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelScaleHelp"/>
-			<text name="FresnelOffsetText">
-				Deslocamento de Fresnel
-			</text>
-			<button label="?" left="415" name="WaterFresnelOffsetHelp"/>
-			<text name="DensMultText">
-				Refratar a Escala para Cima
-			</text>
-			<button label="?" left="640" name="WaterScaleAboveHelp"/>
-			<text name="WaterScaleBelowText">
-				Refratar a Escala para Baixo
-			</text>
-			<button label="?" left="640" name="WaterScaleBelowHelp"/>
-			<text name="MaxAltText">
-				Multiplicador de Difusão
-			</text>
-			<button label="?" left="640" name="WaterBlurMultiplierHelp"/>
-		</panel>
-		<panel label="IMAGEM" name="Waves">
-			<text name="BHText">
-				Direção da Onda Maior
-			</text>
-			<button label="?" left="170" name="WaterWave1Help"/>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direção da Onda Pequena
-			</text>
-			<button label="?" left="170" name="WaterWave2Help"/>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Mapa Normal
-			</text>
-			<button label="?" name="WaterNormalMapHelp"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
deleted file mode 100644
index ec459bbb26..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="EDITOR DE CÉU AVANÇADO">
-	<text name="KeyFramePresetsText" width="140">
-		Pré-definições de Céu:
-	</text>
-	<combo_box left_delta="140" name="WLPresetsCombo"/>
-	<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
-	<button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/>
-	<button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/>
-	<button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" left_delta="84" name="WLDayCycleMenuButton" width="150"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFERA" name="Atmosphere">
-			<text name="BHText">
-				Horizonte Azul
-			</text>
-			<button label="?" name="WLBlueHorizonHelp"/>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Horizonte da Neblina
-			</text>
-			<button label="?" name="WLHazeHorizonHelp"/>
-			<text name="BDensText2">
-				Densidade de Azul
-			</text>
-			<button label="?" name="WLBlueDensityHelp"/>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densidade da Neblina
-			</text>
-			<button label="?" name="WLHazeDensityHelp"/>
-			<text name="DensMultText">
-				Multiplicador de Densidade
-			</text>
-			<button label="?" left="635" name="WLDensityMultHelp"/>
-			<text name="WLDistanceMultText">
-				Multiplicador de Distância
-			</text>
-			<button label="?" left="635" name="WLDistanceMultHelp"/>
-			<text name="MaxAltText">
-				Altitude Máxima
-			</text>
-			<button label="?" left="635" name="WLMaxAltitudeHelp"/>
-		</panel>
-		<panel label="ILUMINAÇÃO" name="Lighting">
-			<text name="SLCText">
-				Cor do Sol/Lua
-			</text>
-			<button label="?" name="WLSunlightColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Posição do Sol/Lua
-			</text>
-			<button label="?" name="WLTimeOfDayHelp"/>
-			<text name="WLAmbientText">
-				Ambiente
-			</text>
-			<button label="?" name="WLAmbientHelp"/>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Ângulo Leste
-			</text>
-			<button label="?" name="WLEastAngleHelp"/>
-			<text name="SunGlowText">
-				Brilho do Sol
-			</text>
-			<button label="?" name="WLSunGlowHelp"/>
-			<slider label="Foco" name="WLGlowB"/>
-			<slider label="Tamanho" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Gamma da Cena
-			</text>
-			<button label="?" name="WLSceneGammaHelp"/>
-			<text name="WLStarText">
-				Brilho da Estrela
-			</text>
-			<button label="?" name="WLStarBrightnessHelp"/>
-		</panel>
-		<panel label="NUVENS" name="Clouds">
-			<text name="WLCloudColorText">
-				Cor da Nuvem
-			</text>
-			<button label="?" name="WLCloudColorHelp"/>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Densidade/ XY da Nuvem
-			</text>
-			<button label="?" name="WLCloudDensityHelp"/>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Cobertura da Nuvem
-			</text>
-			<button label="?" name="WLCloudCoverageHelp"/>
-			<text name="WLCloudScaleText">
-				Escala da Nuvem
-			</text>
-			<button label="?" name="WLCloudScaleHelp"/>
-			<text font="SansSerifSmall" name="WLCloudDetailText">
-				Detalhe da Nuvem (XY/Densidade)
-			</text>
-			<button label="?" left="421" name="WLCloudDetailHelp"/>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Rolagem X da Nuvem
-			</text>
-			<button label="?" name="WLCloudScrollXHelp"/>
-			<check_box label="Travar" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Rolagem Y da Nuvem
-			</text>
-			<button label="?" name="WLCloudScrollYHelp"/>
-			<check_box label="Travar" name="WLCloudLockY"/>
-			<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
-			<button label="?" left="645" name="WLClassicCloudsHelp"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 3dff3d7c8a..1d3fa48fb3 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -17,7 +17,7 @@
 		<menu_item_call label="Mostrar TOS" name="TOS"/>
 		<menu_item_call label="Mostrar mensagem crítica" name="Critical"/>
 		<menu_item_call label="Teste de mídia do navegador" name="Web Browser Test"/>
-		<menu_item_call label="Teste de conteúdo web" name="Web Content Floater Test"/>
+		<menu_item_call label="Test de Bugs de Conteúdo Web" name="Web Content Floater Debug Test"/>
 		<menu_item_check label="Exibir seletor da grade" name="Show Grid Picker"/>
 		<menu_item_call label="Exibir painel de notificações" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
index 228ce46a31..0d32d58de4 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_group_plus">
+<toggleable_menu name="menu_group_plus">
 	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
 	<menu_item_check label="Ordenar por nome" name="sort_name"/>
 	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
 	<menu_item_check label="Ver ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Ver Mapa" name="view_map"/>
 	<menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 4213db7440..ea54afed5e 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -31,6 +31,7 @@
 		<menu_item_call label="Meus grupos" name="My Groups"/>
 		<menu_item_check label="Bate-papo local" name="Nearby Chat"/>
 		<menu_item_call label="Pessoas por perto" name="Active Speakers"/>
+		<menu_item_check label="Voz por perto" name="Nearby Voice"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_check label="Mini Mapa" name="Mini-Map"/>
@@ -63,8 +64,24 @@
 			<menu_item_call label="Meio-dia" name="Noon"/>
 			<menu_item_call label="Pôr-do-Sol" name="Sunset"/>
 			<menu_item_call label="Meia-noite" name="Midnight"/>
-			<menu_item_call label="Horário da propriedade" name="Revert to Region Default"/>
-			<menu_item_call label="Editor de ambiente" name="Environment Editor"/>
+		</menu>
+		<menu label="Editor de ambientes" name="Enviroment Editor">
+			<menu_item_call label="Configurações de ambiente..." name="Enviroment Settings"/>
+			<menu label="Pré-configurações de água" name="Water Presets">
+				<menu_item_call label="Nova pré-configuração..." name="new_water_preset"/>
+				<menu_item_call label="Editar pré-configuração..." name="edit_water_preset"/>
+				<menu_item_call label="Excluir pré-configuração..." name="delete_water_preset"/>
+			</menu>
+			<menu label="Pré-configurações de céu" name="Sky Presets">
+				<menu_item_call label="Nova pré-configuração..." name="new_sky_preset"/>
+				<menu_item_call label="Editar pré-configuração..." name="edit_sky_preset"/>
+				<menu_item_call label="Excluir pré-configuração..." name="delete_sky_preset"/>
+			</menu>
+			<menu label="Pré-configurações de dias" name="Day Presets">
+				<menu_item_call label="Nova pré-configuração..." name="new_day_preset"/>
+				<menu_item_call label="Editar pré-configuração..." name="edit_day_preset"/>
+				<menu_item_call label="Excluir pré-configuração..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="Construir" name="BuildTools">
@@ -142,7 +159,6 @@
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/>
 		<menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="Compactar fotos para HD" name="CompressSnapshotsToDisk"/>
 		<menu label="Ferramentas de desempenho" name="Performance Tools">
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
index 7b6ce4d87e..75dca703cb 100644
--- a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Wearing">
+<toggleable_menu name="Gear Wearing">
 	<menu_item_call label="Editar look" name="edit"/>
 	<menu_item_call label="Tirar" name="takeoff"/>
-</menu>
+	<menu_item_call label="Copiar lista do look para a área de transferência" name="copy"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 56a33f51e8..22de7edfdd 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -1541,6 +1541,10 @@ Por favor volte mais tarde.
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		Você fez [OFFERS] ofertas de teletransporte, porém o seu limite é [LIMIT].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
 		Convocar residente à sua localização com poderes de deus?
 		<form name="form">
@@ -1962,6 +1966,10 @@ Você gostaria de deixar o modo Ocupado antes de completar esta transação?
 		Tem certeza de que quer apagar todo o histórico de viagens, web e buscas?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		Tem certeza que deseja apagar o cache do visualizador?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		Você tem certeza de que deseja limpar os cookies?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/>
@@ -1987,48 +1995,30 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 		Você deseja substituir a pré-configuração salva?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		Você deseja apagar [SKY]?
-		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
-	</notification>
 	<notification name="WLNoEditDefault">
 		Você não pode editar ou excluir um padrão predefinido.
 	</notification>
 	<notification name="WLMissingSky">
 		Este arquivo de ciclo de dia se refere a um arquivo de céu faltando: [SKY].
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		Existe efeito de Pós-Processamento. Você deseja substituí-lo?
-		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
+	<notification name="WLRegionApplyFail">
+		As configurações não podem ser aplicadas à região.   Talvez sair e votlar à região resolva.   Motivo:  [FAIL_REASON]
 	</notification>
-	<notification name="NewSkyPreset">
-		Me dê o nome para o novo céu.
-		<form name="form">
-			<input name="message">
-				Novo padrão
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Cancelar"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		Este padrão já existe!
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		Impossível excluir a última chave do ciclo pois um ciclo não pode ficar vazio.   Modifique a última chave em vez de tentar apagá-la, depois crie uma chave nova.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		Dê o nome para o novo padrão de água.
-		<form name="form">
-			<input name="message">
-				Nova Apresentação
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Cancelar"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		Não é possível adicionar mais chaves de quadro a este ciclo.   O máximo de chaves de quadro para ciclos de dia de [SCOPE] é [MAX].
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		Este padrão já existe!
+	<notification name="EnvUpdateRate">
+		Cada configuração de ambiente só pode ser atualizada a cada [WAIT] segundos.   Aguarde pelo menos isso e tente novamente.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		Você não pode editar ou apagar um padrão predefinido.
+	<notification name="PPSaveEffectAlert">
+		Existe efeito de Pós-Processamento. Você deseja substituí-lo?
+		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		Não foi possível iniciar uma nova sessão bate-papo com [RECIPIENT].
@@ -2057,13 +2047,14 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 		<usetemplate ignoretext="Vestir as roupas que eu criar enquanto edito minha aparência" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Área restrita a residentes com idade comprovada.   Deseja ir ao site do [SECOND_LIFE] para comprovar sua idade? 
+		Você deve ter no mínimo 18 anos para acessar conteúdo e áreas adultas no Second Life. Visite nossa página de verificação de idade para confirmar que você tem mais de 18 anos. 
+Isso abrirá o seu navegador.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=pt
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Não" yestext="Sim"/>
+		<usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Cancelar" yestext="Ir para verificação de idade"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Área restrita a residentes que já cadastraram seus dados de pagamento  Deseja ir ao site do [SECOND_LIFE] para cuidar disso? 
@@ -2316,6 +2307,9 @@ Logo, não é possível voar aqui.
 	<notification name="NoBuild">
 		Esta área desativou a opção de construir.  Não é possível construir ou fazer rez de objetos nesta área.
 	</notification>
+	<notification name="SeeAvatars">
+		Este terreno oculta os avatares e bate-papo de outro terreno.    Não é possível ver residentes fora do terreno e vice-versa.   O bate-papo por texto no canal 0 também está bloqueado.
+	</notification>
 	<notification name="ScriptsStopped">
 		Um administrador não permitiu scripts temporariamente nesta região.
 	</notification>
@@ -2407,7 +2401,7 @@ Por favor, tente novamente em alguns instantes.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Um objeto chamado &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, de [NAME_SLURL], lhe deu este(a) [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Segure"/>
 			<button name="Discard" text="Descarte"/>
@@ -2740,7 +2734,15 @@ O botão será exibido quando houver espaço suficente.
 		Selecione os residentes com quem compartilhar.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] não foi carregado: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+		[LABEL] não foi carregado: [MESSAGE] [IDENTIFIER] 
+
+Mais detalhes no log.
+	</notification>
+	<notification name="MeshUploadPermError">
+		Erro ao solicitar permissões de upload de mesh.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Não foi possível obter o recurso &apos;[CAPABILITY]&apos; da região.
 	</notification>
 	<notification name="ShareItemsConfirmation">
 		Tem certeza de que quer compartilhar os itens abaixo?
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
index 432affcf09..5eb9987e71 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Salvar destaque" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Cancelar" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
index 2b2e7c1dbf..2d74e092a4 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/people/[SEARCH_TERM] Busca]."/>
+		<no_visible_tabs_text name="no_outfits_msg" value="Você ainda não tem nenhum look. Tente encontrar um na [secondlife:///app/search/groups Busca]."/>
+	</accordion>
 	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+		<menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
 		<button name="trash_btn" tool_tip="Excluir o look selecionado"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index aece30738b..f3af15b991 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -66,16 +66,16 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
index 7fc07483c0..8abe579702 100644
--- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
@@ -64,6 +64,8 @@
 						<text name="scripts_value" value="Ligado"/>
 						<text name="damage_label" value="Dano:"/>
 						<text name="damage_value" value="Desligado"/>
+						<text name="see_avatars_label" value="Ver avatares:"/>
+						<text name="see_avatars_value" value="Desligar"/>
 						<button label="Sobre o terreno" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml
index 828ef3e469..69f0baf65f 100644
--- a/indra/newview/skins/default/xui/pt/panel_places.xml
+++ b/indra/newview/skins/default/xui/pt/panel_places.xml
@@ -24,7 +24,7 @@
 						<menu_button label="▼" name="overflow_btn" tool_tip="Mostrar opções adicionais"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="Perfil" name="profile_btn" tool_tip="Mostrar perfil do lugar"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
index bbe7e15ba2..c72928fc35 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		Cache:
+	</text>
+	<spinner label="Cache (64 - 9984 MB)" name="cachesizespinner"/>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="Limpar cache" label_selected="Limpar cache" name="clear_cache"/>
+	<text name="Cache location">
+		Localização do cache:
+	</text>
+	<button label="Navegar" label_selected="Navegar" name="set_cache"/>
+	<button label="Localização padrão" label_selected="Localização padrão" name="default_cache_location"/>
 	<text name="UI Size:">
 		Interface:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
index 4164147e5c..d910a7b812 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
@@ -19,6 +19,7 @@
 	<check_box label="Ativado" name="enable_voice_check"/>
 	<check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="true"/>
 	<check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="true"/>
+	<check_box label="Tocar áudio de gestos" name="gesture_audio_play_btn" tool_tip="Selecione para ouvir o áudio de gestos" value="verdadeiro"/>
 	<text name="voice_chat_settings">
 		Configuração de bate-papo de voz
 	</text>
@@ -35,28 +36,5 @@
 	<button label="Definir chave" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/>
 	<button label="Controles de entrada/saída" name="device_settings_btn" width="180"/>
-	<panel label="Configuração dos dispositivo" name="device_settings_panel">
-		<panel.string name="default_text">
-			Padrão
-		</panel.string>
-		<panel.string name="default system device">
-			Dispositivo padrão do sistema
-		</panel.string>
-		<panel.string name="no device">
-			Nenhum
-		</panel.string>
-		<text name="Input">
-			Entrada
-		</text>
-		<text name="My volume label">
-			Meu volume:
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Mude o volume usando o controle deslizante"/>
-		<text name="wait_text">
-			Aguarde
-		</text>
-		<text name="Output">
-			Saída
-		</text>
-	</panel>
+	<panel label="Configuração dos dispositivo" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
new file mode 100644
index 0000000000..79eedebe5f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ambiente" name="panel_env_info">
+	<text name="water_settings_title">
+		Selecione as configurações de Água e céu / Ciclo dos dias que todos os visitantes à sua região verão.  Mais informações
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="Usar o padrão do Second Life" name="use_sl_default_settings"/>
+		<radio_item label="Usar as seguintes configurações" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			Configuração de água
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-Selecione uma pré-configuração-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			Ciclo céu / dia
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="Céu fixo" name="my_sky_settings"/>
+			<radio_item label="Ciclo dia" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-Selecione uma pré-configuração-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-Selecione uma pré-configuração-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index b9b0e9d90f..74330a8946 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -7,21 +7,56 @@
 		nenhum
 	</text>
 	<spinner label="Altura da água" name="water_height_spin"/>
-	<button label="?" name="water_height_help"/>
-	<spinner label="Limite do aumento do &#10;terreno" name="terrain_raise_spin"/>
-	<button label="?" name="terrain_raise_help"/>
-	<spinner label="Limite mais baixo do &#10;terreno" name="terrain_lower_spin" bottom_delta="-34"/>
-	<button label="?" name="terrain_lower_help"/>
-	<check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/>
-	<button label="?" name="use_estate_sun_help"/>
-	<check_box label="Sol fixo" name="fixed_sun_check"/>
-	<button label="?" name="fixed_sun_help"/>
-	<slider label="Fase" name="sun_hour_slider"/>
-	<button label="Aplicar" name="apply_btn"/>
+	<spinner label="Limite do aumento do 
+terreno" name="terrain_raise_spin"/>
+	<spinner bottom_delta="-34" label="Limite mais baixo do 
+terreno" name="terrain_lower_spin"/>
+	<text name="detail_texture_text">
+		Texturas de terreno (exige arquivos .tga 512x512, 24 bit)
+	</text>
+	<text name="height_text_lbl">
+		1 (Baixo)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Alto)
+	</text>
+	<text name="height_text_lbl5">
+		Intervalos de elevação de textura
+	</text>
+	<text name="height_text_lbl10">
+		Os valores representam o intervalo de mistura das texturas acima.
+	</text>
+	<text name="height_text_lbl11">
+		Em metros, o valor BAIXO é a altura MÁXIMA da Textura 1, e HIGH é a altura MÍNIMA da Textura 4.
+	</text>
+	<text name="height_text_lbl6">
+		Noroeste
+	</text>
+	<text name="height_text_lbl7">
+		Nordeste
+	</text>
+	<spinner label="Baixo" name="height_start_spin_1"/>
+	<spinner label="Baixo" name="height_start_spin_3"/>
+	<spinner label="Alto" name="height_range_spin_1"/>
+	<spinner label="Alto" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		Sudoeste
+	</text>
+	<text name="height_text_lbl9">
+		Sudeste
+	</text>
+	<spinner label="Baixo" name="height_start_spin_0"/>
+	<spinner label="Baixo" name="height_start_spin_2"/>
+	<spinner label="Alto" name="height_range_spin_0"/>
+	<spinner label="Alto" name="height_range_spin_2"/>
 	<button label="Download de terreno RAW..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
-	<button label="?" name="download_raw_help"/>
 	<button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/>
-	<button label="?" name="upload_raw_help"/>
-	<button width="170" label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
-	<button left="190" label="?" name="bake_terrain_help"/>
+	<button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo" width="170"/>
+	<button label="Aplicar" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
index fb612ca19b..66db89f48f 100644
--- a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Padrão
 	</panel.string>
+	<string name="name_no_device">
+		Nenhum
+	</string>
+	<string name="name_default_system_device">
+		Dispositivo padrão do sistema
+	</string>
 	<text name="Input">
 		Entrada
 	</text>
+	<text name="Output">
+		Saída
+	</text>
 	<text name="My volume label">
 		Meu volume:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Aguarde
 	</text>
-	<text name="Output">
-		Saída
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
index 11ac6c106a..988e7c7076 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Coisas" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						Itens recebidos ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						Itens recebidos
+					</string>
+					<button label="Itens recebidos" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] novos
+					</text>
+					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+						<text name="inbox_inventory_placeholder">
+							Compras do marketplace serão entregues aqui.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+			<layout_panel name="outbox_layout_panel">
+				<panel label="" name="marketplace_outbox">
+					<button label="Caixa de saída de comerciante" name="outbox_btn"/>
+					<button label="" name="outbox_sync_btn" tool_tip="Enviar para minha vitrine no Marketplace"/>
+					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
+						<text name="outbox_inventory_placeholder">
+							Abra uma conta de comerciante para usar este recurso.
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index c5268966c1..2f3b438564 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -25,6 +25,9 @@
 	<string name="StartupInitializingVFS">
 		Iniciando VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Falha na inicialização dos gráficos. Atualize seu driver gráfico!
+	</string>
 	<string name="ProgressRestoring">
 		Restaurando...
 	</string>
@@ -79,6 +82,12 @@
 	<string name="LoginQuicktimeOK">
 		O QuickTime foi inicializado com sucesso.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Solicitando recursos da região...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Solicitando recursos da região, tentativa [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Aguardando handshake com a região...
 	</string>
@@ -1132,6 +1141,12 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="InventoryNoTexture">
 		Você não possui uma cópia desta textura no seu inventário
 	</string>
+	<string name="InventoryInboxNoItems">
+		Compras do marketplace serão entregues aqui.
+	</string>
+	<string name="InventoryOutboxNoItems">
+		Arraste seus itens aqui para preparar sua listagem na sua vitrine do Marketplace.
+	</string>
 	<string name="no_transfer" value="(não transferível)"/>
 	<string name="no_modify" value="(não modificável)"/>
 	<string name="no_copy" value="(não copiável)"/>
@@ -1172,9 +1187,6 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="InvFolder My Inventory">
 		Meu inventário
 	</string>
-	<string name="InvFolder My Favorites">
-		Meus favoritos
-	</string>
 	<string name="InvFolder Library">
 		Biblioteca
 	</string>
@@ -1233,10 +1245,10 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 		Gestos
 	</string>
 	<string name="InvFolder Favorite">
-		Favoritos
+		Meus favoritos
 	</string>
 	<string name="InvFolder favorite">
-		Favoritos
+		Meus favoritos
 	</string>
 	<string name="InvFolder Current Outfit">
 		Look atual
@@ -1259,6 +1271,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="InvFolder All">
 		Tudo
 	</string>
+	<string name="no_attachments">
+		Nenhum anexo vestido
+	</string>
 	<string name="Buy">
 		Comprar
 	</string>
@@ -1568,6 +1583,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	</string>
 	<string name="SummaryForTheWeek" value="Resumo para esta semana, com início em "/>
 	<string name="NextStipendDay" value=". Próximo dia de salário é "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="Grupo       Divisão individualI"/>
 	<string name="GroupColumn" value="Grupo"/>
 	<string name="Balance">
@@ -1594,6 +1612,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="IMTeen">
 		adolescente
 	</string>
+	<string name="Anyone">
+		qualquer um
+	</string>
 	<string name="RegionInfoError">
 		erro
 	</string>
@@ -1801,7 +1822,7 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="RegionNoCovenantOtherOwner">
 		Não foi definido um contrato para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda.
 	</string>
-	<string name="covenant_last_modified" value="Última modificação:"/>
+	<string name="covenant_last_modified" value="Última modificação: "/>
 	<string name="none_text" value="(nenhum)"/>
 	<string name="never_text" value="(nunca)"/>
 	<string name="GroupOwned">
@@ -1810,6 +1831,12 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="Public">
 		Público
 	</string>
+	<string name="LocalSettings">
+		Configurações locais
+	</string>
+	<string name="RegionSettings">
+		Configurações da região
+	</string>
 	<string name="ClassifiedClicksTxt">
 		Cliques: [TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil
 	</string>
@@ -1882,6 +1909,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="GroupMoneyDebits">
 		Débitos
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Conteúdo
 	</string>
@@ -3597,6 +3627,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="LocationCtrlGeneralIconTooltip">
 		Região em geral
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		Avatar visíveis e bate-papo permitido fora deste terreno
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Atualização
 	</string>
@@ -4013,6 +4046,87 @@ Denunciar abuso
 	<string name="Female - Wow">
 		Wow - feminino
 	</string>
+	<string name="/bow">
+		/reverência
+	</string>
+	<string name="/clap">
+		/palmas
+	</string>
+	<string name="/count">
+		/contar
+	</string>
+	<string name="/extinguish">
+		/apagar
+	</string>
+	<string name="/kmb">
+		/dane_se
+	</string>
+	<string name="/muscle">
+		/músculos
+	</string>
+	<string name="/no">
+		/não
+	</string>
+	<string name="/no!">
+		/não!
+	</string>
+	<string name="/paper">
+		/papel
+	</string>
+	<string name="/pointme">
+		/apontar_eu
+	</string>
+	<string name="/pointyou">
+		/apontar_você
+	</string>
+	<string name="/rock">
+		/pedra
+	</string>
+	<string name="/scissor">
+		/tesoura
+	</string>
+	<string name="/smoke">
+		/fumar
+	</string>
+	<string name="/stretch">
+		/alongar
+	</string>
+	<string name="/whistle">
+		/assobiar
+	</string>
+	<string name="/yes">
+		/sim
+	</string>
+	<string name="/yes!">
+		/sim!
+	</string>
+	<string name="afk">
+		ldt
+	</string>
+	<string name="dance1">
+		dança1
+	</string>
+	<string name="dance2">
+		dança2
+	</string>
+	<string name="dance3">
+		dança3
+	</string>
+	<string name="dance4">
+		dança4
+	</string>
+	<string name="dance5">
+		dança5
+	</string>
+	<string name="dance6">
+		dança6
+	</string>
+	<string name="dance7">
+		dança7
+	</string>
+	<string name="dance8">
+		dança8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index bee940ddc1..0ac85d399e 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -35,7 +35,7 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION]
 		（無）
 	</floater.string>
 	<floater.string name="AboutTraffic">
-		Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
+		封包損失：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
 	</floater.string>
 	<tab_container name="about_tab">
 		<panel label="資訊" name="support_panel">
@@ -77,7 +77,7 @@ google-perftools Copyright (c) 2005, Google Inc.
 
 All rights reserved.  See licenses.txt for details.
 
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+語音聊天音頻編碼：Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index efd8909e67..e59a23fda0 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -30,7 +30,7 @@
 				Anyone
 			</panel.string>
 			<panel.string name="area_text">
-				Area
+				區域
 			</panel.string>
 			<panel.string name="area_size_text">
 				[AREA] m²
@@ -42,7 +42,7 @@
 				You must approve your purchase to modify this land.
 			</panel.string>
 			<panel.string name="group_owned_text">
-				（社團所擁有）
+				（群組所擁有）
 			</panel.string>
 			<panel.string name="profile_text">
 				檔案
@@ -81,13 +81,13 @@
 				分級：
 			</text>
 			<text name="ContentRatingText">
-				成人
+				完全成人
 			</text>
 			<text name="Owner:">
 				擁有者：
 			</text>
 			<text name="Group:">
-				社團：
+				群組：
 			</text>
 			<button label="設定" name="Set..."/>
 			<check_box label="Allow Deed to Group" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
@@ -133,7 +133,7 @@
 			</text>
 			<button label="購買土地" name="Buy Land..."/>
 			<button label="腳本資訊" name="Scripts..."/>
-			<button label="Buy For Group" name="Buy For Group..."/>
+			<button label="為群組購買" name="Buy For Group..."/>
 			<button label="購買通行權" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
 			<button label="放棄土地" name="Abandon Land..."/>
 			<button label="Reclaim Land" name="Reclaim Land..."/>
@@ -186,7 +186,7 @@
 				分級：
 			</text>
 			<text name="region_maturity_text">
-				成人
+				完全成人
 			</text>
 			<text name="resellable_lbl">
 				Resale:
@@ -238,7 +238,7 @@
 			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
 			<button label="退回" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
 			<text name="Set to group:">
-				Set to group:
+				設定群組：
 			</text>
 			<text name="group_objects_text">
 				[COUNT]
@@ -286,10 +286,10 @@ Only large parcels can be listed in search.
 				This option is disabled because you cannot modify this parcel&apos;s options.
 			</panel.string>
 			<panel.string name="mature_check_mature">
-				Moderate Content
+				適度成人內容
 			</panel.string>
 			<panel.string name="mature_check_adult">
-				成人內容
+				完全成人內容
 			</panel.string>
 			<panel.string name="mature_check_mature_tooltip">
 				Your parcel information or content is considered moderate.
@@ -315,17 +315,17 @@ Only large parcels can be listed in search.
 				建造：
 			</text>
 			<check_box label="任何人" name="edit objects check"/>
-			<check_box label="社團" name="edit group objects check"/>
+			<check_box label="群組" name="edit group objects check"/>
 			<text name="allow_label3">
 				物件進入：
 			</text>
 			<check_box label="任何人" name="all object entry check"/>
-			<check_box label="社團" name="group object entry check"/>
+			<check_box label="群組" name="group object entry check"/>
 			<text name="allow_label4">
 				執行腳本：
 			</text>
 			<check_box label="任何人" name="check other scripts"/>
-			<check_box label="社團" name="check group scripts"/>
+			<check_box label="群組" name="check group scripts"/>
 			<text name="land_options_label">
 				土地選項：
 			</text>
@@ -335,7 +335,7 @@ Only large parcels can be listed in search.
 			<combo_box name="land category with adult">
 				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
-				<combo_box.item label="成人" name="item2"/>
+				<combo_box.item label="完全成人" name="item2"/>
 				<combo_box.item label="Arts &amp; Culture" name="item3"/>
 				<combo_box.item label="Business" name="item4"/>
 				<combo_box.item label="Educational" name="item5"/>
@@ -363,7 +363,7 @@ Only large parcels can be listed in search.
 				<combo_box.item label="Rental" name="item13"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
-			<check_box label="Moderate Content" name="MatureCheck" tool_tip=" "/>
+			<check_box label="適度成人內容" name="MatureCheck" tool_tip=" "/>
 			<text name="Snapshot:">
 				快照：
 			</text>
@@ -416,12 +416,12 @@ Only large parcels can be listed in search.
 			</text>
 			<check_box label="Loop" name="media_loop" tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."/>
 		</panel>
-		<panel label="SOUND" name="land_audio_panel">
+		<panel label="聲音" name="land_audio_panel">
 			<text name="MusicURL:">
-				Music URL:
+				音樂 URL：
 			</text>
 			<text name="Sound:">
-				Sound:
+				聲音：
 			</text>
 			<check_box label="Restrict gesture and object sounds to this parcel" name="check sound local"/>
 			<text name="Voice settings:">
@@ -449,11 +449,11 @@ Only large parcels can be listed in search.
 			</text>
 			<check_box label="Payment Information on File [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Ban unidentified Residents."/>
 			<check_box label="年齡驗證 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."/>
-			<check_box label="Allow Group Access: [GROUP]" name="GroupCheck" tool_tip="Set group in the General tab."/>
-			<check_box label="Sell passes to:" name="PassCheck" tool_tip="Allows temporary access to this parcel"/>
+			<check_box label="允許出入的群組：[GROUP]" name="GroupCheck" tool_tip="Set group in the General tab."/>
+			<check_box label="出售通行權給：" name="PassCheck" tool_tip="允許暫時出入這個地段"/>
 			<combo_box name="pass_combo">
 				<combo_box.item label="Anyone" name="Anyone"/>
-				<combo_box.item label="社團" name="Group"/>
+				<combo_box.item label="群組" name="Group"/>
 			</combo_box>
 			<spinner label="Price in L$:" name="PriceSpin"/>
 			<spinner label="Hours of access:" name="HoursSpin"/>
@@ -462,11 +462,11 @@ Only large parcels can be listed in search.
 					Allowed Residents
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] listed, [MAX] max)"/>
-				<button label="Add" name="add_allowed"/>
-				<button label="Remove" label_selected="Remove" name="remove_allowed"/>
+				<button label="添加" name="add_allowed"/>
+				<button label="移除" label_selected="移除" name="remove_allowed"/>
 			</panel>
 			<panel name="Banned_layout_panel">
-				<text label="Ban" name="BanCheck">
+				<text label="禁止" name="BanCheck">
 					被封鎖的居民
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index b5d65119f7..baf68ffce6 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -35,7 +35,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 		Cannot get JOINT name.
 	</floater.string>
 	<floater.string name="E_ST_NO_OFFSET">
-		Cannot find OFFSET.
+		無法尋找位移。
 	</floater.string>
 	<floater.string name="E_ST_NO_CHANNELS">
 		Cannot find CHANNELS.
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
index eb1c9e55dc..b1862bc582 100644
--- a/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/indra/newview/skins/default/xui/zh/floater_auction.xml
@@ -6,6 +6,6 @@
 	<check_box initial_value="true" label="Include yellow selection fence" name="fence_check"/>
 	<button label="Snapshot" label_selected="Snapshot" name="snapshot_btn"/>
 	<button label="Sell to Anyone" label_selected="Sell to Anyone" name="sell_to_anyone_btn"/>
-	<button label="Clear Settings" label_selected="Clear Settings" name="reset_parcel_btn"/>
+	<button label="清除設定" label_selected="清除設定" name="reset_parcel_btn"/>
 	<button label="Start Auction" label_selected="Start Auction" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index 27a4199f8c..7e2d74c728 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -36,7 +36,7 @@
 		</panel>
 		<panel label="接近我" name="NearMePanel">
 			<text name="InstructSelectResident">
-				選擇一位附近的人：
+				選擇一個附近的人：
 			</text>
 			<slider label="範圍" name="near_me_range"/>
 			<text name="meters">
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index b1dc081f04..36dae7c798 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -17,31 +17,31 @@ Textures
 			<panel name="scroll_content_panel">
 				<texture_picker label="頭髮" name="hair-baked"/>
 				<texture_picker label="頭髮" name="hair_grain"/>
-				<texture_picker label="Hair Alpha" name="hair_alpha"/>
+				<texture_picker label="頭髮半透明" name="hair_alpha"/>
 				<texture_picker label="頭部" name="head-baked"/>
-				<texture_picker label="Makeup" name="head_bodypaint"/>
-				<texture_picker label="Head Alpha" name="head_alpha"/>
+				<texture_picker label="化妝" name="head_bodypaint"/>
+				<texture_picker label="頭部半透明" name="head_alpha"/>
 				<texture_picker label="頭部刺青" name="head_tattoo"/>
 				<texture_picker label="眼睛" name="eyes-baked"/>
 				<texture_picker label="眼睛" name="eyes_iris"/>
-				<texture_picker label="Eyes Alpha" name="eyes_alpha"/>
-				<texture_picker label="Upper Body" name="upper-baked"/>
-				<texture_picker label="Upper BodyPaint" name="upper_bodypaint"/>
+				<texture_picker label="眼睛半透明" name="eyes_alpha"/>
+				<texture_picker label="上半身半透明" name="upper-baked"/>
+				<texture_picker label="上半身身體部位" name="upper_bodypaint"/>
 				<texture_picker label="內衣" name="upper_undershirt"/>
 				<texture_picker label="手套" name="upper_gloves"/>
 				<texture_picker label="襯衫" name="upper_shirt"/>
-				<texture_picker label="Upper Jacket" name="upper_jacket"/>
-				<texture_picker label="Upper Alpha" name="upper_alpha"/>
-				<texture_picker label="Upper Tattoo" name="upper_tattoo"/>
-				<texture_picker label="Lower Body" name="lower-baked"/>
-				<texture_picker label="Lower BodyPaint" name="lower_bodypaint"/>
+				<texture_picker label="上半身夾克" name="upper_jacket"/>
+				<texture_picker label="上半身半透明" name="upper_alpha"/>
+				<texture_picker label="上半身刺青" name="upper_tattoo"/>
+				<texture_picker label="下半身" name="lower-baked"/>
+				<texture_picker label="下半身身體部位" name="lower_bodypaint"/>
 				<texture_picker label="內褲" name="lower_underpants"/>
 				<texture_picker label="襪子" name="lower_socks"/>
 				<texture_picker label="鞋子" name="lower_shoes"/>
 				<texture_picker label="褲子" name="lower_pants"/>
 				<texture_picker label="夾克" name="lower_jacket"/>
-				<texture_picker label="Lower Alpha" name="lower_alpha"/>
-				<texture_picker label="Lower Tattoo" name="lower_tattoo"/>
+				<texture_picker label="下半身半透明" name="lower_alpha"/>
+				<texture_picker label="下半身刺青" name="lower_tattoo"/>
 				<texture_picker label="裙子" name="skirt-baked"/>
 				<texture_picker label="裙子" name="skirt"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index 629b0d17d5..660710fb7b 100644
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDIT CONTENT PERMISSIONS">
+<floater name="floaterbulkperms" title="編輯內容物權限">
 	<floater.string name="nothing_to_modify_text">
-		Selection contains no editable contents.
+		選擇未包含可編輯的內容物。
 	</floater.string>
 	<floater.string name="status_text">
-		Setting permissions on [NAME]
+		設定權限於 [NAME]
 	</floater.string>
 	<floater.string name="start_text">
-		Starting permission change requests...
+		開始進行權限變更要求...
 	</floater.string>
 	<floater.string name="done_text">
-		Finished permission change requests.
+		權限變更要求已完成。
 	</floater.string>
 	<icon name="icon_animation" tool_tip="動作"/>
 	<icon name="icon_bodypart" tool_tip="身體部位"/>
@@ -24,10 +24,10 @@
 	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
 	<text name="newperms">
-		New Content Permissions
+		新內容物權限
 	</text>
 	<text name="GroupLabel">
-		社團：
+		群組：
 	</text>
 	<check_box label="分享" name="share_with_group"/>
 	<text name="AnyoneLabel">
@@ -39,7 +39,7 @@
 	</text>
 	<check_box label="修改" name="next_owner_modify"/>
 	<check_box label="覆製" name="next_owner_copy"/>
-	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="Next owner can give away or resell this object"/>
+	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="下一個擁有者能送出或轉售這個物件"/>
 	<button label="確定" name="apply"/>
 	<button label="取消" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index d2b7494b08..64c11af953 100644
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_bumps" title="BUMPS, PUSHES &amp; HITS">
 	<floater.string name="none_detected">
-		None detected
+		未偵測到
 	</floater.string>
 	<floater.string name="bump">
-		[TIME]  [NAME] bumped you
+		[TIME]  [NAME] 碰撞你
 	</floater.string>
 	<floater.string name="llpushobject">
-		[TIME]  [NAME] pushed you with a script
+		[TIME]  [NAME] 以腳本推撞你
 	</floater.string>
 	<floater.string name="selected_object_collide">
-		[TIME]  [NAME] hit you with an object
+		[TIME]  [NAME] 以物件擊中你
 	</floater.string>
 	<floater.string name="scripted_object_collide">
-		[TIME]  [NAME] hit you with a scripted object
+		[TIME]  [NAME] 以腳本物件擊中你
 	</floater.string>
 	<floater.string name="physical_object_collide">
-		[TIME]  [NAME] hit you with a physical object
+		[TIME]  [NAME] 以物理物件擊中你
 	</floater.string>
 	<floater.string name="timeStr">
 		[[hour,datetime,slt]:[min,datetime,slt]]
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index d8e9fb0ecc..f187a1ab40 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -7,7 +7,7 @@
 		你需要更多 L$
 	</text>
 	<text name="contacting">
-		Contacting LindeX...
+		聯接到 LindeX 中...
 	</text>
 	<text name="info_buying">
 		購買 L$
@@ -28,7 +28,7 @@
 		1234
 	</line_editor>
 	<text name="buying_label">
-		For the price
+		以此價格
 	</text>
 	<text name="currency_est">
 		approx. [LOCALAMOUNT]
@@ -60,7 +60,7 @@
 	<button label="立即購買" name="buy_btn"/>
 	<button label="取消" name="cancel_btn"/>
 	<text name="info_cannot_buy">
-		Unable to Buy
+		無法購買
 	</text>
-	<button label="Continue to the Web" name="error_web"/>
+	<button label="繼續到網頁" name="error_web"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index 34401c11d0..c4a5d174ef 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -16,7 +16,7 @@
 		You do not have permission to buy land for your active group.
 	</floater.string>
 	<floater.string name="no_land_selected">
-		No land selected.
+		無土地被選擇。
 	</floater.string>
 	<floater.string name="multiple_parcels_selected">
 		Multiple different parcels selected. 
@@ -32,7 +32,7 @@ Try selecting a smaller area.
 		The group already owns the parcel.
 	</floater.string>
 	<floater.string name="you_already_own">
-		You already own the parcel.
+		你已經擁有這個地段。
 	</floater.string>
 	<floater.string name="set_to_sell_to_other">
 		The selected parcel is set to sell to another party.
@@ -47,7 +47,7 @@ Try selecting a smaller area.
 	<floater.string name="processing">
 		Processing your purchase...
  
-(This may take a minute or two.)
+（過程這將會花費一到兩分鐘）
 	</floater.string>
 	<floater.string name="fetching_error">
 		There has been an error while fetching land buying information.
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index ef8bc183a4..507e482766 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="BUY COPY OF OBJECT">
+<floater name="contents" title="購買物件副本">
 	<floater.string name="title_buy_text">
 		購買
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
index 65d04583f5..f4db20684c 100644
--- a/indra/newview/skins/default/xui/zh/floater_camera.xml
+++ b/indra/newview/skins/default/xui/zh/floater_camera.xml
@@ -10,56 +10,56 @@
 		Move Camera Up and Down, Left and Right
 	</floater.string>
 	<floater.string name="camera_modes_title">
-		Camera modes
+		攝影機模式
 	</floater.string>
 	<floater.string name="pan_mode_title">
-		Orbit Zoom Pan
+		環繞縮放平移
 	</floater.string>
 	<floater.string name="presets_mode_title">
-		Preset Views
+		預設視角
 	</floater.string>
 	<floater.string name="free_mode_title">
-		View Object
+		視角物件
 	</floater.string>
 	<panel name="controls">
 		<panel name="preset_views_list">
 			<panel_camera_item name="front_view">
 				<panel_camera_item.text name="front_view_text">
-					Front View
+					前視視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 			<panel_camera_item name="group_view">
 				<panel_camera_item.text name="side_view_text">
-					Side View
+					側視視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 			<panel_camera_item name="rear_view">
 				<panel_camera_item.text name="rear_view_text">
-					Rear View
+					後視視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 		</panel>
 		<panel name="camera_modes_list">
 			<panel_camera_item name="object_view">
 				<panel_camera_item.text name="object_view_text">
-					Object View
+					物件視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 			<panel_camera_item name="mouselook_view">
 				<panel_camera_item.text name="mouselook_view_text">
-					Mouselook View
+					第一人稱視角
 				</panel_camera_item.text>
 			</panel_camera_item>
 		</panel>
 		<panel name="zoom">
 			<joystick_rotate name="cam_rotate_stick" tool_tip="Orbit camera around focus"/>
 			<slider_bar name="zoom_slider" tool_tip="Zoom camera toward focus"/>
-			<joystick_track name="cam_track_stick" tool_tip="Move camera up and down, left and right"/>
+			<joystick_track name="cam_track_stick" tool_tip="移動攝影機上下左右"/>
 		</panel>
 	</panel>
 	<panel name="buttons">
-		<button label="" name="presets_btn" tool_tip="Preset Views"/>
+		<button label="" name="presets_btn" tool_tip="預設視角"/>
 		<button label="" name="pan_btn" tool_tip="Orbit Zoom Pan"/>
-		<button label="" name="avatarview_btn" tool_tip="Camera modes"/>
+		<button label="" name="avatarview_btn" tool_tip="攝影機模式"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index 9968565bf2..9977bfc828 100644
--- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="groups" title="社團">
+<floater name="groups" title="群組">
 	<text name="groupdesc">
-		選擇一個社團：
+		選擇一個群組：
 	</text>
 	<button label="確定" label_selected="確定" name="OK"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
index e12fc21166..39abfe0b8b 100644
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -13,6 +13,6 @@
 		Type your new name again to confirm:
 	</text>
 	<button label="儲存" name="save_btn" tool_tip="Save your new Display Name"/>
-	<button label="Reset" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
+	<button label="重設" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
index 65a97f0cff..534ee7f0d0 100644
--- a/indra/newview/skins/default/xui/zh/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
@@ -13,13 +13,13 @@
 		Cloud Cover
 	</text>
 	<text name="EnvWaterColorText">
-		Water Color
+		水色
 	</text>
 	<color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/>
 	<text name="EnvWaterFogText">
-		Water Fog
+		水霧
 	</text>
 	<button label="Use Estate Time" name="EnvUseEstateTimeButton"/>
-	<button label="Advanced Sky" name="EnvAdvancedSkyButton"/>
-	<button label="Advanced Water" name="EnvAdvancedWaterButton"/>
+	<button label="進階天空" name="EnvAdvancedSkyButton"/>
+	<button label="進階水文" name="EnvAdvancedWaterButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 651a976774..a809cf085c 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</floater.string>
 	<floater.string name="playing">
-		(Playing)
+		（播放中）
 	</floater.string>
 	<floater.string name="copy_name">
 		Copy of [COPY_NAME]
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index fbe89ab2a6..448113bf74 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -2,25 +2,25 @@
 <floater name="godtools floater" title="神之工具">
 	<tab_container name="GodTools Tabs">
 		<panel label="網格" name="grid">
-			<button label="Flush This Region&apos;s Map Visibility Caches" label_selected="Flush This Region&apos;s Map Visibility Caches" name="Flush This Region&apos;s Map Visibility Caches"/>
+			<button label="刷新這個地區的地圖可視快取" label_selected="刷新這個地區的地圖可視快取" name="Flush This Region&apos;s Map Visibility Caches"/>
 		</panel>
 		<panel label="地區" name="region">
 			<text name="Region Name:">
 				地區名稱：
 			</text>
 			<check_box label="Prelude" name="check prelude" tool_tip="Set this to make the region a prelude"/>
-			<check_box label="Fixed Sun" name="check fixed sun" tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain"/>
+			<check_box label="固定太陽" name="check fixed sun" tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain"/>
 			<check_box label="Reset Home On Teleport" name="check reset home" tool_tip="When Resident teleports out, reset their home to the destination position."/>
 			<check_box label="Visible" name="check visible" tool_tip="Set this to make the region visible to non-gods"/>
-			<check_box label="Damage" name="check damage" tool_tip="Set this to enable damage in this region"/>
-			<check_box label="Block Traffic Tracking" name="block dwell" tool_tip="Set this to make the region not compute traffic"/>
-			<check_box label="Block Terraform" name="block terraform" tool_tip="Set this to disallow people terraforming their land"/>
-			<check_box label="Sandbox" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/>
-			<button label="Bake Terrain" label_selected="Bake Terrain" name="Bake Terrain" tool_tip="Save the current terrain as default"/>
+			<check_box label="傷害" name="check damage" tool_tip="Set this to enable damage in this region"/>
+			<check_box label="阻止流量追蹤" name="block dwell" tool_tip="Set this to make the region not compute traffic"/>
+			<check_box label="阻止變形" name="block terraform" tool_tip="Set this to disallow people terraforming their land"/>
+			<check_box label="沙盒" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/>
+			<button label="Bake Terrain" label_selected="Bake Terrain" name="Bake Terrain" tool_tip="儲存目前的地形為預設"/>
 			<button label="Revert Terrain" label_selected="Revert Terrain" name="Revert Terrain" tool_tip="Replace the current terrain with default"/>
 			<button label="Swap Terrain" label_selected="Swap Terrain" name="Swap Terrain" tool_tip="Swap current terrain with default"/>
 			<text name="estate id">
-				Estate ID:
+				領地 ID：
 			</text>
 			<text name="parent id">
 				Parent ID:
@@ -40,14 +40,14 @@
 			<text name="land cost text">
 				L$ per m²:
 			</text>
-			<button label="Refresh" label_selected="Refresh" name="Refresh" tool_tip="Click here to refresh the above information"/>
-			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
+			<button label="重新整理" label_selected="重新整理" name="Refresh" tool_tip="Click here to refresh the above information"/>
+			<button label="套用" label_selected="套用" name="Apply" tool_tip="點擊此處以接受套用上述變更"/>
 			<button label="選擇地區" label_selected="選擇地區" name="Select Region" tool_tip="Select the whole region with the land tool"/>
 			<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="Save gzipped state to autosave directory"/>
 		</panel>
 		<panel label="物件" name="objects">
 			<panel.string name="no_target">
-				(no target)
+				（無目標）
 			</panel.string>
 			<text name="Region Name:">
 				地區名稱：
@@ -61,7 +61,7 @@
 			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
 			<button label="Set Target" label_selected="Set Target" name="Set Target" tool_tip="Set the target avatar for object deletion"/>
 			<text name="target_avatar_name">
-				(no target)
+				（無目標）
 			</text>
 			<button label="Delete Target&apos;s Scripted Objects On Others Land" label_selected="Delete Target&apos;s Scripted Objects On Others Land" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."/>
 			<button label="Delete Target&apos;s Scripted Objects On *Any* Land" label_selected="Delete Target&apos;s Scripted Objects On *Any* Land" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."/>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index fcd702b16d..a41be7ef9a 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -46,7 +46,7 @@
 	</text>
 	<check_box label="覆製" name="CheckEveryoneCopy"/>
 	<text name="GroupLabel">
-		社團：
+		群組：
 	</text>
 	<check_box label="分享" name="CheckShareWithGroup"/>
 	<text name="NextOwnerLabel">
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index a4ede92ab1..370ab32b9f 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="最近_收納區_物品">
 	<check_box label="動作" name="check_animation"/>
-	<check_box label="Calling Cards" name="check_calling_card"/>
+	<check_box label="名片" name="check_calling_card"/>
 	<check_box label="服裝" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index 3d9d391a21..1d172f63e1 100644
--- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="MY LAND">
+<floater name="land holdings floater" title="我的土地">
 	<floater.string name="area_string">
 		[AREA] m²
 	</floater.string>
 	<scroll_list name="parcel list">
 		<scroll_list.columns label="地段" name="name"/>
 		<scroll_list.columns label="地區" name="location"/>
-		<scroll_list.columns label="Type" name="type"/>
-		<scroll_list.columns label="Area" name="area"/>
+		<scroll_list.columns label="類型" name="type"/>
+		<scroll_list.columns label="區域" name="area"/>
 	</scroll_list>
-	<button label="瞬間傳送" label_selected="瞬間傳送" name="Teleport" tool_tip="Teleport to the center of this land."/>
-	<button label="地圖" label_selected="地圖" name="Show on Map" tool_tip="Show this land on the world map"/>
+	<button label="瞬間傳送" label_selected="瞬間傳送" name="Teleport" tool_tip="瞬間傳送到這土地的中央。"/>
+	<button label="地圖" label_selected="地圖" name="Show on Map" tool_tip="將這塊土地顯示在世界地圖上。"/>
 	<text name="contrib_label">
 		Contributions to your groups:
 	</text>
 	<scroll_list name="grant list">
-		<scroll_list.columns label="社團" name="group"/>
-		<scroll_list.columns label="Area" name="area"/>
+		<scroll_list.columns label="群組" name="group"/>
+		<scroll_list.columns label="區域" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
 		Allowed land holdings at current payment plan:
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index e6f6e32352..fe61c312ed 100644
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -9,7 +9,7 @@
 	<floater.string name="Title">
 		腳本：[NAME]
 	</floater.string>
-	<button label="Reset" label_selected="Reset" name="Reset"/>
-	<check_box initial_value="true" label="Running" name="running"/>
+	<button label="重設" label_selected="重設" name="Reset"/>
+	<check_box initial_value="true" label="執行中" name="running"/>
 	<check_box initial_value="true" label="Mono" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
index 3e44f458e7..e1155bdf34 100644
--- a/indra/newview/skins/default/xui/zh/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml
@@ -43,33 +43,33 @@
 		向下飛（按下 C 鍵）
 	</string>
 	<string name="jump_tooltip">
-		Jump (press E)
+		跳躍（按下 E 鍵）
 	</string>
 	<string name="crouch_tooltip">
-		Crouch (press C)
+		蹲下（按下 C 鍵）
 	</string>
 	<string name="walk_title">
-		Walk
+		行走
 	</string>
 	<string name="run_title">
-		Run
+		跑步
 	</string>
 	<string name="fly_title">
 		飛行
 	</string>
 	<panel name="panel_actions">
-		<button name="turn left btn" tool_tip="Turn left (press Left Arrow or A)"/>
-		<joystick_slide name="move left btn" tool_tip="Walk left (press Shift + Left Arrow or A)"/>
-		<button name="turn right btn" tool_tip="Turn right (press Right Arrow or D)"/>
-		<joystick_slide name="move right btn" tool_tip="Walk right (press Shift + Right Arrow or D)"/>
-		<joystick_turn name="forward btn" tool_tip="Walk forward (press up arrow or W)"/>
-		<joystick_turn name="backward btn" tool_tip="Walk backward (press down arrow or S)"/>
+		<button name="turn left btn" tool_tip="左轉（按下左方向鍵或按 A 鍵）"/>
+		<joystick_slide name="move left btn" tool_tip="向左走（按下 Shift 加左方向鍵或按 A 鍵）"/>
+		<button name="turn right btn" tool_tip="右轉（按下右方向鍵或按 D 鍵）"/>
+		<joystick_slide name="move right btn" tool_tip="向右走（按下 Shift 加右方向鍵或按 D 鍵）"/>
+		<joystick_turn name="forward btn" tool_tip="向前走（按向上方向鍵或按 W 鍵）"/>
+		<joystick_turn name="backward btn" tool_tip="向後退（按向下方向鍵或按 S 鍵）"/>
 		<button name="move up btn" tool_tip="向上飛（按下 E 鍵）"/>
 		<button name="move down btn" tool_tip="向下飛（按下 C 建）"/>
 	</panel>
 	<panel name="panel_modes">
-		<button label="" name="mode_walk_btn" tool_tip="Walking mode"/>
-		<button label="" name="mode_run_btn" tool_tip="Running mode"/>
+		<button label="" name="mode_walk_btn" tool_tip="行走模式"/>
+		<button label="" name="mode_run_btn" tool_tip="跑步模式"/>
 		<button label="" name="mode_fly_btn" tool_tip="飛行模式"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index 7d76f4de08..606e061395 100644
--- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="block by name" title="BLOCK OBJECT BY NAME">
+<floater name="block by name" title="依名稱封鎖物件">
 	<text name="message">
 		Block an object:
 	</text>
 	<line_editor name="object_name">
-		Object name
+		物件名稱
 	</line_editor>
 	<text name="note">
 		* Only blocks object text, not sounds
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
index e33183a0dc..a557e1c2e3 100644
--- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
@@ -6,6 +6,6 @@
 		儲存我正在穿的為新裝扮：
 	</text>
 	<line_editor name="name ed">
-		[DESC] (new)
+		[DESC] （新）
 	</line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index b4841df0ff..0a823cd82e 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money">
 	<string name="payee_group">
-		支付社團
+		支付群組
 	</string>
 	<string name="payee_resident">
 		支付居民
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 2a2aec93b9..39259524d7 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money">
 	<string name="payee_group">
-		支付社團
+		支付群組
 	</string>
 	<string name="payee_resident">
 		支付居民
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
index 31b8133a18..498848ee56 100644
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perm prefs" title="預設上傳權限">
 	<panel label="權限" name="permissions">
-		<check_box label="與社團分享" name="share_with_group"/>
+		<check_box label="與群組分享" name="share_with_group"/>
 		<check_box label="允許任何人覆製" name="everyone_copy"/>
 		<text name="NextOwnerLabel">
 			下一個擁有者可以：
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index 0649ecb791..ad49370423 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -40,7 +40,7 @@
 	<combo_box label="無" name="modifier_combo"/>
 	<combo_box label="無" name="key_combo"/>
 	<text name="library_label">
-		Library:
+		資源庫：
 	</text>
 	<scroll_list name="library_list">
 		<scroll_list.rows name="action_animation" value="動作"/>
@@ -48,7 +48,7 @@
 		<scroll_list.rows name="action_chat" value="聊天"/>
 		<scroll_list.rows name="action_wait" value="等待"/>
 	</scroll_list>
-	<button label="Add &gt;&gt;" name="add_btn"/>
+	<button label="添加 &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
 		Steps:
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 3c2f913a6d..9447939801 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="記事卡：">
 	<floater.string name="no_object">
-		Unable to find object containing this notecard.
+		未發現物件包含此記事卡。
 	</floater.string>
 	<floater.string name="not_allowed">
-		You do not have permission to view this notecard.
+		你並沒有權限去察看此記事卡。
 	</floater.string>
 	<floater.string name="Title">
 		記事卡： [NAME]
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index d9854a85b6..d99d13669f 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_sound">
 	<floater.string name="Title">
-		Sound: [NAME]
+		聲音： [NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
index acec1efcb0..5f0ffea182 100644
--- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
@@ -5,7 +5,7 @@
         
 Remember, Classified fees are non-refundable.
 	</text>
-	<spinner label="價格： L$" name="price_for_listing" tool_tip="Price for listing." value="50"/>
-	<button label="Publish" name="publish_btn"/>
+	<spinner label="價格： L$" name="price_for_listing" tool_tip="刊登費用。" value="50"/>
+	<button label="發布" name="publish_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
index b16a3bd9cc..4ff2a3fc79 100644
--- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="region_debug_console" title="Region Debug"/>
+<floater name="region_debug_console" title="地區除錯"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
index 75ef4ebe73..c3d05402c0 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT">
 	<floater.string name="Title">
-		SCRIPT: [NAME]
+		腳本：[NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
index 4062db5014..ff02946d86 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
@@ -7,13 +7,13 @@
 		Done.
 	</floater.string>
 	<floater.string name="Resetting">
-		Resetting
+		重設中
 	</floater.string>
 	<floater.string name="Running">
-		Running
+		執行中
 	</floater.string>
 	<floater.string name="NotRunning">
-		Not running
+		非執行中
 	</floater.string>
 	<button label="關閉" label_selected="關閉" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
index 5b247350b8..bb693b7a70 100644
--- a/indra/newview/skins/default/xui/zh/floater_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="FIND">
+<floater name="floater_search" title="尋找">
 	<floater.string name="loading_text">
 		載入中...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index bba075cf08..56a31bc292 100644
--- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
@@ -4,10 +4,10 @@
 		<radio_item label="TRUE" name="TRUE" value="true"/>
 		<radio_item label="FALSE" name="FALSE" value=""/>
 	</radio_group>
-	<color_swatch label="Color" name="val_color_swatch"/>
+	<color_swatch label="顏色" name="val_color_swatch"/>
 	<spinner label="x" name="val_spinner_1"/>
 	<spinner label="x" name="val_spinner_2"/>
 	<spinner label="x" name="val_spinner_3"/>
 	<spinner label="x" name="val_spinner_4"/>
-	<button label="Reset to default" name="default_btn"/>
+	<button label="回復至預設值" name="default_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index eebd5df3f7..582572d0e2 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -50,9 +50,9 @@
 				<stat_bar label="物件" name="simobjects"/>
 				<stat_bar label="Active Objects" name="simactiveobjects"/>
 				<stat_bar label="Active Scripts" name="simactivescripts"/>
-				<stat_bar label="Script Events" name="simscripteps"/>
-				<stat_bar label="Packets In" name="siminpps"/>
-				<stat_bar label="Packets Out" name="simoutpps"/>
+				<stat_bar label="腳本事件" name="simscripteps"/>
+				<stat_bar label="進入封包" name="siminpps"/>
+				<stat_bar label="出去封包" name="simoutpps"/>
 				<stat_bar label="擱置下載" name="simpendingdownloads"/>
 				<stat_bar label="擱置上傳" name="simpendinguploads"/>
 				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 300d7ee63b..c70e70451e 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -49,13 +49,13 @@
 	</text>
 	<radio_group name="focus_radio_group">
 		<radio_item label="Zoom" name="radio zoom"/>
-		<radio_item label="Orbit (Ctrl)" name="radio orbit"/>
-		<radio_item label="Pan (Ctrl+Shift)" name="radio pan"/>
+		<radio_item label="環繞（Ctrl）" name="radio orbit"/>
+		<radio_item label="平移（Ctrl+Shift）" name="radio pan"/>
 	</radio_group>
 	<slider_bar initial_value="0.125" name="slider zoom"/>
 	<radio_group name="move_radio_group">
 		<radio_item label="移動" name="radio move"/>
-		<radio_item label="Lift (Ctrl)" name="radio lift"/>
+		<radio_item label="舉起（Ctrl）" name="radio lift"/>
 		<radio_item label="Spin (Ctrl+Shift)" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
@@ -178,10 +178,10 @@
 				擁有者：
 			</text>
 			<text name="Group:">
-				社團：
+				群組：
 			</text>
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
-			<button name="button set group" tool_tip="選擇一個社團以分享這物件權限"/>
+			<button name="button set group" tool_tip="選擇一個群組以分享這物件權限"/>
 			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 			<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 			<text name="label click action">
@@ -480,7 +480,7 @@
 		<check_box label="顯示擁有者" name="checkbox show owners" tool_tip="Colorize the parcels according to the type of owner: 
 
 綠色 = 你的土地 
-水藍 = 你社團的土地 
+水藍 = 你群組的土地 
 紅色 = 其他人所有 
 黃色 = 出售 
 紫色 = 拍賣 
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index 074a4a1881..0e7e0c5b1a 100644
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -22,7 +22,7 @@
 		積分
 	</floater.string>
 	<floater.string name="none_descriptor">
-		None found.
+		未發現。
 	</floater.string>
 	<text name="title_text">
 		載入中...
@@ -39,7 +39,7 @@
 	<text name="id_text">
 		物件 ID:
 	</text>
-	<button label="Show Beacon" name="show_beacon_btn"/>
+	<button label="顯示指標" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		物件名稱：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index 4d650eaaee..c27b80e9c5 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -4,13 +4,13 @@
 		NEARBY VOICE
 	</string>
 	<string name="title_group">
-		Group Call with [GROUP]
+		與 [GROUP] 進行群組通話
 	</string>
 	<string name="title_adhoc">
-		Conference Call
+		會議通話
 	</string>
 	<string name="title_peer_2_peer">
-		Call with [NAME]
+		與 [NAME] 進行通話
 	</string>
 	<string name="no_one_near">
 		No one near has voice enabled
@@ -22,7 +22,7 @@
 		<layout_panel name="leave_call_panel">
 			<layout_stack name="voice_effect_and_leave_call_stack">
 				<layout_panel name="leave_call_btn_panel">
-					<button label="Leave Call" name="leave_call_btn"/>
+					<button label="結束通話" name="leave_call_btn"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
index a756498b81..be6bf8bb27 100644
--- a/indra/newview/skins/default/xui/zh/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml
@@ -2,13 +2,13 @@
 <floater name="floater_web_content" title="">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button name="back" tool_tip="Navigate back"/>
-			<button name="forward" tool_tip="Navigate forward"/>
+			<button name="back" tool_tip="向後導覽"/>
+			<button name="forward" tool_tip="向前導覽"/>
 			<button name="stop" tool_tip="停止導覽"/>
 			<button name="reload" tool_tip="重載頁面"/>
 			<combo_box name="address" tool_tip="在此輸入 URL 位置"/>
-			<icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/>
-			<button name="popexternal" tool_tip="Open current URL in your desktop browser"/>
+			<icon name="media_secure_lock_flag" tool_tip="加密的瀏覽"/>
+			<button name="popexternal" tool_tip="在你的桌面瀏覽器中開啟目前的 URL 位址"/>
 		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
index 36e00049f0..967e36ead7 100644
--- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="whitelist_entry" title="WHITELIST ENTRY">
+<floater name="whitelist_entry" title="許可的項目清單">
 	<text name="media_label">
-		Enter a URL or URL pattern to add to the list of allowed domains
+		輸入一個 URL 位址或 URL 格式以添加到允許的網域清單中
 	</text>
-	<line_editor name="whitelist_entry" tool_tip="Enter a URL or URL pattern to White List"/>
+	<line_editor name="whitelist_entry" tool_tip="輸入一個 URL 位址或 URL 格式到白名單"/>
 	<button label="確定" name="ok_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
index fce851cc90..383e35d50d 100644
--- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -4,16 +4,16 @@
 		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
 	</floater.string>
 	<text name="KeyFramePresetsText">
-		Sky Presets:
+		天空預設值：
 	</text>
 	<button label="新增" label_selected="新增" name="WLNewPreset"/>
 	<button label="儲存" label_selected="儲存" name="WLSavePreset"/>
 	<button label="刪除" label_selected="刪除" name="WLDeletePreset"/>
-	<button label="Day Cycle Editor" label_selected="Day Cycle Editor" name="WLDayCycleMenuButton"/>
+	<button label="日循環編輯器" label_selected="日循環編輯器" name="WLDayCycleMenuButton"/>
 	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSPHERE" name="Atmosphere">
+		<panel label="大氣" name="Atmosphere">
 			<text name="BHText">
-				Blue Horizon
+				藍天水平線
 			</text>
 			<text name="BHText2">
 				R
@@ -28,10 +28,10 @@
 				I
 			</text>
 			<text name="BDensText">
-				Haze Horizon
+				陰霾水平線
 			</text>
 			<text name="BDensText2">
-				Blue Density
+				藍天密度
 			</text>
 			<text name="BHText6">
 				R
@@ -46,21 +46,21 @@
 				I
 			</text>
 			<text name="HDText">
-				Haze Density
+				陰霾密度
 			</text>
 			<text name="DensMultText">
-				Density Multiplier
+				密度倍增
 			</text>
 			<text name="WLDistanceMultText">
-				Distance Multiplier
+				距離倍增
 			</text>
 			<text name="MaxAltText">
-				Max Altitude
+				最大高度
 			</text>
 		</panel>
-		<panel label="LIGHTING" name="Lighting">
+		<panel label="照明" name="Lighting">
 			<text name="SLCText">
-				Sun/Moon Color
+				日／月 顏色
 			</text>
 			<text name="BHText">
 				R
@@ -75,10 +75,10 @@
 				I
 			</text>
 			<text name="TODText">
-				Sun/Moon Position
+				日／月 位置
 			</text>
 			<text name="WLAmbientText">
-				Ambient
+				環境
 			</text>
 			<text name="BHText5">
 				R
@@ -93,23 +93,23 @@
 				I
 			</text>
 			<text name="WLEastAngleText">
-				East Angle
+				東升角度
 			</text>
 			<text name="SunGlowText">
-				Sun Glow
+				太陽光輝
 			</text>
-			<slider label="Focus" name="WLGlowB"/>
+			<slider label="焦點" name="WLGlowB"/>
 			<slider label="尺寸" name="WLGlowR"/>
 			<text name="SceneGammaText">
-				Scene Gamma
+				場景 Gamma 值
 			</text>
 			<text name="WLStarText">
-				Star Brightness
+				星空量度
 			</text>
 		</panel>
-		<panel label="CLOUDS" name="Clouds">
+		<panel label="雲彩" name="Clouds">
 			<text name="WLCloudColorText">
-				Cloud Color
+				雲彩顏色
 			</text>
 			<text name="BHText">
 				R
@@ -124,7 +124,7 @@
 				I
 			</text>
 			<text name="WLCloudColorText2">
-				Cloud XY/Density
+				雲彩 XY 軸 / 密度
 			</text>
 			<text name="BHText5">
 				X
@@ -136,13 +136,13 @@
 				D
 			</text>
 			<text name="WLCloudCoverageText">
-				Cloud Coverage
+				雲彩覆蓋
 			</text>
 			<text name="WLCloudScaleText">
-				Cloud Scale
+				雲彩規模
 			</text>
 			<text name="WLCloudDetailText">
-				Cloud Detail (XY/Density)
+				雲彩細節（XY 軸 / 密度）
 			</text>
 			<text name="BHText8">
 				X
@@ -154,14 +154,14 @@
 				D
 			</text>
 			<text name="WLCloudScrollXText">
-				Cloud Scroll X
+				雲彩 X 滾軸
 			</text>
-			<check_box label="Lock" name="WLCloudLockX"/>
+			<check_box label="鎖定" name="WLCloudLockX"/>
 			<text name="WLCloudScrollYText">
-				Cloud Scroll Y
+				雲彩 Y 滾軸
 			</text>
-			<check_box label="Lock" name="WLCloudLockY"/>
-			<check_box label="Draw Classic Clouds" name="DrawClassicClouds"/>
+			<check_box label="鎖定" name="WLCloudLockY"/>
+			<check_box label="描繪傳統雲彩" name="DrawClassicClouds"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 552bb02582..6ac6fb76b7 100644
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -2,45 +2,45 @@
 <floater name="worldmap" title="世界地圖">
 	<panel name="layout_panel_1">
 		<text name="events_label">
-			Legend
+			圖例
 		</text>
 	</panel>
 	<panel name="layout_panel_2">
-		<button name="Show My Location" tool_tip="Center map on my avatar&apos;s location"/>
+		<button name="Show My Location" tool_tip="以我的化身所在位置居中地圖"/>
 		<text name="me_label">
-			Me
+			自己
 		</text>
 		<text name="person_label">
 			人
 		</text>
 		<text name="infohub_label">
-			Infohub
+			資訊中心
 		</text>
 		<text name="land_sale_label">
-			Land Sale
+			土地出售
 		</text>
 		<text name="auction_label">
-			land auction
+			土地拍賣
 		</text>
 		<text name="by_owner_label">
-			by owner
+			依擁有者
 		</text>
 		<button name="Go Home" tool_tip="瞬間傳送到我的家位置"/>
 		<text name="Home_label">
 			家
 		</text>
 		<text name="events_label">
-			Events:
+			事件：
 		</text>
 		<text name="pg_label">
-			一般
+			一般普級
 		</text>
 		<check_box initial_value="true" name="events_mature_chk"/>
 		<text name="events_mature_label">
-			Moderate
+			適度成人
 		</text>
 		<text name="events_adult_label">
-			成人
+			完全成人
 		</text>
 	</panel>
 	<panel name="layout_panel_3">
@@ -55,8 +55,8 @@
 		<combo_box label="我的地標" name="landmark combo" tool_tip="將地標位置顯示在地圖上">
 			<combo_box.item label="我的地標" name="item1"/>
 		</combo_box>
-		<search_editor label="Regions by Name" name="location" tool_tip="輸入一個地區的名稱"/>
-		<button label="Find" name="DoSearch" tool_tip="Search for region"/>
+		<search_editor label="地區依名稱" name="location" tool_tip="輸入一個地區的名稱"/>
+		<button label="尋找" name="DoSearch" tool_tip="搜尋地區"/>
 		<button name="Clear" tool_tip="Clear tracking lines and reset map"/>
 		<text name="events_label">
 			位置：
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
index 3583976646..ac331be203 100644
--- a/indra/newview/skins/default/xui/zh/inspect_group.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_group.xml
@@ -5,16 +5,16 @@
 -->
 <floater name="inspect_group">
 	<string name="PrivateGroup">
-		私人社團
+		私人群組
 	</string>
 	<string name="FreeToJoin">
 		免費加入
 	</string>
 	<string name="CostToJoin">
-		L$[AMOUNT] to join
+		花費 L$[AMOUNT] 加入
 	</string>
 	<string name="YouAreMember">
-		You are a member
+		你是成員
 	</string>
 	<text name="group_subtitle">
 		123 members
diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
index 26f49ce69a..bed19d6d78 100644
--- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
@@ -17,6 +17,6 @@
 		http://slurl.com/Ahern/50/50/50
 	</text>
 	<button label="地圖" name="map_btn"/>
-	<button label="Block" name="block_btn"/>
+	<button label="封鎖" name="block_btn"/>
 	<button label="關閉" name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index a04d59bc81..885c4b9add 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -5,13 +5,13 @@
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="邀請加入社團" name="Invite..."/>
+	<menu_item_call label="邀請加入群組" name="Invite..."/>
 	<menu_item_call label="封鎖" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
 	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
-	<menu_item_call label="Zoom In" name="Zoom In"/>
+	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index e3a791cde5..1911a1aeff 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -9,7 +9,7 @@
 	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="丟棄" name="Drop"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index acf98dfdfa..260571eb54 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="邀請加入社團" name="Invite..."/>
+	<menu_item_call label="邀請加入群組" name="Invite..."/>
 	<menu_item_call label="Block" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index 646edcf563..d516e3ab58 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -15,7 +15,7 @@
 			<menu_item_call label="內褲" name="Self Underpants"/>
 			<menu_item_call label="刺青" name="Self Tattoo"/>
 			<menu_item_call label="Physics" name="Self Physics"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
+			<menu_item_call label="半透明" name="Self Alpha"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="HUD" name="Object Detach HUD"/>
@@ -26,7 +26,7 @@
 	<menu_item_call label="編輯我裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
index e053eb2388..a331c47a6e 100644
--- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gesture_gear">
-	<menu_item_call label="Add/Remove from Favorites" name="activate"/>
+	<menu_item_call label="由我的最愛中 添加/移除" name="activate"/>
 	<menu_item_call label="覆製" name="copy_gesture"/>
 	<menu_item_call label="貼上" name="paste"/>
 	<menu_item_call label="覆製 UUID" name="copy_uuid"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
index 77c2c92491..d4a5a69104 100644
--- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_group_plus">
-	<menu_item_call label="Join Group..." name="item_join"/>
-	<menu_item_call label="New Group..." name="item_new"/>
+	<menu_item_call label="加入群組..." name="item_join"/>
+	<menu_item_call label="新群組..." name="item_new"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
index 2577c582a7..4664fcb027 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
-	<menu_item_call label="社團資訊" name="Show Profile"/>
+	<menu_item_call label="群組資訊" name="Show Profile"/>
 	<menu_item_call label="顯示會話" name="Chat"/>
 	<menu_item_call label="結束會話" name="End Session"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
index 0f14057c07..7385764e4c 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="通話" name="call"/>
 	<menu_item_call label="瞬間傳送" name="teleport"/>
-	<menu_item_call label="Invite to Group" name="invite_to_group"/>
+	<menu_item_call label="邀請加入群組" name="invite_to_group"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
 	<menu_item_call label="回報" name="report"/>
@@ -14,7 +14,7 @@
 	<menu_item_call label="踢出" name="kick"/>
 	<menu_item_call label="CSR" name="csr"/>
 	<menu_item_call label="材質除錯" name="debug"/>
-	<menu_item_call label="Find On Map" name="find_on_map"/>
+	<menu_item_call label="在地圖上尋找" name="find_on_map"/>
 	<menu_item_call label="Zoom In" name="zoom_in"/>
 	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="分享" name="share"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
index 2d7da70bfc..1c75705743 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
@@ -14,7 +14,7 @@
 			<menu_item_call label="內衣" name="Self Undershirt"/>
 			<menu_item_call label="內褲" name="Self Underpants"/>
 			<menu_item_call label="刺青" name="Self Tattoo"/>
-			<menu_item_call label="Alpha" name="Self Alpha"/>
+			<menu_item_call label="半透明" name="Self Alpha"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="HUD" name="Object Detach HUD"/>
@@ -25,7 +25,7 @@
 	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的群組" name="Groups..."/>
 	<menu_item_call label="我的檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index a93e8be149..49a50c97c6 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -23,9 +23,9 @@
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
-		<menu_item_call label="New Alpha Mask" name="New Alpha Mask"/>
+		<menu_item_call label="新半透明遮罩" name="New Alpha Mask"/>
 		<menu_item_call label="新刺青" name="New Tattoo"/>
-		<menu_item_call label="New Physics" name="New Physics"/>
+		<menu_item_call label="新身體物理" name="New Physics"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="新體形" name="New Shape"/>
@@ -51,7 +51,7 @@
 	<menu_item_call label="取代目前的裝扮" name="Replace Outfit"/>
 	<menu_item_call label="添加到目前裝扮" name="Add To Outfit"/>
 	<menu_item_call label="由目前的裝扮移除" name="Remove From Outfit"/>
-	<menu_item_call label="Find Original" name="Find Original"/>
+	<menu_item_call label="尋找原件" name="Find Original"/>
 	<menu_item_call label="Purge Item" name="Purge Item"/>
 	<menu_item_call label="Restore Item" name="Restore Item"/>
 	<menu_item_call label="開啟" name="Open"/>
@@ -71,7 +71,7 @@
 	<menu_item_call label="Play Inworld" name="Animation Play"/>
 	<menu_item_call label="Play Locally" name="Animation Audition"/>
 	<menu_item_call label="送出即時訊息" name="Send Instant Message"/>
-	<menu_item_call label="Offer Teleport..." name="Offer Teleport..."/>
+	<menu_item_call label="發給瞬間傳送請求..." name="Offer Teleport..."/>
 	<menu_item_call label="Start Conference Chat" name="Conference Chat"/>
 	<menu_item_call label="Activate" name="Activate"/>
 	<menu_item_call label="Deactivate" name="Deactivate"/>
@@ -81,7 +81,7 @@
 	<menu label="Attach To" name="Attach To"/>
 	<menu label="Attach To HUD" name="Attach To HUD"/>
 	<menu_item_call label="編輯" name="Wearable Edit"/>
-	<menu_item_call label="Add" name="Wearable Add"/>
+	<menu_item_call label="添加" name="Wearable Add"/>
 	<menu_item_call label="脫下" name="Take Off"/>
 	<menu_item_call label="-- 無選項 --" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
index 9199608200..a0fc060e27 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
@@ -21,9 +21,9 @@
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
-		<menu_item_call label="New Alpha" name="New Alpha"/>
+		<menu_item_call label="新半透明" name="New Alpha"/>
 		<menu_item_call label="新刺青" name="New Tattoo"/>
-		<menu_item_call label="New Physics" name="New Physics"/>
+		<menu_item_call label="新身體物理" name="New Physics"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="新體形" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index f51b27d9ce..74b90ada5e 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
@@ -11,7 +11,7 @@
 	<menu_item_call label="清空 Lost and Found" name="empty_lostnfound"/>
 	<menu_item_call label="儲存材質為" name="Save Texture As"/>
 	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="Find Original" name="Find Original"/>
-	<menu_item_call label="Find All Links" name="Find All Links"/>
+	<menu_item_call label="尋找原件" name="Find Original"/>
+	<menu_item_call label="尋找全部聯結" name="Find All Links"/>
 	<menu_item_call label="清空垃圾筒" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index cf47020bd9..90704fee65 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -13,8 +13,8 @@
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
-		<menu_item_call label="New Alpha" name="New Alpha"/>
-		<menu_item_call label="New Physics" name="New Physics"/>
+		<menu_item_call label="新半透明" name="New Alpha"/>
+		<menu_item_call label="新身體物理" name="New Physics"/>
 		<menu_item_call label="新刺青" name="New Tattoo"/>
 	</menu>
 	<menu label="新身體部位" name="New Body Parts">
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index 3737e3d041..81ae6e4e85 100644
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
@@ -8,7 +8,7 @@
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="View People Icons" name="View Icons"/>
+	<menu_item_check label="察看人群圖示" name="View Icons"/>
 	<menu_item_check label="Block Voice" name="Block/Unblock"/>
 	<menu_item_check label="Block Text" name="MuteText"/>
 	<context_menu label="Moderator Options" name="Moderator Options">
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
index 2b0c461312..59854faeec 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
@@ -2,7 +2,7 @@
 <toggleable_menu name="menu_group_plus">
 	<menu_item_check label="依名稱排序" name="sort_name"/>
 	<menu_item_check label="依狀態排序" name="sort_status"/>
-	<menu_item_check label="View People Icons" name="view_icons"/>
-	<menu_item_check label="View Permissions Granted" name="view_permissions"/>
-	<menu_item_call label="Show Blocked Residents &amp; Objects" name="show_blocked_list"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看許可權限" name="view_permissions"/>
+	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
index cf36507d74..1be5c69b94 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="顯示社團圖示" name="Display Group Icons"/>
-	<menu_item_call label="脫離所選擇的社團" name="Leave Selected Group"/>
+	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+	<menu_item_call label="脫離所選擇的群組" name="Leave Selected Group"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 49fa775424..9faa35001c 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -9,5 +9,5 @@
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
 	<menu_item_check label="Block/Unblock" name="Block/Unblock"/>
-	<menu_item_call label="Offer Teleport" name="teleport"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index c7aff48df4..1380e0b307 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -6,5 +6,5 @@
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_call label="Offer Teleport" name="teleport"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
index 5cf54b117b..a7f5c74b82 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Sort by Recent Speakers" name="sort_by_recent_speakers"/>
+	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
 	<menu_item_check label="依名稱排序" name="sort_name"/>
 	<menu_item_check label="依距離排序" name="sort_distance"/>
-	<menu_item_check label="View People Icons" name="view_icons"/>
-	<menu_item_call label="Show Blocked Residents &amp; Objects" name="show_blocked_list"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_call label="顯示笨封鎖的居民與物件" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index d0b9438cfc..95f8917234 100644
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_folder_gear">
-	<menu_item_call label="Add Folder" name="add_folder"/>
+	<menu_item_call label="添加資料夾" name="add_folder"/>
 	<menu_item_call label="添加地標" name="add_landmark"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
index 2cbdd602cb..de97bb731f 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示社團資訊" name="show_group"/>
-	<menu_item_call label="覆製社團到剪貼簿" name="url_copy_label"/>
+	<menu_item_call label="顯示群組資訊" name="show_group"/>
+	<menu_item_call label="覆製群組到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 6d70ac4c1f..a51e26c3f4 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -26,7 +26,7 @@
 	</menu>
 	<menu label="溝通" name="Communicate">
 		<menu_item_call label="我的朋友" name="My Friends"/>
-		<menu_item_call label="我的社團" name="My Groups"/>
+		<menu_item_call label="我的群組" name="My Groups"/>
 		<menu_item_check label="附近的聊天" name="Nearby Chat"/>
 		<menu_item_call label="附近的人群" name="Active Speakers"/>
 	</menu>
@@ -96,7 +96,7 @@
 		<menu label="腳本" name="Scripts">
 			<menu_item_call label="重新編譯腳本（Mono）" name="Mono"/>
 			<menu_item_call label="重新編譯腳本（LSL）" name="LSL"/>
-			<menu_item_call label="Reset Scripts" name="Reset Scripts"/>
+			<menu_item_call label="重設腳本" name="Reset Scripts"/>
 			<menu_item_call label="設定腳本為執行中" name="Set Scripts to Running"/>
 			<menu_item_call label="設定腳本為非執行中" name="Set Scripts to Not Running"/>
 		</menu>
@@ -139,7 +139,6 @@
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="高解析度快照" name="HighResSnapshot"/>
 		<menu_item_check label="靜音拍攝快照到硬碟" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="壓縮快照存到硬碟" name="CompressSnapshotsToDisk"/>
 		<menu label="效能工具" name="Performance Tools">
 			<menu_item_call label="Lag Meter" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
@@ -155,7 +154,7 @@
 		</menu>
 		<menu label="Rendering Types" name="Rendering Types">
 			<menu_item_check label="Simple" name="Simple"/>
-			<menu_item_check label="Alpha" name="Alpha"/>
+			<menu_item_check label="半透明" name="Alpha"/>
 			<menu_item_check label="Tree" name="Tree"/>
 			<menu_item_check label="Avatars" name="Character"/>
 			<menu_item_check label="SurfacePath" name="SurfacePath"/>
@@ -179,21 +178,21 @@
 			<menu_item_check label="Flexible Objects" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
-		<menu_item_call label="Clear Group Cache" name="ClearGroupCache"/>
-		<menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/>
+		<menu_item_call label="清除群組快取資料" name="ClearGroupCache"/>
+		<menu_item_check label="滑鼠平滑移動" name="Mouse Smoothing"/>
 		<menu label="快速鍵" name="Shortcuts">
 			<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 			<menu_item_check label="搜尋" name="Search"/>
 			<menu_item_call label="釋出按鍵" name="Release Keys"/>
 			<menu_item_call label="設定使用者界面大小至預設值" name="Set UI Size to Default"/>
-			<menu_item_check label="Show Advanced Menu - legacy shortcut" name="Show Advanced Menu - legacy shortcut"/>
+			<menu_item_check label="顯示進階選單 － 舊版捷徑" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="關閉視窗" name="Close Window"/>
 			<menu_item_call label="關閉全部視窗" name="Close All Windows"/>
-			<menu_item_call label="Snapshot to Disk" name="Snapshot to Disk"/>
+			<menu_item_call label="拍攝快照到硬碟" name="Snapshot to Disk"/>
 			<menu_item_call label="第一人稱視角" name="Mouselook"/>
 			<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
-			<menu_item_call label="Reset View" name="Reset View"/>
-			<menu_item_call label="Look at Last Chatter" name="Look at Last Chatter"/>
+			<menu_item_call label="重設視角" name="Reset View"/>
+			<menu_item_call label="注視上一位聊天者" name="Look at Last Chatter"/>
 			<menu label="選擇建造工具" name="Select Tool">
 				<menu_item_call label="聚焦工具" name="Focus"/>
 				<menu_item_call label="移動工具" name="Move"/>
@@ -218,10 +217,10 @@
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
-			<menu_item_call label="Group Info to Debug Console" name="Group Info to Debug Console"/>
+			<menu_item_call label="群組資訊至除錯控制台" name="Group Info to Debug Console"/>
 			<menu_item_call label="Capabilities Info to Debug Console" name="Capabilities Info to Debug Console"/>
 			<menu_item_check label="Camera" name="Camera"/>
-			<menu_item_check label="Wind" name="Wind"/>
+			<menu_item_check label="風力" name="Wind"/>
 			<menu_item_check label="FOV" name="FOV"/>
 			<menu_item_check label="Badge" name="Badge"/>
 		</menu>
@@ -232,17 +231,17 @@
 			<menu_item_check label="Show Matrices" name="Show Matrices"/>
 			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="顯示記憶體" name="Show Memory"/>
-			<menu_item_check label="Show Updates to Objects" name="Show Updates"/>
-		</menu>
-		<menu label="Force an Error" name="Force Errors">
-			<menu_item_call label="Force Breakpoint" name="Force Breakpoint"/>
-			<menu_item_call label="Force LLError And Crash" name="Force LLError And Crash"/>
-			<menu_item_call label="Force Bad Memory Access" name="Force Bad Memory Access"/>
-			<menu_item_call label="Force Infinite Loop" name="Force Infinite Loop"/>
-			<menu_item_call label="Force Driver Crash" name="Force Driver Carsh"/>
-			<menu_item_call label="Force Software Exception" name="Force Software Exception"/>
-			<menu_item_call label="Force Disconnect Viewer" name="Force Disconnect Viewer"/>
-			<menu_item_call label="Simulate a Memory Leak" name="Memory Leaking Simulation"/>
+			<menu_item_check label="顯示更新到物件" name="Show Updates"/>
+		</menu>
+		<menu label="強制錯誤" name="Force Errors">
+			<menu_item_call label="強制中斷點" name="Force Breakpoint"/>
+			<menu_item_call label="強制腳本錯誤並崩潰" name="Force LLError And Crash"/>
+			<menu_item_call label="強制不良的記憶體存取" name="Force Bad Memory Access"/>
+			<menu_item_call label="強制無限迴圈" name="Force Infinite Loop"/>
+			<menu_item_call label="強制驅動程式崩潰" name="Force Driver Carsh"/>
+			<menu_item_call label="強制軟體例外異常" name="Force Software Exception"/>
+			<menu_item_call label="強制瀏覽器斷線" name="Force Disconnect Viewer"/>
+			<menu_item_call label="模擬記憶體不足" name="Memory Leaking Simulation"/>
 		</menu>
 		<menu label="Render Tests" name="Render Tests">
 			<menu_item_check label="Camera Offset" name="Camera Offset"/>
@@ -278,8 +277,8 @@
 			<menu_item_check label="Global Illumination (experimental)" name="Global Illumination"/>
 			<menu_item_check label="Debug GL" name="Debug GL"/>
 			<menu_item_check label="Debug Pipeline" name="Debug Pipeline"/>
-			<menu_item_check label="Automatic Alpha Masks (deferred)" name="Automatic Alpha Masks (deferred)"/>
-			<menu_item_check label="Automatic Alpha Masks (non-deferred)" name="Automatic Alpha Masks (non-deferred)"/>
+			<menu_item_check label="自動半透明遮罩（遞延）" name="Automatic Alpha Masks (deferred)"/>
+			<menu_item_check label="自動半透明遮罩（非遞延）" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Animation Textures" name="Animation Textures"/>
 			<menu_item_check label="Disable Textures" name="Disable Textures"/>
 			<menu_item_check label="Full Res Textures" name="Rull Res Textures"/>
@@ -310,7 +309,7 @@
 			<menu_item_check label="Sim Sun Override" name="Sim Sun Override"/>
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
 			<menu_item_check label="Fixed Weather" name="Fixed Weather"/>
-			<menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/>
+			<menu_item_call label="傾印地區物件快取" name="Dump Region Object Cache"/>
 		</menu>
 		<menu label="UI" name="UI">
 			<menu_item_call label="Media Browser Test" name="Web Browser Test"/>
@@ -325,10 +324,10 @@
 			<menu_item_check label="Region Debug Console" name="Region Debug Console"/>
 			<menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
-			<menu_item_check label="Debug Views" name="Debug Views"/>
+			<menu_item_check label="視角除錯" name="Debug Views"/>
 			<menu_item_check label="Debug Name Tooltips" name="Debug Name Tooltips"/>
-			<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
-			<menu_item_check label="Debug Keys" name="Debug Keys"/>
+			<menu_item_check label="滑鼠事件除錯" name="Debug Mouse Events"/>
+			<menu_item_check label="按鍵除錯" name="Debug Keys"/>
 			<menu_item_check label="Debug WindowProc" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
@@ -336,7 +335,7 @@
 			<menu_item_call label="Show Font Test" name="Show Font Test"/>
 			<menu_item_check label="Show XUI Names" name="Show XUI Names"/>
 			<menu_item_call label="送出測試 IMs" name="Send Test IMs"/>
-			<menu_item_call label="Flush Names Caches" name="Flush Names Caches"/>
+			<menu_item_call label="沖洗名稱快取資料" name="Flush Names Caches"/>
 		</menu>
 		<menu label="化身" name="Character">
 			<menu label="Grab Baked Texture" name="Grab Baked Texture">
@@ -380,14 +379,14 @@
 	<menu label="Admin" name="Admin">
 		<menu label="Object">
 			<menu_item_call label="取得副本" name="Take Copy"/>
-			<menu_item_call label="Force Owner To Me" name="Force Owner To Me"/>
+			<menu_item_call label="強制擁有者為我" name="Force Owner To Me"/>
 			<menu_item_call label="Force Owner Permissive" name="Force Owner Permissive"/>
 			<menu_item_call label="刪除" name="Delete"/>
 			<menu_item_call label="Lock" name="Lock"/>
 			<menu_item_call label="Get Assets IDs" name="Get Assets IDs"/>
 		</menu>
 		<menu label="地段" name="Parcel">
-			<menu_item_call label="Force Owner To Me" name="Owner To Me"/>
+			<menu_item_call label="強制擁有者為我" name="Owner To Me"/>
 			<menu_item_call label="Set to Linden Content" name="Set to Linden Content"/>
 			<menu_item_call label="Claim Public Land" name="Claim Public Land"/>
 		</menu>
@@ -410,9 +409,9 @@
 			<menu_item_call label="內衣" name="Menu Undershirt"/>
 			<menu_item_call label="內褲" name="Menu Underpants"/>
 			<menu_item_call label="裙子" name="Skirt"/>
-			<menu_item_call label="Alpha" name="Alpha"/>
-			<menu_item_call label="Tattoo" name="Tattoo"/>
-			<menu_item_call label="Physics" name="Physics"/>
+			<menu_item_call label="半透明" name="Alpha"/>
+			<menu_item_call label="刺青" name="Tattoo"/>
+			<menu_item_call label="身體物理" name="Physics"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</menu>
 		<menu label="幫助" name="Help">
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
index c5c1f661fb..2eea314dd8 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
@@ -2,7 +2,7 @@
 <context_menu name="Outfit Wearable Context Menu">
 	<menu_item_call label="取代" name="wear_replace"/>
 	<menu_item_call label="Wear" name="wear_wear"/>
-	<menu_item_call label="Add" name="wear_add"/>
+	<menu_item_call label="添加" name="wear_add"/>
 	<menu_item_call label="Take Off / Detach" name="take_off_or_detach"/>
 	<menu_item_call label="卸下" name="detach"/>
 	<context_menu label="Attach to" name="wearable_attach_to"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 3498942f9b..89fe92fabc 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -5,7 +5,7 @@
 			網頁內容
 		</label>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			這位置有網頁內容
 		</tooltip>
 		<playtip name="web_playtip">
 			顯示網頁內容
@@ -35,7 +35,7 @@
 	</widgetset>
 	<widgetset name="audio">
 		<label name="audio_label">
-			Audio
+			音頻
 		</label>
 		<tooltip name="audio_tooltip">
 			There is audio at this location
@@ -61,12 +61,12 @@
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
-			Audio
+			音頻
 		</label>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			Video
+			視頻
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			Ogg Audio/Video
+			Ogg 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -106,7 +106,7 @@
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language (SMIL)
+			同步多媒體整合語言（SMIL）
 		</label>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -121,22 +121,22 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			Audio (MIDI)
+			音頻（MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">
-			Audio (MP3)
+			音頻（MP3）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">
-			Audio (AIFF)
+			音頻（AIFF）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">
-			Audio (WAV)
+			音頻（WAV）
 		</label>
 	</mimetype>
 	<mimetype name="image/bmp">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			影片（MPEG）
+			視頻（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			影片（MP4）
+			視頻（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			影片（Windows Media ASF）
+			視頻（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			影片（Windows Media WMV）
+			視頻（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			影片（AVI）
+			視頻（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 3498942f9b..08839abe6a 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -35,7 +35,7 @@
 	</widgetset>
 	<widgetset name="audio">
 		<label name="audio_label">
-			Audio
+			音頻
 		</label>
 		<tooltip name="audio_tooltip">
 			There is audio at this location
@@ -61,7 +61,7 @@
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
-			Audio
+			音頻
 		</label>
 	</mimetype>
 	<mimetype name="video/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			Ogg Audio/Video
+			Ogg 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -121,22 +121,22 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			Audio (MIDI)
+			音頻（MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">
-			Audio (MP3)
+			音頻（MP3）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">
-			Audio (AIFF)
+			音頻（AIFF）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">
-			Audio (WAV)
+			音頻（WAV）
 		</label>
 	</mimetype>
 	<mimetype name="image/bmp">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			影片（MPEG）
+			視頻（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			影片（MP4）
+			視頻（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			影片（Windows Media ASF）
+			視頻（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			影片（Windows Media WMV）
+			視頻（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			影片（AVI）
+			視頻（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index 3f38c528a6..7958f64219 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -27,21 +27,21 @@
 			圖像
 		</label>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			有一個影像在此位置
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			察看在此位置的影像
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
 		<label name="audio_label">
-			Audio
+			音頻
 		</label>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			有一個音頻在此位置
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			播放在此位置的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
@@ -61,12 +61,12 @@
 	</mimetype>
 	<mimetype name="audio/*">
 		<label name="audio2_label">
-			Audio
+			音頻
 		</label>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			Video
+			視頻
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			影片 （QuickTime）
+			視頻 （QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			Ogg Audio/Video
+			OGG 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -106,7 +106,7 @@
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language (SMIL)
+			同步多媒體整合語言（SMIL）
 		</label>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -121,22 +121,22 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			Audio (MIDI)
+			音頻 （MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">
-			Audio (MP3)
+			音頻（MP3）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">
-			Audio (AIFF)
+			音頻（AIFF）
 		</label>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">
-			Audio (WAV)
+			音頻（WAV）
 		</label>
 	</mimetype>
 	<mimetype name="image/bmp">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			影片（MPEG）
+			視頻（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			影片（MP4）
+			視頻（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			影片（QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			影片（Windows Media ASF）
+			視頻（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			影片（Windows Media WMV）
+			視頻（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			影片（AVI）
+			視頻（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 65bb8ce517..1c89e9b522 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <notifications>
 	<global name="skipnexttime">
-		Don&apos;t show me this again
+		不再顯示此提醒
 	</global>
 	<global name="alwayschoose">
-		Always choose this option
+		總是選取這個選項
 	</global>
 	<global name="implicitclosebutton">
 		關閉
@@ -44,7 +44,7 @@
 			<button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
 		</form>
 	</template>
-	<notification label="Unknown Notification Message" name="MissingAlert">
+	<notification label="未知的通知訊息" name="MissingAlert">
 		Your version of [APP_NAME] does not know how to display the notification it just received.  Please verify that you have the latest Viewer installed.
 
 Error details: The notification called &apos;[_NAME]&apos; was not found in notifications.xml.
@@ -72,9 +72,9 @@ Error details: The notification called &apos;[_NAME]&apos; was not found in noti
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
-		Could not connect to the [SECOND_LIFE_GRID].
+		無法連接到[SECOND_LIFE_GRID].
     &apos;[DIAGNOSTIC]&apos;
-Make sure your Internet connection is working properly.
+請確定你的網際網路是正常運作的。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
@@ -82,7 +82,7 @@ Make sure your Internet connection is working properly.
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="WearableSave">
-		Save changes to current clothing/body part?
+		除存變更到目前的衣服/身體部位？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="CompileQueueSaveText">
@@ -132,7 +132,7 @@ Do you want to grant modify rights for the selected Residents?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="UnableToCreateGroup">
-		Unable to create group.
+		無法建立新群組。
 [MESSAGE]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
@@ -142,7 +142,7 @@ Do you want to grant modify rights for the selected Residents?
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="忽視變更" yestext="套用變更"/>
 	</notification>
 	<notification name="MustSpecifyGroupNoticeSubject">
-		You must specify a subject to send a group notice.
+		你必須指定一個主旨以送出群組通知。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AddGroupOwnerWarning">
@@ -150,7 +150,7 @@ Do you want to grant modify rights for the selected Residents?
 Members cannot be removed from that role.
 The members must resign from the role themselves.
 Are you sure you want to continue?
-		<usetemplate ignoretext="Confirm before I add a new group Owner" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="在我添加一個新的群組擁有者前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="AssignDangerousActionWarning">
 		You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
@@ -173,17 +173,17 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
 	<notification name="AttachmentDrop">
 		You are about to drop your attachment.
     Are you sure you want to continue?
-		<usetemplate ignoretext="Confirm before dropping attachments" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="在丟下附件前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="JoinGroupCanAfford">
-		Joining this group costs L$[COST].
-Do you wish to proceed?
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="Join"/>
+		加入此群組須花費 L$[COST]。
+你確定要繼續嗎？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
 	</notification>
 	<notification name="JoinGroupNoCost">
 		You are joining group [NAME].
 Do you wish to proceed?
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="Join"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
 		Joining this group costs L$[COST].
@@ -193,7 +193,7 @@ You do not have enough L$ to join this group.
 		Creating this group will cost L$100.
 Groups need more than one member, or they are deleted forever.
 Please invite members within 48 hours.
-		<usetemplate canceltext="取消" name="okcancelbuttons" notext="取消" yestext="Create group for L$100"/>
+		<usetemplate canceltext="取消" name="okcancelbuttons" notext="取消" yestext="花費 L$100 建立群組"/>
 	</notification>
 	<notification name="LandBuyPass">
 		For L$[COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
@@ -341,7 +341,7 @@ There is no reimbursement for fees paid.
 	<notification name="DeleteMedia">
 		You have selected to delete the media associated with this face.
 Are you sure you want to continue?
-		<usetemplate ignoretext="Confirm before I delete media from an object" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="在我由一個部件中刪除媒體前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ClassifiedSave">
 		Save changes to classified [NAME]?
@@ -370,14 +370,14 @@ Are you sure you want to continue?
 		Please select a proposal to view.
 	</notification>
 	<notification name="SelectHistoryItemToView">
-		Please select a history item to view.
+		請選擇一個歷史紀錄物品去察看。
 	</notification>
 	<notification name="CacheWillClear">
-		Cache will be cleared after you restart [APP_NAME].
+		當你重新啟動 [APP_NAME] 後快取資料將會被清除。
 	</notification>
 	<notification name="CacheWillBeMoved">
-		Cache will be moved after you restart [APP_NAME].
-Note: This will clear the cache.
+		當你重新啟動 [APP_NAME] 後快取資料將被移動。
+注意：這將會清除快取資料。
 	</notification>
 	<notification name="ChangeConnectionPort">
 		Port settings take effect after you restart [APP_NAME].
@@ -519,7 +519,7 @@ Do you really want to give these items?
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="踢出並封鎖" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarNoBan">
-		將這一位化身由你的土地踢出？
+		將這一個化身由你的土地踢出？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarFullnameNoBan">
@@ -527,10 +527,10 @@ Do you really want to give these items?
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出"/>
 	</notification>
 	<notification name="EjectAvatarFromGroup">
-		你已將 [AVATAR_NAME] 由社團 [GROUP_NAME]　中踢出
+		你已將 [AVATAR_NAME] 由群組 [GROUP_NAME]　中踢出
 	</notification>
 	<notification name="AcquireErrorTooManyObjects">
-		ACQUIRE ERROR: Too many objects selected.
+		取得錯誤：太多物件被選取。
 	</notification>
 	<notification name="AcquireErrorObjectSpan">
 		ACQUIRE ERROR: Objects span more than one region.
@@ -605,7 +605,7 @@ Expected [VALIDS]
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidTooLong">
-		Audio file is too long (10 second maximum):
+		音頻檔太長（最大值 10 秒）：
 [FILE]
 	</notification>
 	<notification name="ProblemWithFile">
@@ -738,8 +738,8 @@ If you continue to get this message, please check the [SUPPORT_SITE].
 		收納區功能目前無法使用。
 	</notification>
 	<notification name="CannotSetLandOwnerNothingSelected">
-		Unable to set land owner:
-No parcel selected.
+		無法設定土地擁有者：
+無地段被選取。
 	</notification>
 	<notification name="CannotSetLandOwnerMultipleRegions">
 		Unable to force land ownership because selection spans multiple regions. Please select a smaller area and try again.
@@ -762,8 +762,8 @@ No region selected.
 No parcel selected.
 	</notification>
 	<notification name="CannotReleaseLandNoRegion">
-		Unable to abandon land:
-Cannot find region.
+		無法放棄土地：
+無法尋找地區。
 	</notification>
 	<notification name="CannotBuyLandNothingSelected">
 		Unable to buy land:
@@ -778,11 +778,11 @@ Cannot find the region this land is in.
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
 		Unable to deed land:
-No parcel selected.
+無地段被選取。
 	</notification>
 	<notification name="CannotDeedLandNoGroup">
 		Unable to deed land:
-No Group selected.
+無群組被選取。
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
 		Unable to deed land:
@@ -1377,11 +1377,11 @@ We must restart [APP_NAME] to install the update.
 	<notification name="DeedObjectToGroup">
 		Deeding this object will cause the group to:
 * Receive L$ paid into the object
-		<usetemplate ignoretext="Confirm before I deed an object to a group" name="okcancelignore" notext="取消" yestext="Deed"/>
+		<usetemplate ignoretext="在我讓渡一個物件給群組前確認" name="okcancelignore" notext="取消" yestext="Deed"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
-		Do you want to open your Web browser to view this content?
-		<usetemplate ignoretext="Launch my browser to view a web page" name="okcancelignore" notext="取消" yestext="確定"/>
+		你確定要開啟網頁瀏覽器去察看這個內容？
+		<usetemplate ignoretext="啟動我的網頁瀏覽器去察看網頁" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchJoinNow">
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以進行管理你的帳戶？
@@ -1389,37 +1389,37 @@ We must restart [APP_NAME] to install the update.
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
 		Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
-		<usetemplate ignoretext="Launch my browser to learn how to report a Security Issue" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以學習如何回報一個安全性的議題" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchQAWiki">
-		Visit the [SECOND_LIFE] QA Wiki.
-		<usetemplate ignoretext="Launch my browser to view the QA Wiki" name="okcancelignore" notext="取消" yestext="確定"/>
+		拜訪 [SECOND_LIFE] 問與答維基。
+		<usetemplate ignoretext="開啟我的網頁瀏覽器去察看問與答維基" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchPublicIssue">
-		Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
-		<usetemplate ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="取消" yestext="前往頁面"/>
+		拜訪 [SECOND_LIFE] 公共議題追蹤，那裡你將可以回報臭蟲與其他議題。
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以使用公共議題追蹤。" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="WebLaunchSupportWiki">
 		前往林登官方部落格，以取得最新的新聞與資訊。
-		<usetemplate ignoretext="Launch my browser to view the blog" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看部落格" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchLSLGuide">
-		Do you want to open the Scripting Guide for help with scripting?
-		<usetemplate ignoretext="Launch my browser to view the Scripting Guide" name="okcancelignore" notext="取消" yestext="確定"/>
+		你要開啟腳本撰寫指引以幫助你開發腳本嗎？
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看腳本撰寫指引" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchLSLWiki">
-		Do you want to visit the LSL Portal for help with scripting?
-		<usetemplate ignoretext="Launch my browser to view the LSL Portal" name="okcancelignore" notext="取消" yestext="前往頁面"/>
+		你要拜訪 LSL 入口以取得腳本設計的幫助嗎？
+		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看 LSL 入口" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="ReturnToOwner">
-		Are you sure you want to return the selected objects to their owners? Transferable deeded objects will be returned to their previous owners.
+		你確定要退回所選擇的物件給它們的擁有者嗎？ 可轉移並讓渡的物件將會退回給它們的前一位擁有者。
 
-*WARNING* No-transfer deeded objects will be deleted!
-		<usetemplate ignoretext="Confirm before I return objects to their owners" name="okcancelignore" notext="取消" yestext="確定"/>
+*警告* 非可轉移並讓渡的物件將會被刪除!
+		<usetemplate ignoretext="在我退回物件給它們的擁有者前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
-		You are currently a member of the group [GROUP].
-Leave Group?
+		你目前是 [GROUP] 群組的成員。
+是否要離開群組？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmKick">
@@ -1452,12 +1452,12 @@ Leave Group?
 	<notification name="BusyModeSet">
 		Busy mode is set.
 Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
-		<usetemplate ignoretext="I change my status to Busy mode" name="okignore" yestext="確定"/>
+		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer.
 [NAME] has invited you to join a group as a member.
-		<usetemplate name="okcancelbuttons" notext="Decline" yestext="Join"/>
+		<usetemplate name="okcancelbuttons" notext="Decline" yestext="加入"/>
 	</notification>
 	<notification name="JoinedTooManyGroups">
 		You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
@@ -1757,7 +1757,7 @@ Publish this classified now for L$[AMOUNT]?
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="SetGroupMature">
-		Does this group contain Moderate content?
+		這個群組將包含適度成人內容？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification label="Confirm restart" name="ConfirmRestart">
@@ -1894,7 +1894,7 @@ Move the inventory item(s)?
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
-		<usetemplate ignoretext="Confirm before deleting items" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="刪除物品前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
 		Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
@@ -1955,37 +1955,37 @@ Do you want to replace it with the selected object?
 
 Would you like to leave Busy Mode before completing this transaction?
 		<form name="form">
-			<ignore name="ignore" text="I am about to pay a person or object while I am in Busy mode"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="確定"/>
-			<button ignore="Never leave Busy Mode" name="No" text="取消"/>
+			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
+			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
+			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
-		The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability.  Are you sure you want to delete it?
-		<usetemplate ignoretext="Confirm before I delete a system folder" name="okcancelignore" notext="取消" yestext="確定"/>
+		資料夾 &apos;[FOLDERNAME]&apos; 是系統資料夾。刪除系統資料夾將導致不穩定。你確定你要刪除它？
+		<usetemplate ignoretext="在我刪除系統資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmEmptyTrash">
-		Are you sure you want to permanently delete the contents of your Trash?
-		<usetemplate ignoretext="Confirm before I empty the inventory Trash folder" name="okcancelignore" notext="取消" yestext="確定"/>
+		你確定你要對你垃圾筒中的內容進行刪除？
+		<usetemplate ignoretext="在我清空收納區垃圾筒資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
-		Are you sure you want to delete your travel, web, and search history?
+		你確定要刪除你的旅行、網頁及搜尋歷史紀錄嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmClearCookies">
-		Are you sure you want to clear your cookies?
+		你確定要清除你的 cookies 嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="ConfirmClearMediaUrlList">
-		Are you sure you want to clear your list of saved URLs?
+		你確定要清除你所儲存的 Url 清單嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="ConfirmEmptyLostAndFound">
-		Are you sure you want to permanently delete the contents of your Lost And Found?
-		<usetemplate ignoretext="Confirm before I empty the inventory Lost And Found folder" name="okcancelignore" notext="否" yestext="是"/>
+		你確定你要進行刪除所有 Lost And Found 資料夾中的內容？
+		<usetemplate ignoretext="在我清空收納區中的 Lost And Found 資料夾前進行確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="CopySLURL">
-		The following SLurl has been copied to your clipboard:
+		下列的 SLurl 位置已經覆製到你的剪貼簿上：
  [SLURL]
 
 Link to this from a web page to give others easy access to this location, or try it out yourself by pasting it into the address bar of any web browser.
@@ -1994,11 +1994,11 @@ Link to this from a web page to give others easy access to this location, or try
 		</form>
 	</notification>
 	<notification name="WLSavePresetAlert">
-		Do you wish to overwrite the saved preset?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="是"/>
+		你要覆寫已儲存的預設配置嗎？
+		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="WLDeletePresetAlert">
-		Do you wish to delete [SKY]?
+		你要刪除 [SKY]?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="WLNoEditDefault">
@@ -2015,7 +2015,7 @@ Link to this from a web page to give others easy access to this location, or try
 		Give me a name for the new sky.
 		<form name="form">
 			<input name="message">
-				New Preset
+				新預設配配置
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
@@ -2094,13 +2094,13 @@ Link to this from a web page to give others easy access to this location, or try
 		[MESSAGE]
 	</notification>
 	<notification name="Cancelled">
-		Cancelled
+		已取消
 	</notification>
 	<notification name="CancelledSit">
-		Cancelled Sit
+		取消坐下
 	</notification>
 	<notification name="CancelledAttach">
-		Cancelled Attach
+		取消貼上
 	</notification>
 	<notification name="ReplacedMissingWearable">
 		Replaced missing clothing/body part with default.
@@ -2131,13 +2131,13 @@ Link to this from a web page to give others easy access to this location, or try
 		In-world snapshot upload done
 	</notification>
 	<notification name="TerrainDownloaded">
-		Terrain.raw downloaded
+		地形 .raw 檔已下載
 	</notification>
 	<notification name="GestureMissing">
-		Hmm. Gesture [NAME] is missing from the database.
+		嗯，姿勢 [NAME] 在資料庫中遺失。
 	</notification>
 	<notification name="UnableToLoadGesture">
-		Unable to load gesture [NAME].
+		無法載入姿勢 [NAME]。
 	</notification>
 	<notification name="LandmarkMissing">
 		資料庫中的地標遺失。
@@ -2146,30 +2146,30 @@ Link to this from a web page to give others easy access to this location, or try
 		無法載入地標，請再試一次。
 	</notification>
 	<notification name="CapsKeyOn">
-		Your Caps Lock key is on.
-This might affect your password.
+		你的大寫鍵已啟用。
+這將可能會影響到你輸入的密碼。
 	</notification>
 	<notification name="NotecardMissing">
-		Notecard is missing from database.
+		記事卡在資料庫中遺失。
 	</notification>
 	<notification name="NotecardNoPermissions">
-		You don&apos;t have permission to view this notecard.
+		你並沒有權限去察看這個記事卡。
 	</notification>
 	<notification name="RezItemNoPermissions">
-		Insufficient permissions to rez object.
+		產生物件時發生權限衝突。
 	</notification>
 	<notification name="UnableToLoadNotecard">
-		Unable to load notecard.
-Please try again.
+		無法載入記事卡。
+請再試一次。
 	</notification>
 	<notification name="ScriptMissing">
-		Script is missing from database.
+		腳本在資料庫中遺失。
 	</notification>
 	<notification name="ScriptNoPermissions">
-		Insufficient permissions to view script.
+		察看腳本時發生權限衝突。
 	</notification>
 	<notification name="UnableToLoadScript">
-		Unable to load script.  Please try again.
+		無法載入腳本。請再試一次。
 	</notification>
 	<notification name="IncompleteInventory">
 		The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
@@ -2193,31 +2193,31 @@ Please try again.
 Please select a single object.
 	</notification>
 	<notification name="ObjectNotForSale">
-		This object is not for sale.
+		這物件不出售。
 	</notification>
 	<notification name="EnteringGodMode">
-		Entering god mode, level [LEVEL]
+		進入神之模式中，等級 [LEVEL]
 	</notification>
 	<notification name="LeavingGodMode">
-		Now leaving god mode, level [LEVEL]
+		現在離開神之模式，等級 [LEVEL]
 	</notification>
 	<notification name="CopyFailed">
-		You don&apos;t have permission to copy this.
+		你並沒有權限去覆製這個。
 	</notification>
 	<notification name="InventoryAccepted">
-		[NAME] received your inventory offer.
+		[NAME] 接收到你提供的收納區物品。
 	</notification>
 	<notification name="InventoryDeclined">
-		[NAME] declined your inventory offer.
+		[NAME] 拒絕你提供的收納區物品。
 	</notification>
 	<notification name="ObjectMessage">
 		[NAME]: [MESSAGE]
 	</notification>
 	<notification name="CallingCardAccepted">
-		Your calling card was accepted.
+		你的名片已被接受。
 	</notification>
 	<notification name="CallingCardDeclined">
-		Your calling card was declined.
+		你的名片已被拒絕。
 	</notification>
 	<notification name="TeleportToLandmark">
 		You can teleport to locations like &apos;[NAME]&apos; by opening the Places panel on the right side of your screen, and then select the Landmarks tab.
@@ -2249,12 +2249,12 @@ Try selecting a smaller piece of land.
 		[MESSAGE]
 	</notification>
 	<notification name="EventNotification">
-		Event Notification:
+		活動通知：
 
 [NAME]
 [DATE]
 		<form name="form">
-			<button name="Details" text="Details"/>
+			<button name="Details" text="細節"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
@@ -2312,8 +2312,8 @@ Non-transferable objects that are deeded to the group have been deleted.
 You can be hurt here. If you die, you will be teleported to your home location.
 	</notification>
 	<notification name="NoFly">
-		This area has flying disabled.
-You can&apos;t fly here.
+		這區域關閉並禁止飛行。
+你不能在此處飛行。
 	</notification>
 	<notification name="PushRestricted">
 		This area does not allow pushing. You can&apos;t push others here unless you own the land.
@@ -2353,13 +2353,13 @@ Please go to the Knowledge Base for details on accessing areas with this maturit
 		You do not have proper payment status to enter this region.
 	</notification>
 	<notification name="MustGetAgeRgion">
-		You must be age-verified to enter this region.
+		你必須通過年齡認證以進入這地區。
 	</notification>
 	<notification name="MustGetAgeParcel">
-		You must be age-verified to enter this parcel.
+		你必須通過年齡驗證以進入這地段。
 	</notification>
 	<notification name="NoDestRegion">
-		No destination region found.
+		無目的地地區發現。
 	</notification>
 	<notification name="NotAllowedInDest">
 		You are not allowed into the destination.
@@ -2381,10 +2381,10 @@ Please go to the Knowledge Base for details on accessing areas with this maturit
 Please try again in a few moments.
 	</notification>
 	<notification name="GeneralFailure">
-		General failure.
+		一般故障。
 	</notification>
 	<notification name="RoutedWrongRegion">
-		Routed to wrong region. Please try again.
+		路由導向到錯誤地區。請再試一次。
 	</notification>
 	<notification name="NoValidAgentID">
 		No valid agent id.
@@ -2418,7 +2418,7 @@ Please try again in a few moments.
 	</notification>
 	<notification name="ObjectGiveItem">
 		An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-[ITEM_SLURL]
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Keep"/>
 			<button name="Discard" text="Discard"/>
@@ -2442,7 +2442,7 @@ Please try again in a few moments.
 	<notification name="JoinGroup">
 		[MESSAGE]
 		<form name="form">
-			<button name="Join" text="Join"/>
+			<button name="Join" text="加入"/>
 			<button name="Decline" text="Decline"/>
 			<button name="Info" text="資訊"/>
 		</form>
@@ -2709,15 +2709,15 @@ They will be blocked for a few seconds for your security.
 	<notification name="IMToast">
 		[MESSAGE]
 		<form name="form">
-			<button name="respondbutton" text="Respond"/>
+			<button name="respondbutton" text="回應"/>
 		</form>
 	</notification>
 	<notification name="ConfirmCloseAll">
-		Are you sure you want to close all IMs?
-		<usetemplate ignoretext="Confirm before I close all IMs" name="okcancelignore" notext="取消" yestext="確定"/>
+		你確定要關閉全部 IMs 對話視窗？
+		<usetemplate ignoretext="在我關閉全部的 IMs 對話視窗前確認。" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="AttachmentSaved">
-		Attachment has been saved.
+		附件已儲存。
 	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Unable to find the help topic for this element.
@@ -2831,7 +2831,7 @@ This will also cause all residents that later join the call to be
 muted, even after you have left the call.
 
 Mute everyone?
-		<usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="在我對所有群組通話的參與者予以靜音前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="聊天" name="HintChat">
 		To join the conversation, type into the chat field below.
@@ -2875,10 +2875,10 @@ Click and drag anywhere on the world to rotate your view
 		Here&apos;s your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
 	</notification>
 	<notification name="PopupAttempt">
-		A pop-up was prevented from opening.
+		一個突顯式視窗開啟時被阻擋。
 		<form name="form">
-			<ignore name="ignore" text="Enable all pop-ups"/>
-			<button name="open" text="Open pop-up window"/>
+			<ignore name="ignore" text="啟用全部的突顯式視窗"/>
+			<button name="open" text="開啟突顯式視窗"/>
 		</form>
 	</notification>
 	<notification name="AuthRequest">
@@ -2943,10 +2943,10 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 		- Your system memory does not meet the minimum requirements.
 	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
-		If you own a piece of land, you can make it your home location.
-Otherwise, you can look at the Map and find places marked &quot;Infohub&quot;.
+		若你擁有一塊土地，你可以標記它成為你的家的位置。
+或者，你可以察看地圖尋找標記為 &quot;資訊中心&quot; 的地方。
 	</global>
 	<global name="You died and have been teleported to your home location">
-		You died and have been teleported to your home location.
+		你已經死亡並且被瞬間傳送回你的家的位置。
 	</global>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 9ef4258f0b..1dfa024138 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -3,8 +3,8 @@
 	<text name="title_text">
 		封鎖清單
 	</text>
-	<scroll_list name="blocked" tool_tip="List of currently blocked Residents"/>
-	<button label="Block person" name="Block resident..." tool_tip="Pick a Resident to block"/>
-	<button label="Block object by name" name="Block object by name..." tool_tip="Pick an object to block by name"/>
-	<button label="Unblock" name="Unblock" tool_tip="Remove Resident or object from blocked list"/>
+	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
+	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
+	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
+	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
index 94edb7ab71..cf3113ef1c 100644
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_classified_info">
 	<panel.string name="type_mature">
-		Moderate
+		適度成人
 	</panel.string>
 	<panel.string name="type_pg">
-		General Content
+		一般普級內容
 	</panel.string>
 	<panel.string name="l$_price">
 		L$[PRICE]
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
index 73c59d9ae3..6b17302bf1 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
@@ -2,11 +2,11 @@
 <panel name="edit_alpha_panel">
 	<scroll_container name="avatar_alpha_color_panel_scroll">
 		<panel name="avatar_alpha_color_panel">
-			<texture_picker label="Lower Alpha" name="Lower Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Upper Alpha" name="Upper Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Head Alpha" name="Head Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Eye Alpha" name="Eye Alpha" tool_tip="點擊以挑選圖片"/>
-			<texture_picker label="Hair Alpha" name="Hair Alpha" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="下半身半透明" name="Lower Alpha" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="上半身半透明" name="Upper Alpha" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="頭部半透明" name="Head Alpha" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="眼睛半透明" name="Eye Alpha" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="頭髮半透明" name="Hair Alpha" tool_tip="點擊以挑選圖片"/>
 		</panel>
 	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
index e749d9e3e7..f12701c981 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
@@ -32,9 +32,9 @@
 			<button label="Set to Current Location" name="set_to_curr_location_btn"/>
 			<text name="category_label" value="Category:"/>
 			<text name="content_type_label" value="Content type:"/>
-			<icons_combo_box label="General Content" name="content_type">
-				<icons_combo_box.item label="Moderate Content" name="mature_ci" value="Mature"/>
-				<icons_combo_box.item label="General Content" name="pg_ci" value="PG"/>
+			<icons_combo_box label="一般普級內容" name="content_type">
+				<icons_combo_box.item label="適度成人內容" name="mature_ci" value="Mature"/>
+				<icons_combo_box.item label="一般普級內容" name="pg_ci" value="PG"/>
 			</icons_combo_box>
 			<check_box label="Auto renew each week" name="auto_renew"/>
 			<text name="price_for_listing_label" value="Price for listing:"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
index 77ee4fd36d..26fedb59be 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
@@ -2,12 +2,12 @@
 <panel name="edit_physics_panel">
 	<panel label="" name="accordion_panel">
 		<accordion name="physics_accordion">
-			<accordion_tab name="physics_breasts_updown_tab" title="Breasts Bounce"/>
-			<accordion_tab name="physics_breasts_inout_tab" title="Breasts Cleavage"/>
-			<accordion_tab name="physics_breasts_leftright_tab" title="Breasts Sway"/>
-			<accordion_tab name="physics_belly_tab" title="Belly Bounce"/>
-			<accordion_tab name="physics_butt_tab" title="Butt Bounce"/>
-			<accordion_tab name="physics_butt_leftright_tab" title="Butt Sway"/>
+			<accordion_tab name="physics_breasts_updown_tab" title="乳房彈性"/>
+			<accordion_tab name="physics_breasts_inout_tab" title="乳溝深淺"/>
+			<accordion_tab name="physics_breasts_leftright_tab" title="乳房搖擺"/>
+			<accordion_tab name="physics_belly_tab" title="腹部彈性"/>
+			<accordion_tab name="physics_butt_tab" title="臀部彈性"/>
+			<accordion_tab name="physics_butt_leftright_tab" title="臀部搖擺"/>
 			<accordion_tab name="physics_advanced_tab" title="進階參數"/>
 		</accordion>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
index 7bf923b4ca..675caf9e2e 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
@@ -2,7 +2,7 @@
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
 		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
index 936a2651ab..066b1fd389 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
@@ -40,13 +40,13 @@
 		Editing Underpants
 	</string>
 	<string name="edit_alpha_title">
-		Editing Alpha Mask
+		半透明遮罩編輯中
 	</string>
 	<string name="edit_tattoo_title">
-		Editing Tattoo
+		刺青編輯中
 	</string>
 	<string name="edit_physics_title">
-		Editing Physics
+		身體物理編輯中
 	</string>
 	<string name="shape_desc_text">
 		體形：
@@ -88,13 +88,13 @@
 		內褲：
 	</string>
 	<string name="alpha_desc_text">
-		Alpha Mask:
+		半透明遮罩：
 	</string>
 	<string name="tattoo_desc_text">
 		刺青：
 	</string>
 	<string name="physics_desc_text">
-		Physics:
+		身體物理：
 	</string>
 	<labeled_back_button label="儲存" name="back_btn" tool_tip="回到編輯裝扮"/>
 	<text name="edit_wearable_title" value="體形編輯中"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
index 1e3c18f522..3915e80d43 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
@@ -2,16 +2,16 @@
 <panel name="panel_im_control_panel">
 	<layout_stack name="vertical_stack">
 		<layout_panel name="group_info_btn_panel">
-			<button label="社團檔案" name="group_info_btn"/>
+			<button label="群組檔案" name="group_info_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
-			<button label="Call Group" name="call_btn"/>
+			<button label="群組通話" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="Leave Call" name="end_call_btn"/>
+			<button label="結束通話" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Open Voice Controls" name="voice_ctrls_btn"/>
+			<button label="開啟語音控制" name="voice_ctrls_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index a97a35056b..f70fbf22a8 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -6,7 +6,7 @@
 Hover your mouse over the options for more help.
 	</panel.string>
 	<panel.string name="group_info_unchanged">
-		一般社團資訊已經被變更
+		一般群組資訊已經被變更
 	</panel.string>
 	<panel.string name="incomplete_member_data_str">
 		Retrieving member data
@@ -22,7 +22,7 @@ Hover your mouse over the options for more help.
 		<button label="現在就加入!!" name="btn_join"/>
 	</panel>
 	<text_editor name="charter">
-		Group Charter
+		群組規章
 	</text_editor>
 	<name_list name="visible_members">
 		<name_list.columns label="成員" name="name"/>
@@ -36,11 +36,11 @@ Hover your mouse over the options for more help.
 		我的頭銜：
 	</text>
 	<combo_box name="active_title" tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."/>
-	<check_box label="接受社團通知" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
+	<check_box label="接受群組通知" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
 	<check_box label="顯示在我的檔案中" name="list_groups_in_profile" tool_tip="Sets whether you want to show this group in your profile"/>
 	<panel name="preferences_container">
 		<text name="group_settngs_label">
-			社團
+			群組
 		</text>
 		<check_box label="任何人都可以加入" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited."/>
 		<check_box label="加入費用" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group"/>
@@ -49,8 +49,8 @@ Hover your mouse over the options for more help.
 			<combo_item name="select_mature">
 				- 選擇內容分級 -
 			</combo_item>
-			<combo_box.item label="Moderate Content" name="mature"/>
-			<combo_box.item label="一般內容" name="pg"/>
+			<combo_box.item label="適度成人內容" name="mature"/>
+			<combo_box.item label="一般普級內容" name="pg"/>
 		</combo_box>
 		<check_box initial_value="true" label="顯示在搜尋中" name="show_in_group_list" tool_tip="Let people see this group in search results"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index 320645ea5e..db01edcdb3 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="社團檔案" name="GroupInfo">
+<panel label="群組檔案" name="GroupInfo">
 	<panel.string name="default_needs_apply_text">
-		There are unsaved changes
+		變更未儲存
 	</panel.string>
 	<panel.string name="want_apply_text">
-		Do you want to save these changes?
+		你要儲存這些變更嗎？
 	</panel.string>
 	<panel.string name="group_join_btn">
-		Join (L$[AMOUNT])
+		加入（L$[AMOUNT]）
 	</panel.string>
 	<panel.string name="group_join_free">
-		Free
+		免費
 	</panel.string>
 	<panel name="group_info_top">
 		<text_editor name="group_name" value="（載入中...）"/>
-		<line_editor label="Type your new group name here" name="group_name_editor"/>
+		<line_editor label="在此輸入你的新群組名稱" name="group_name_editor"/>
 	</panel>
 	<layout_stack name="layout">
 		<layout_panel name="group_accordions">
@@ -31,11 +31,11 @@
 			<button label="聊天" name="btn_chat"/>
 		</layout_panel>
 		<layout_panel name="call_btn_lp">
-			<button label="Group Call" name="btn_call" tool_tip="Call this group"/>
+			<button label="群組通話" name="btn_call" tool_tip="與此群組進行通話"/>
 		</layout_panel>
 		<layout_panel name="btn_apply_lp">
 			<button label="儲存" label_selected="儲存" name="btn_apply"/>
-			<button label="創造社團" name="btn_create" tool_tip="創造一個新社團"/>
+			<button label="創造群組" name="btn_create" tool_tip="創造一個新群組"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index a1395f454b..07dcb2303e 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -12,7 +12,7 @@
 	<text name="help_text">
 		You can select multiple Residents to invite to your group. Click &apos;Open Resident Chooser&apos; to start.
 	</text>
-	<button label="Open Resident Chooser" name="add_button"/>
+	<button label="開啟居民選擇視窗" name="add_button"/>
 	<name_list name="invitee_list" tool_tip="Hold the Ctrl key and click Resident names to multi-select"/>
 	<button label="Remove Selected from List" name="remove_button" tool_tip="Removes the Residents selected above from the invite list"/>
 	<text name="role_text">
@@ -22,6 +22,6 @@
 	<button label="送出邀請" name="ok_button"/>
 	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
-		社團邀請
+		群組邀請
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 58022c2279..1bf3929683 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -7,7 +7,7 @@
 		You don&apos;t have permission to view group owned land
 	</panel.string>
 	<panel.string name="epmty_view_group_land_text">
-		No entries
+		沒有項目
 	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
 		You don&apos;t have permission to view the group&apos;s accounting information.
@@ -16,7 +16,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="land_contrib_error">
-		Unable to set your land contribution
+		無法設定你的土地捐獻
 	</panel.string>
 	<panel name="layout_panel_landmoney">
 		<scroll_list name="group_parcel_list">
@@ -46,7 +46,7 @@
 			[AREA] m²
 		</text>
 		<text name="your_contribution_label">
-			Your contribution:
+			你的捐獻：
 		</text>
 		<text name="your_contribution_units">
 			m²
@@ -58,7 +58,7 @@
 			More land credits are needed to support land in use
 		</text>
 		<text name="group_money_heading">
-			社團 L$
+			群組 L$
 		</text>
 	</panel>
 	<tab_container name="group_money_tab_container">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index 65c07e7137..26273dd9ce 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -10,7 +10,7 @@ You can turn off Notices on the General tab.
 	</panel.string>
 	<text name="lbl2">
 		通知保留 14 天。
-每個社團一天最多 200 則
+每個群組一天最多 200 則
 	</text>
 	<scroll_list name="notice_list">
 		<scroll_list.columns label="主旨" name="subject"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
index 803f34d5a7..00462d8b0b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="instant_message" name="panel_group_notify">
+<panel label="即時訊息" name="panel_group_notify">
 	<string name="message_max_lines_count" value="7"/>
 	<string name="subject_font" value="SANSSERIF_BIG"/>
 	<string name="date_font" value="SANSSERIF"/>
 	<panel label="header" name="header">
 		<text name="title" value="Sender Name / Group Name"/>
 	</panel>
-	<text_editor name="message" value="message"/>
+	<text_editor name="message" value="訊息"/>
 	<text name="attachment" value="Attachment"/>
 	<button label="確定" name="btn_ok"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index fff4383893..cf5fc26d14 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="成員與角色" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		There are unsaved changes
+		未儲存的設定
 	</panel.string>
 	<panel.string name="want_apply_text">
-		Do you want to save your changes?
+		你要儲存你的變更嗎？
 	</panel.string>
 	<tab_container name="roles_tab_container">
 		<panel label="成員" name="members_sub_tab" tool_tip="成員">
 			<panel.string name="help_text">
-				You can add or remove Roles assigned to Members.
-Select multiple Members by holding the Ctrl key and
-clicking on their names.
+				你可以添加或移除一個角色指派給成員。
+選責多個成員時同時按著 Ctrl 鍵且
+使用滑鼠左鍵點擊他們的名字。
 			</panel.string>
 			<panel.string name="donation_area">
 				[AREA] m²
@@ -55,12 +55,12 @@ things in this group. There&apos;s a broad variety of Abilities.
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">
-			Assigned Roles
+			指派角色
 		</text>
 		<text name="static2">
-			Allowed Abilities
+			允許的能力
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="For details of each allowed ability see the abilities tab"/>
+		<scroll_list name="member_allowed_actions" tool_tip="想瞭解有關於允許的能力的細節請查閱能力頁籤"/>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
@@ -73,23 +73,23 @@ things in this group. There&apos;s a broad variety of Abilities.
 			描述
 		</text>
 		<text name="static4">
-			Assigned Members
+			指派角色
 		</text>
 		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."/>
 		<text name="static5">
-			Allowed Abilities
+			允許的能力
 		</text>
-		<scroll_list name="role_allowed_actions" tool_tip="For details of each allowed ability see the abilities tab"/>
+		<scroll_list name="role_allowed_actions" tool_tip="想瞭解有關於每一項允許的能力的細節請查閱能力頁籤"/>
 	</panel>
 	<panel name="actions_footer">
 		<text_editor name="action_description">
 			This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
 		</text_editor>
 		<text name="static2">
-			Roles with this ability
+			有此能力的角色
 		</text>
 		<text name="static3">
-			Members with this ability
+			有此能力的成員
 		</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
index fa907e3d90..eea406170a 100644
--- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
@@ -4,12 +4,12 @@
 		<accordion_tab name="tab_favorites" title="最愛列"/>
 		<accordion_tab name="tab_landmarks" title="我的地標"/>
 		<accordion_tab name="tab_inventory" title="我的收納區"/>
-		<accordion_tab name="tab_library" title="Library"/>
+		<accordion_tab name="tab_library" title="資源庫"/>
 	</accordion>
 	<panel name="bottom_panel">
 		<layout_stack name="bottom_panel">
 			<layout_panel name="options_gear_btn_panel">
-				<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
+				<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
 			</layout_panel>
 			<layout_panel name="add_btn_panel">
 				<button name="add_btn" tool_tip="添加新地標"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index 059a78cf7d..3e44f2a584 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
@@ -14,7 +14,7 @@
 		目前頁面：
 	</text>
 	<text name="current_url" tool_tip="The current page for this media source" value=""/>
-	<button label="Reset" name="current_url_reset_btn"/>
+	<button label="重設" name="current_url_reset_btn"/>
 	<check_box initial_value="false" label="Auto Loop" name="auto_loop"/>
 	<check_box initial_value="false" label="First Click Interacts" name="first_click_interact"/>
 	<check_box initial_value="false" label="Auto Zoom" name="auto_zoom"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index 3645f471ce..ec62b61c54 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
@@ -17,7 +17,7 @@
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_owner_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_owner_control"/>
 	<text name="group_label">
-		社團：
+		群組：
 	</text>
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_group_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_group_control"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
index ef56c34b5c..aaaf6bfb94 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
@@ -4,7 +4,7 @@
 	<text name="home_url_fails_some_items_in_whitelist">
 		Entries that the home page fails against are marked:
 	</text>
-	<button label="Add" name="whitelist_add"/>
+	<button label="添加" name="whitelist_add"/>
 	<button label="刪除" name="whitelist_del"/>
 	<text name="home_url_fails_whitelist">
 		Warning: the home page specified in the General tab fails to pass this whitelist. It has been disabled until a valid entry has been added.
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
index 1748d117f4..60a5767d09 100644
--- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
@@ -9,8 +9,8 @@
 			<combo_editor label="搜尋 [SECOND_LIFE]" name="search_combo_editor"/>
 		</search_combo_box>
 	</panel>
-	<favorites_bar name="favorite" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
-		<label name="favorites_bar_label" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
+	<favorites_bar name="favorite" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
+		<label name="favorites_bar_label" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
 			最愛列
 		</label>
 		<chevron_button name="&gt;&gt;" tool_tip="顯示更多我的最愛"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
index 5ab6837569..6a4b5fcf35 100644
--- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
@@ -30,9 +30,9 @@
 		</text>
 		<combo_box name="show_combo">
 			<combo_box.item label="全部" name="All"/>
-			<combo_box.item label="In this Parcel" name="WithinParcel"/>
-			<combo_box.item label="Outside this Parcel" name="OutsideParcel"/>
-			<combo_box.item label="On other Avatars" name="OnOthers"/>
+			<combo_box.item label="在此地段內" name="WithinParcel"/>
+			<combo_box.item label="在此地段外部" name="OutsideParcel"/>
+			<combo_box.item label="在其他化身身上" name="OnOthers"/>
 		</combo_box>
 		<scroll_list name="media_list">
 			<scroll_list.columns label="Proximity" name="media_proximity"/>
@@ -53,10 +53,10 @@
 					<button name="pause_btn" tool_tip="暫停所選擇的媒體"/>
 				</layout_panel>
 				<layout_panel name="volume_slider_ctrl">
-					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Audio volume for selected media"/>
+					<slider_bar initial_value="0.5" name="volume_slider" tool_tip="所選擇的媒體之音頻音量"/>
 				</layout_panel>
 				<layout_panel name="mute">
-					<button name="mute_btn" tool_tip="Mute audio on selected media"/>
+					<button name="mute_btn" tool_tip="靜音所選擇的媒體音頻"/>
 				</layout_panel>
 				<layout_panel name="zoom">
 					<button name="zoom_btn" tool_tip="Zoom into selected media"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_notes.xml b/indra/newview/skins/default/xui/zh/panel_notes.xml
index f68fd74d1f..5d0e6760ff 100644
--- a/indra/newview/skins/default/xui/zh/panel_notes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notes.xml
@@ -27,7 +27,7 @@
 					<button label="地圖" name="show_on_map_btn" tool_tip="Show the Resident on the map"/>
 				</layout_panel>
 				<layout_panel name="teleport_btn_lp">
-					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
+					<button label="瞬間傳送" name="teleport" tool_tip="發給瞬間傳送請求"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
index 39a9bcb848..693cdcdeca 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Wearing">
 	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
+		<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 8da75e334e..c97ff2ae96 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,18 +14,18 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string name="no_filtered_friends_msg">
 		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
-	<string name="people_filter_label" value="Filter People"/>
-	<string name="groups_filter_label" value="Filter Groups"/>
-	<string name="no_filtered_groups_msg" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
-	<string name="no_groups_msg" value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]."/>
-	<string name="MiniMapToolTipMsg" value="[REGION](Double-click to open Map, shift-drag to pan)"/>
-	<string name="AltMiniMapToolTipMsg" value="[REGION](Double-click to teleport, shift-drag to pan)"/>
-	<filter_editor label="Filter" name="filter_input"/>
+	<string name="people_filter_label" value="人員過濾器"/>
+	<string name="groups_filter_label" value="群組過濾器"/>
+	<string name="no_filtered_groups_msg" value="沒有發現你要找的嗎？何不試試 [secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
+	<string name="no_groups_msg" value="想找尋群組加入嗎？何不試試 [secondlife:///app/search/groups 搜尋]。"/>
+	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
+	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="Add selected Resident to your friends List"/>
+				<button name="add_friend_btn" tool_tip="添加已選擇的居民到Ad你的朋友清單"/>
 			</panel>
 		</panel>
 		<panel label="我的朋友" name="friends_panel">
@@ -39,55 +39,55 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
 					</layout_panel>
 					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Offer friendship to a Resident"/>
+						<button name="add_btn" tool_tip="向居民提出加為好友邀請"/>
 					</layout_panel>
 					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Remove selected person from your Friends list"/>
+						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
 					</layout_panel>
 				</layout_stack>
 			</panel>
 		</panel>
-		<panel label="我的社團" name="groups_panel">
+		<panel label="我的群組" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="Join group/Create new group"/>
-				<button name="activate_btn" tool_tip="Activate selected group"/>
+				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
 			</panel>
 		</panel>
-		<panel label="RECENT" name="recent_panel">
+		<panel label="最近" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
 				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="Add selected Resident to your friends List"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
 	</tab_container>
 	<panel name="button_bar">
 		<layout_stack name="bottom_bar_ls">
 			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information"/>
+				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="Call this Resident"/>
+				<button label="通話" name="call_btn" tool_tip="與此居民進行通話"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="Offer teleport"/>
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="發給瞬間傳送請求"/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
 			<layout_panel name="group_info_btn_lp">
-				<button label="社團檔案" name="group_info_btn" tool_tip="顯示社團資訊"/>
+				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="Group Chat" name="chat_btn" tool_tip="開啟聊天會話"/>
+				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
 			</layout_panel>
 			<layout_panel name="group_call_btn_lp">
-				<button label="Group Call" name="group_call_btn" tool_tip="Call this group"/>
+				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
index a233092dc2..15733b71b0 100644
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_picks.xml
@@ -19,7 +19,7 @@
 				<button label="資訊" name="info_btn" tool_tip="顯示精選地點資訊"/>
 			</layout_panel>
 			<layout_panel name="teleport_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到相對應的區域"/>
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到的區域"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="地圖" name="show_on_map_btn" tool_tip="在世界地圖上顯示相對應的區域"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index aa7b036398..d7bcb0d027 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -4,33 +4,33 @@
 	<string name="off" value="Off"/>
 	<string name="anyone" value="Anyone"/>
 	<string name="available" value="available"/>
-	<string name="allocated" value="allocated"/>
+	<string name="allocated" value="已分配"/>
 	<string name="title_place" value="地點檔案"/>
 	<string name="title_teleport_history" value="瞬間傳送歷史紀錄"/>
-	<string name="not_available" value="(N\A)"/>
+	<string name="not_available" value="（N\A）"/>
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
 	<string name="none_text" value="（無）"/>
 	<string name="sale_pending_text" value="（擱置銷售）"/>
-	<string name="group_owned_text" value="（社團所擁有）"/>
+	<string name="group_owned_text" value="（群組所擁有）"/>
 	<string name="price_text" value="L$"/>
 	<string name="area_text" value="m²"/>
 	<string name="all_residents_text" value="全部居民"/>
-	<string name="group_text" value="社團"/>
+	<string name="group_text" value="群組"/>
 	<string name="can_resell">
-		Purchased land in this region may be resold.
+		購買這地區的土地允許轉售。
 	</string>
 	<string name="can_not_resell">
-		Purchased land in this region may not be resold.
+		購買這地區的土地不允許轉售。
 	</string>
 	<string name="can_change">
-		Purchased land in this region may be joined or subdivided.
+		購買這地區的土地允許進行合併或分割。
 	</string>
 	<string name="can_not_change">
-		Purchased land in this region may not be joined or subdivided.
+		購買這地區的土地不允許進行合併或分割。
 	</string>
 	<string name="server_update_text">
-		Place information not available without server update.
+		地點資訊因無伺服器更新故無法提供。
 	</string>
 	<string name="server_error_text">
 		Information about this location is unavailable at this time, please try again later.
@@ -41,7 +41,7 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<button name="back_btn" tool_tip="Back"/>
+	<button name="back_btn" tool_tip="返回"/>
 	<text name="title" value="地點檔案"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
@@ -56,7 +56,7 @@
 					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="分級："/>
 						<text name="rating_value" value="未知"/>
-						<text name="voice_label" value="Voice:"/>
+						<text name="voice_label" value="語音："/>
 						<text name="voice_value" value="On"/>
 						<text name="fly_label" value="飛行："/>
 						<text name="fly_value" value="On"/>
@@ -66,7 +66,7 @@
 						<text name="build_value" value="On"/>
 						<text name="scripts_label" value="腳本："/>
 						<text name="scripts_value" value="On"/>
-						<text name="damage_label" value="Damage:"/>
+						<text name="damage_label" value="商害："/>
 						<text name="damage_value" value="Off"/>
 						<button label="關於土地" name="about_land_btn"/>
 					</panel>
@@ -78,10 +78,10 @@
 						<text name="region_type_label" value="類型："/>
 						<text name="region_type" value="Moose"/>
 						<text name="region_rating_label" value="分級："/>
-						<text name="region_rating" value="成人"/>
+						<text name="region_rating" value="完全成人"/>
 						<text name="region_owner_label" value="擁有者："/>
 						<text name="region_owner" value="moose Van Moose extra long name moose"/>
-						<text name="region_group_label" value="社團："/>
+						<text name="region_group_label" value="群組："/>
 						<text name="region_group">
 							The Mighty Moose of mooseville soundvillemoose
 						</text>
@@ -104,8 +104,8 @@
 						<text name="traffic_label" value="流量："/>
 						<text name="primitives_label" value="Primitives:"/>
 						<text name="parcel_scripts_label" value="腳本："/>
-						<text name="terraform_limits_label" value="Terraform limits:"/>
-						<text name="subdivide_label" value="Subdivide/Join ability:"/>
+						<text name="terraform_limits_label" value="土地變形限制："/>
+						<text name="subdivide_label" value="分割土地/合併土地能力："/>
 						<text name="resale_label" value="ReSale ability:"/>
 						<text name="sale_to_label" value="出售給："/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
index c141201ab2..8ac464271e 100644
--- a/indra/newview/skins/default/xui/zh/panel_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_places.xml
@@ -11,7 +11,7 @@
 						<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選擇的區域"/>
 					</layout_panel>
 					<layout_panel name="chat_btn_lp">
-						<button label="地圖" name="map_btn" tool_tip="Show the corresponding area on the World Map"/>
+						<button label="地圖" name="map_btn" tool_tip="在世界地圖上顯示相對應的區域"/>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index c691edb11c..c083d40a82 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -10,7 +10,7 @@
 	</radio_group>
 	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
 	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-	<check_box label="Enable plain text IM and chat history" name="plain_text_chat_history"/>
+	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
 	<check_box label="聊天泡泡" name="bubble_text_chat"/>
 	<text name="show_ims_in_label">
 		顯示 IMs 於：
@@ -23,14 +23,14 @@
 		<radio_item label="頁籤" name="radio2" value="1"/>
 	</radio_group>
 	<text name="disable_toast_label">
-		Enable incoming chat popups:
+		啟用傳入聊天的突顯示視窗：
 	</text>
-	<check_box label="Group Chats" name="EnableGroupChatPopups" tool_tip="Check to see popups when a Group Chat message arrives"/>
-	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="Check to see popups when an instant message arrives"/>
+	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
+	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
 	<spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/>
 	<spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/>
 	<text name="translate_chb_label">
-		Use machine translation while chatting (powered by Google)
+		聊天時使用機器自動進行翻譯（由 Google 所提供）
 	</text>
 	<text name="translate_language_text">
 		聊天翻譯為：
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index b7449dad10..cabe13adb8 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -23,9 +23,9 @@
 		我想要能進出內容分級的地區為：
 	</text>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="General, Moderate, Adult" name="Desired_Adult"/>
-		<combo_box.item label="General and Moderate" name="Desired_Mature"/>
-		<combo_box.item label="一般" name="Desired_PG"/>
+		<combo_box.item label="一般普級，適度成人，完全成人" name="Desired_Adult"/>
+		<combo_box.item label="一般普級與適度成人" name="Desired_Mature"/>
+		<combo_box.item label="一般普級" name="Desired_PG"/>
 	</combo_box>
 	<text name="start_location_textbox">
 		開始位置：
@@ -45,9 +45,9 @@
 	</radio_group>
 	<check_box label="我的名字" name="show_my_name_checkbox1"/>
 	<check_box label="使用者名稱" name="show_slids" tool_tip="顯示使用者名稱，就像 bobsmith123 這類的"/>
-	<check_box label="社團頭銜" name="show_all_title_checkbox1" tool_tip="顯示社團頭銜，像是 Officer 或成員"/>
-	<check_box label="高亮顯示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
-	<check_box label="View Display Names" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
+	<check_box label="群組頭銜" name="show_all_title_checkbox1" tool_tip="顯示群組頭銜，像是 Officer 或成員"/>
+	<check_box label="高亮標示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
+	<check_box label="察看顯示名稱" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
 	<text name="inworld_typing_rg_label">
 		按下字母鍵：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index 8c728bf779..ee8cd9794a 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="圖形" name="Display panel">
 	<text name="QualitySpeed">
-		Quality and speed:
+		品質與速度：
 	</text>
 	<text name="FasterText">
-		Faster
+		最快
 	</text>
 	<text name="BetterText">
-		Better
+		最佳
 	</text>
 	<text name="ShadersPrefText">
-		Low
+		低
 	</text>
 	<text name="ShadersPrefText2">
-		Mid
+		中
 	</text>
 	<text name="ShadersPrefText3">
-		High
+		高
 	</text>
 	<text name="ShadersPrefText4">
-		Ultra
+		超高
 	</text>
 	<panel label="自訂圖形" name="CustomGraphics Panel">
 		<text name="ShadersText">
-			Shaders:
+			著色器：
 		</text>
-		<check_box initial_value="true" label="Transparent Water" name="TransparentWater"/>
-		<check_box initial_value="true" label="Bump mapping and shiny" name="BumpShiny"/>
-		<check_box initial_value="true" label="Basic shaders" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing"/>
-		<check_box initial_value="true" label="Atmospheric shaders" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/>
+		<check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/>
+		<check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/>
+		<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
 		<text name="reflection_label">
-			Water Reflections:
+			水文反射：
 		</text>
 		<combo_box name="Reflections">
-			<combo_box.item label="Minimal" name="0"/>
-			<combo_box.item label="Terrain and trees" name="1"/>
+			<combo_box.item label="最小" name="0"/>
+			<combo_box.item label="地形與樹木" name="1"/>
 			<combo_box.item label="全部靜態物件" name="2"/>
 			<combo_box.item label="全部化身與物件" name="3"/>
-			<combo_box.item label="Everything" name="4"/>
+			<combo_box.item label="一切" name="4"/>
 		</combo_box>
-		<slider label="Avatar Physics:" name="AvatarPhysicsDetail"/>
+		<slider label="化身物理：" name="AvatarPhysicsDetail"/>
 		<text name="AvatarPhysicsDetailText">
-			Low
+			低
 		</text>
 		<slider label="描繪距離：" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
@@ -49,54 +49,54 @@
 		</text>
 		<slider label="Max. particle count:" name="MaxParticleCount"/>
 		<slider label="Max. # of non-impostor avatars:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Post process quality:" name="RenderPostProcess"/>
+		<slider label="後製品質：" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
-			Mesh detail:
+			網面細節：
 		</text>
-		<slider label="Objects:" name="ObjectMeshDetail"/>
+		<slider label="物件：" name="ObjectMeshDetail"/>
 		<slider label="Flexiprims:" name="FlexibleMeshDetail"/>
-		<slider label="Trees:" name="TreeMeshDetail"/>
-		<slider label="Avatars:" name="AvatarMeshDetail"/>
-		<slider label="Terrain:" name="TerrainMeshDetail"/>
-		<slider label="Sky:" name="SkyMeshDetail"/>
+		<slider label="樹木：" name="TreeMeshDetail"/>
+		<slider label="化身：" name="AvatarMeshDetail"/>
+		<slider label="地形：" name="TerrainMeshDetail"/>
+		<slider label="天空：" name="SkyMeshDetail"/>
 		<text name="PostProcessText">
-			Low
+			低
 		</text>
 		<text name="ObjectMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="FlexibleMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="TreeMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="AvatarMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="TerrainMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="SkyMeshDetailText">
-			Low
+			低
 		</text>
 		<text name="AvatarRenderingText">
 			Avatar Rendering:
 		</text>
 		<check_box initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
+		<check_box initial_value="true" label="化身衣服" name="AvatarCloth"/>
 		<text name="TerrainDetailText">
-			Terrain detail:
+			地形細節：
 		</text>
 		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Low" name="0"/>
-			<radio_item label="High" name="2"/>
+			<radio_item label="低" name="0"/>
+			<radio_item label="高" name="2"/>
 		</radio_group>
 		--&gt;
 	</panel>
 	<button label="套用" label_selected="套用" name="Apply"/>
-	<button label="Reset" name="Defaults"/>
+	<button label="重設" name="Defaults"/>
 	<button label="進階" name="Advanced"/>
 	<button label="硬體" label_selected="硬體" name="GraphicsHardwareButton"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index de296f72f3..57e3540b3d 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -5,20 +5,20 @@
 	<text name="heading2">
 		自動位移：
 	</text>
-	<check_box label="建造 / 編輯" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode"/>
-	<check_box label="編輯外觀" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
-	<check_box initial_value="true" label="側邊欄" name="appearance_sidebar_positioning" tool_tip="Use automatic camera positioning for sidebar"/>
+	<check_box label="建造 / 編輯" name="edit_camera_movement" tool_tip="使用進入或離開編輯模式時自動調整攝影機位置功能"/>
+	<check_box label="編輯外觀" name="appearance_camera_movement" tool_tip="使用編輯模式時自動調整攝影機位置功能"/>
+	<check_box initial_value="true" label="側邊欄" name="appearance_sidebar_positioning" tool_tip="使用開啟側邊欄時自動調整攝影機位置功能"/>
 	<check_box label="將我顯示於第一人稱視角中" name="first_person_avatar_visible"/>
 	<text name=" Mouse Sensitivity">
-		Mouselook mouse sensitivity:
+		第一人稱視角滑鼠敏感度：
 	</text>
 	<check_box label="反轉" name="invert_mouse"/>
 	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
-	<check_box label="Tap-tap-hold to run" name="tap_tap_hold_to_run"/>
+	<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
 	<check_box label="雙擊以D：" name="double_click_chkbox"/>
 	<radio_group name="double_click_action">
 		<radio_item label="瞬間傳送" name="radio_teleport"/>
-		<radio_item label="Auto-pilot" name="radio_autopilot"/>
+		<radio_item label="自動導航駕駛" name="radio_autopilot"/>
 	</radio_group>
 	<button label="其他設備" name="joystick_setup_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index 89a1a48abf..bd6d465572 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -8,8 +8,8 @@
 		（位置、圖像、網頁、搜尋的歷史紀錄）
 	</text>
 	<check_box label="將我顯示在搜尋的結果中" name="online_searchresults"/>
-	<check_box label="只有我的朋友和社團知道我在線上" name="online_visibility"/>
-	<check_box label="只有我的朋友和社團可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+	<check_box label="只有我的朋友和群組知道我在線上" name="online_visibility"/>
+	<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
 	<check_box label="當通話結束時關閉麥克風" name="auto_disengage_mic_check"/>
 	<check_box label="登入時顯示我最愛的地標位置（經由 &apos;開始於&apos; 的下拉式選單）" name="favorites_on_login_check"/>
 	<text name="Logs:">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index e7a934c5cc..efefb92df6 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -21,7 +21,7 @@
 		快取位置：
 	</text>
 	<button label="瀏覽" label_selected="瀏覽" name="set_cache"/>
-	<button label="重設" label_selected="重設" name="reset_cache"/>
+	<button label="" label_selected="重設" name="reset_cache"/>
 	<text name="Web:">
 		網頁：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
index 305d1e2ac9..3280b9357b 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -9,7 +9,7 @@
 		最小化時靜音
 	</text>
 	<slider label="按鍵音" name="UI Volume"/>
-	<slider label="Ambient" name="Wind Volume"/>
+	<slider label="環境音" name="Wind Volume"/>
 	<slider label="音效" name="SFX Volume"/>
 	<slider label="串流音樂" name="Music Volume"/>
 	<check_box label="已啟用" name="enable_music"/>
@@ -33,7 +33,7 @@
 	<check_box label="Toggle speak on/off when I press:" name="push_to_talk_toggle_check" tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
 	<line_editor label="Push-to-Speak trigger" name="modifier_combo"/>
 	<button label="設定按鍵" name="set_voice_hotkey_button"/>
-	<button name="set_voice_middlemouse_button" tool_tip="Reset to Middle Mouse Button"/>
+	<button name="set_voice_middlemouse_button" tool_tip="重設滑鼠中鍵按鈕"/>
 	<button label="輸入 / 輸出設備" name="device_settings_btn"/>
 	<panel label="設備設定" name="device_settings_panel">
 		<panel.string name="default_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_profile.xml b/indra/newview/skins/default/xui/zh/panel_profile.xml
index fcf7bb64db..502449ac3a 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile.xml
@@ -36,9 +36,9 @@
 					<text name="title_acc_status_text" value="帳戶狀態："/>
 					<text name="title_partner_text" value="配偶："/>
 					<panel name="partner_data_panel">
-						<text initial_value="(retrieving)" name="partner_text"/>
+						<text initial_value="（檢索中）" name="partner_text"/>
 					</panel>
-					<text name="title_groups_text" value="社團："/>
+					<text name="title_groups_text" value="群組："/>
 				</panel>
 			</scroll_container>
 		</layout_panel>
@@ -47,7 +47,7 @@
 		<layout_panel name="profile_buttons_panel">
 			<layout_stack name="bottom_bar_ls">
 				<layout_panel name="add_friend_btn_lp">
-					<button label="加為朋友" name="add_friend" tool_tip="Offer friendship to the Resident"/>
+					<button label="加為朋友" name="add_friend" tool_tip="發出交友邀請給這居民"/>
 				</layout_panel>
 				<layout_panel name="im_btn_lp">
 					<button label="IM" name="im" tool_tip="開啟即時訊息會話"/>
@@ -56,7 +56,7 @@
 					<button label="通話" name="call" tool_tip="與這位居民通話"/>
 				</layout_panel>
 				<layout_panel name="chat_btn_lp">
-					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
+					<button label="瞬間傳送" name="teleport" tool_tip="發給瞬間傳送請求"/>
 				</layout_panel>
 				<layout_panel name="overflow_btn_lp">
 					<menu_button label="▼" name="overflow_btn" tool_tip="支付金錢，或分享收納區給居民"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index 315bc0ac8e..ad94c4c7e9 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
@@ -36,7 +36,7 @@
 	<text_editor name="covenant_editor">
 		There is no Covenant provided for this Estate.
 	</text_editor>
-	<button label="Reset" name="reset_covenant"/>
+	<button label="重設" name="reset_covenant"/>
 	<text name="covenant_help_text">
 		Changes to the covenant will show on all parcels in the estate.
 	</text>
@@ -62,7 +62,7 @@
 		分級：
 	</text>
 	<text name="region_maturity_text">
-		成人
+		完全成人
 	</text>
 	<text name="resellable_lbl">
 		轉售：
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index 1ffbcbf8fd..ed5e6e9d2c 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -7,8 +7,8 @@
 		未知
 	</text>
 	<check_box label="關閉腳本" name="disable_scripts_check" tool_tip="關閉這個地區現在的全部腳本"/>
-	<check_box label="Disable Collisions" name="disable_collisions_check" tool_tip="Disable non-avatar collisions in this region"/>
-	<check_box label="Disable Physics" name="disable_physics_check" tool_tip="Disable all physics in this region"/>
+	<check_box label="關閉碰撞" name="disable_collisions_check" tool_tip="關閉這個地區現在的非化身碰撞"/>
+	<check_box label="關閉物理" name="disable_physics_check" tool_tip="關閉這個地區現在的全部物理"/>
 	<button label="套用" name="apply_btn"/>
 	<text name="objret_text_lbl">
 		物件退回
@@ -23,12 +23,12 @@
 	<text name="options_text_lbl">
 		選項：
 	</text>
-	<check_box label="With scripts" name="return_scripts" tool_tip="只退回R包含腳本的物件"/>
-	<check_box label="On someone else&apos;s land" name="return_other_land" tool_tip="Return only objects which are on land belonging to someone else"/>
-	<check_box label="In every region of this estate" name="return_estate_wide" tool_tip="Return objects in all of the regions that make up this estate"/>
+	<check_box label="包含有腳本" name="return_scripts" tool_tip="只退回包含腳本的物件"/>
+	<check_box label="位於其他人土地上" name="return_other_land" tool_tip="只退回物件在屬於某個其他人土地上的物件"/>
+	<check_box label="於這個領地內的每一個地區" name="return_estate_wide" tool_tip="退回這個領地內全部地區中標記為他的物件"/>
 	<button label="退回" name="return_btn"/>
-	<button label="Get Top Colliders..." name="top_colliders_btn" tool_tip="List of objects experiencing the most potential collisions"/>
-	<button label="Get Top Scripts..." name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts"/>
+	<button label="取得最常碰撞的物件..." name="top_colliders_btn" tool_tip="條列出目前運作中最常碰撞的物件清單"/>
+	<button label="取得最耗能腳本..." name="top_scripts_btn" tool_tip="條列出目前運作中最耗能的腳本清單"/>
 	<button label="地區重新啟動" name="restart_btn" tool_tip="給予兩分鐘倒數計時並重新啟動"/>
 	<button label="延遲重新啟動" name="cancel_restart_btn" tool_tip="延遲地區重新啟動一小時"/>
 </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 1f1676167b..efa3be2f51 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="領地" name="Estate">
 	<text name="estate_help_text">
-		Changes to settings on this tab will affect all regions in the estate.
+		變更此夜籤中的設定會影響這個領地內的全部地區設定。
 	</text>
 	<text name="estate_text">
 		領地：
@@ -16,9 +16,9 @@
 		（未知）
 	</text>
 	<check_box label="Use Global Time" name="use_global_time_check"/>
-	<check_box label="Fixed Sun" name="fixed_sun_check"/>
+	<check_box label="固定太陽" name="fixed_sun_check"/>
 	<slider label="Phase" name="sun_hour_slider"/>
-	<check_box label="Allow Public Access" name="externally_visible_check"/>
+	<check_box label="允許公開出入" name="externally_visible_check"/>
 	<text name="Only Allow">
 		Restrict Access to accounts verified by:
 	</text>
@@ -40,7 +40,7 @@
 	<button label="移除..." name="remove_allowed_avatar_btn"/>
 	<button label="添加..." name="add_allowed_avatar_btn"/>
 	<text name="allow_group_label">
-		允許的社團：
+		允許的群組：
 	</text>
 	<button label="移除..." name="remove_allowed_group_btn"/>
 	<button label="添加..." name="add_allowed_group_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index dce75c997d..38fde494aa 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -18,10 +18,10 @@
 	<text name="region_type">
 		未知
 	</text>
-	<check_box label="Block Terraform" name="block_terraform_check"/>
-	<check_box label="Block Fly" name="block_fly_check"/>
-	<check_box label="Allow Damage" name="allow_damage_check"/>
-	<check_box label="Restrict Pushing" name="restrict_pushobject"/>
+	<check_box label="阻止變形" name="block_terraform_check"/>
+	<check_box label="阻止飛行" name="block_fly_check"/>
+	<check_box label="允許傷害" name="allow_damage_check"/>
+	<check_box label="限制推撞" name="restrict_pushobject"/>
 	<check_box label="允許土地轉售" name="allow_land_resell_check"/>
 	<check_box label="允許土地 合併/分割" name="allow_parcel_changes_check"/>
 	<check_box label="阻擋土地顯示於搜尋中" name="block_parcel_search_check" tool_tip="Let people see this region and its parcels in search results"/>
@@ -30,13 +30,13 @@
 	<text label="Maturity" name="access_text">
 		分級：
 	</text>
-	<icons_combo_box label="Moderate" name="access_combo">
-		<icons_combo_box.item label="成人" name="Adult" value="42"/>
-		<icons_combo_box.item label="Moderate" name="Mature" value="21"/>
-		<icons_combo_box.item label="一般" name="PG" value="13"/>
+	<icons_combo_box label="適度成人" name="access_combo">
+		<icons_combo_box.item label="完全成人" name="Adult" value="42"/>
+		<icons_combo_box.item label="適度成人" name="Mature" value="21"/>
+		<icons_combo_box.item label="一般普級" name="PG" value="13"/>
 	</icons_combo_box>
 	<button label="套用" name="apply_btn"/>
-	<button label="強制瞬間傳送一位居民回家..." name="kick_btn"/>
+	<button label="強制瞬間傳送一個居民回家..." name="kick_btn"/>
 	<button label="強制瞬間傳送所有居民回家..." name="kick_all_btn"/>
 	<button label="送出訊息到地區..." name="im_btn"/>
 	<button label="管理瞬間傳送中心..." name="manage_telehub_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index e42d904f32..1dc7c1e089 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -4,10 +4,10 @@
 		載入中...
 	</panel.string>
 	<panel.string name="can_not_view">
-		You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+		你不察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需要完整權限去察看或編輯有包含腳本在內的物件。
 	</panel.string>
 	<panel.string name="public_objects_can_not_run">
-		Public Objects cannot run scripts
+		公開物件不能執行腳本
 	</panel.string>
 	<panel.string name="script_running">
 		執行中
@@ -16,7 +16,7 @@
 		腳本：[NAME]
 	</panel.string>
 	<panel.string name="external_editor_not_set">
-		Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
+		由環境變數設定 LL_SCRIPT_EDITOR 或是 ExternalEditor 設定來選擇一個編輯器。
 	</panel.string>
 	<menu_bar name="script_menu">
 		<menu label="檔案" name="File">
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
index 625213e376..b706f1839a 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -13,7 +13,7 @@
 	</sidetray_tab>
 	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="People">
 		<panel_container name="panel_container">
-			<panel label="社團檔案" name="panel_group_info_sidetray"/>
+			<panel label="群組檔案" name="panel_group_info_sidetray"/>
 			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 9a59d627d0..808e14f3c3 100644
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -16,12 +16,12 @@
 		L$ [AMT]
 	</panel.string>
 	<panel name="balance_bg">
-		<text name="balance" tool_tip="Click to refresh your L$ balance" value="L$20"/>
+		<text name="balance" tool_tip="點擊以重新更新你的 L$ 帳戶餘額" value="L$20"/>
 		<button label="購買 L$" name="buyL" tool_tip="點擊以購買更多 L$"/>
 	</panel>
 	<text name="TimeText" tool_tip="目前時區（太平洋）">
 		24:00 AM PST
 	</text>
 	<button name="media_toggle_btn" tool_tip="開始 / 停止全部媒體（音樂、影片、網頁）"/>
-	<button name="volume_btn" tool_tip="Global Volume Control"/>
+	<button name="volume_btn" tool_tip="全域音量控制"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml
index ad28361a7f..b5aa659bf0 100644
--- a/indra/newview/skins/default/xui/zh/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="InvalidLocation">
-		Invalid Location
+		無效的位置
 	</panel.string>
 	<panel.string name="world_map_north">
 		N
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 534c0f39fc..d5c3096b22 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
 	<action_set description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership">
-		<action description="Invite People to this Group" longdescription="Invite People to this Group using the &apos;Invite&apos; button in the Roles section &gt; Members tab." name="member invite" value="1"/>
-		<action description="將會員由這個社團中踢出" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
+		<action description="邀請他人加入這個群組" longdescription="邀請他人加入這個群組，請按下於角色區段中的成員頁籤中的 &apos;邀請&apos; 按鈕。" name="member invite" value="1"/>
+		<action description="將會員由這個群組中踢出" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
 		<action description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;" longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section." name="member options" value="3"/>
 	</action_set>
 	<action_set description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles">
-		<action description="Create new Roles" longdescription="Create new Roles in the Roles section &gt; Roles tab." name="role create" value="4"/>
+		<action description="創立一個新角色" longdescription="創立一個新角色於角色區段 &gt; 角色頁籤。" name="role create" value="4"/>
 		<action description="刪除角色" longdescription="Delete Roles in the Roles section &gt; Roles tab." name="role delete" value="5"/>
 		<action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section &gt; Roles tab after selecting a Role." name="role properties" value="6"/>
 		<action description="Assign Members to Assigner&apos;s Roles" longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section &gt; Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7"/>
@@ -50,7 +50,7 @@
 	<action_set description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects." name="Parcel Content">
 		<action description="Return objects owned by group" longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab." name="land return group owned" value="48"/>
 		<action description="Return objects set to group" longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab." name="land return group set" value="33"/>
-		<action description="Return non-group objects" longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." name="land return non group" value="34"/>
+		<action description="退回非群組物件" longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." name="land return non group" value="34"/>
 		<action description="Landscaping using Linden plants" longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder, or they can be created via the Build menu." name="land gardening" value="35"/>
 	</action_set>
 	<action_set description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools &gt; General tab. Right-click an object and Edit to see its settings." name="Object Management">
@@ -66,8 +66,8 @@
 		<action description="接收通知與察看過去通知" longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group &gt; Notices section." name="notices receive" value="43"/>
 	</action_set>
 	<action_set description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." name="Chat">
-		<action description="Join Group Chat" longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice." name="join group chat" value="16"/>
-		<action description="Join Group Voice Chat" longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session." name="join voice chat" value="27"/>
-		<action description="Moderate Group Chat" longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions." name="moderate group chat" value="37"/>
+		<action description="加入群組聊天" longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice." name="join group chat" value="16"/>
+		<action description="加入群組語音聊天" longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session." name="join voice chat" value="27"/>
+		<action description="適度成人內容的群組聊天" longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions." name="moderate group chat" value="37"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index f28638d93d..adc815fb4b 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -52,7 +52,7 @@
 				</text>
 				<check_box label="覆製" name="CheckEveryoneCopy"/>
 				<text name="GroupLabel">
-					社團：
+					群組：
 				</text>
 				<check_box label="分享" name="CheckShareWithGroup" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 				<text name="NextOwnerLabel">
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 f308f2d4d0..5aad4568bd 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -7,19 +7,19 @@
 		Deed
 	</panel.string>
 	<panel.string name="text modify info 1">
-		You can modify this object
+		你可以修改這個物件
 	</panel.string>
 	<panel.string name="text modify info 2">
-		You can modify these objects
+		你可以修改這些物件
 	</panel.string>
 	<panel.string name="text modify info 3">
-		You can&apos;t modify this object
+		你不可以修改這個物件
 	</panel.string>
 	<panel.string name="text modify info 4">
-		You can&apos;t modify these objects
+		你不可以修改這些物件
 	</panel.string>
 	<panel.string name="text modify warning">
-		This object has linked parts
+		這個物件有聯結到其他部分
 	</panel.string>
 	<panel.string name="Cost Default">
 		價格： L$
@@ -28,13 +28,13 @@
 		總價： L$
 	</panel.string>
 	<panel.string name="Cost Per Unit">
-		Price Per: L$
+		單價： 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="(Inworld)"/>
@@ -52,9 +52,9 @@
 			擁有者：
 		</text>
 		<text name="Group_label">
-			社團：
+			群組：
 		</text>
-		<button name="button set group" tool_tip="Choose a group to share this object&apos;s permissions"/>
+		<button name="button set group" tool_tip="選擇一個群組以分享這個物件的權限"/>
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
 		<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 		<text name="label click action">
@@ -77,7 +77,7 @@
 			<check_box label="覆製" name="checkbox allow everyone copy"/>
 			<check_box label="移動" name="checkbox allow everyone move"/>
 			<text name="GroupLabel">
-				社團：
+				群組：
 			</text>
 			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 			<text name="NextOwnerLabel">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 986ab82523..0949e61fa1 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -38,25 +38,25 @@
 		回存中...
 	</string>
 	<string name="ProgressChangingResolution">
-		Changing Resolution...
+		變更解析度...
 	</string>
 	<string name="Fullbright">
-		Fullbright (Legacy)
+		全亮（舊版）
 	</string>
 	<string name="LoginInProgress">
-		Logging in. [APP_NAME] may appear frozen.  Please wait.
+		登入中。[APP_NAME] 可能出現凍結狀態。請耐心稍等。
 	</string>
 	<string name="LoginInProgressNoFrozen">
-		Logging in...
+		登入中...
 	</string>
 	<string name="LoginAuthenticating">
-		Authenticating
+		身份驗證中
 	</string>
 	<string name="LoginMaintenance">
-		Performing account maintenance...
+		進行帳戶維護...
 	</string>
 	<string name="LoginAttempt">
-		Previous login attempt failed. Logging in, attempt [NUMBER]
+		先前企圖嘗試登入失敗。現登入中，嘗試 [NUMBER]
 	</string>
 	<string name="LoginPrecaching">
 		世界載入中...
@@ -101,7 +101,7 @@
 		服裝下載中...
 	</string>
 	<string name="InvalidCertificate">
-		The server returned an invalid or corrupt certificate. Please contact the Grid administrator.
+		伺服器回傳一個無效果損壞的憑證。請連繫網格管理者。
 	</string>
 	<string name="CertInvalidHostname">
 		An invalid hostname was used to access the server, please check your SLURL or Grid hostname.
@@ -146,7 +146,7 @@
 		你已經被所在的地區中斷聯結。
 	</string>
 	<string name="SentToInvalidRegion">
-		You were sent to an invalid region.
+		你被傳送到一個無效的地區。
 	</string>
 	<string name="TestingDisconnect">
 		測試瀏覽器斷線
@@ -155,28 +155,28 @@
 		人
 	</string>
 	<string name="TooltipNoName">
-		(no name)
+		（無名稱）
 	</string>
 	<string name="TooltipOwner">
 		擁有者：
 	</string>
 	<string name="TooltipPublic">
-		Public
+		公開
 	</string>
 	<string name="TooltipIsGroup">
-		（社團）
+		（群組）
 	</string>
 	<string name="TooltipForSaleL$">
 		出售： L$[AMOUNT]
 	</string>
 	<string name="TooltipFlagGroupBuild">
-		Group Build
+		群組建造
 	</string>
 	<string name="TooltipFlagNoBuild">
 		禁止建造
 	</string>
 	<string name="TooltipFlagNoEdit">
-		社團建造
+		群組建造
 	</string>
 	<string name="TooltipFlagNotSafe">
 		非安全
@@ -185,7 +185,7 @@
 		禁止飛行
 	</string>
 	<string name="TooltipFlagGroupScripts">
-		社團腳本
+		群組腳本
 	</string>
 	<string name="TooltipFlagNoScripts">
 		禁止腳本
@@ -210,10 +210,10 @@
 		瞭解更多有關這個居民
 	</string>
 	<string name="TooltipAgentMute">
-		Click to mute this Resident
+		點擊以封鎖這位居民
 	</string>
 	<string name="TooltipAgentUnmute">
-		Click to unmute this Resident
+		點擊以解除封鎖這位居民
 	</string>
 	<string name="TooltipAgentIM">
 		點擊開始 IM 這位居民
@@ -222,47 +222,47 @@
 		點擊以支付這位居民
 	</string>
 	<string name="TooltipAgentOfferTeleport">
-		Click to offer a teleport request to this Resident
+		點擊以送出瞬間傳送邀請給這位居民
 	</string>
 	<string name="TooltipAgentRequestFriend">
-		Click to send a friend request to this Resident
+		點擊以送出交友邀請給這位居民
 	</string>
 	<string name="TooltipGroupUrl">
-		Click to view this group&apos;s description
+		點擊以察看這個群組的描述
 	</string>
 	<string name="TooltipEventUrl">
-		Click to view this event&apos;s description
+		點擊以察看這個活動的描述
 	</string>
 	<string name="TooltipClassifiedUrl">
 		Click to view this classified
 	</string>
 	<string name="TooltipParcelUrl">
-		Click to view this parcel&apos;s description
+		點擊以察看這個地段的描述
 	</string>
 	<string name="TooltipTeleportUrl">
-		Click to teleport to this location
+		點擊以傳送到這個位置
 	</string>
 	<string name="TooltipObjectIMUrl">
-		Click to view this object&apos;s description
+		點擊以察看這個物件的描述
 	</string>
 	<string name="TooltipMapUrl">
-		Click to view this location on a map
+		點擊以察看此處在地圖上的位置
 	</string>
 	<string name="TooltipSLAPP">
-		Click to run the secondlife:// command
+		點擊以執行 secondlife:// 指令
 	</string>
-	<string name="CurrentURL" value="CurrentURL: [CurrentURL]"/>
+	<string name="CurrentURL" value="目前網址：[CurrentURL]"/>
 	<string name="SLurlLabelTeleport">
 		瞬間傳送到
 	</string>
 	<string name="SLurlLabelShowOnMap">
-		Show Map for
+		顯示地圖為了
 	</string>
 	<string name="SLappAgentMute">
-		Mute
+		封鎖
 	</string>
 	<string name="SLappAgentUnmute">
-		Unmute
+		解除封鎖
 	</string>
 	<string name="SLappAgentIM">
 		IM
@@ -271,7 +271,7 @@
 		支付
 	</string>
 	<string name="SLappAgentOfferTeleport">
-		Offer Teleport to
+		發給瞬間傳送請求到
 	</string>
 	<string name="SLappAgentRequestFriend">
 		交友要求
@@ -295,7 +295,7 @@
 		脫下
 	</string>
 	<string name="BUTTON_DOCK">
-		Dock
+		停泊固定
 	</string>
 	<string name="BUTTON_HELP">
 		顯示幫助
@@ -307,22 +307,22 @@
 		未發現。
 	</string>
 	<string name="RetrievingData">
-		Retrieving...
+		檢索...
 	</string>
 	<string name="ReleaseNotes">
-		Release Notes
+		釋出版本說明
 	</string>
 	<string name="LoadingData">
 		載入中...
 	</string>
 	<string name="AvatarNameNobody">
-		(nobody)
+		（沒有人）
 	</string>
 	<string name="AvatarNameWaiting">
-		(waiting)
+		（等待中）
 	</string>
 	<string name="AvatarNameMultiple">
-		(multiple)
+		（多個）
 	</string>
 	<string name="GroupNameNone">
 		（無）
@@ -334,25 +334,25 @@
 		無錯誤
 	</string>
 	<string name="AssetErrorRequestFailed">
-		Asset request: failed
+		資產請求：失敗
 	</string>
 	<string name="AssetErrorNonexistentFile">
-		Asset request: non-existent file
+		資產要求：非已存在檔案
 	</string>
 	<string name="AssetErrorNotInDatabase">
-		Asset request: asset not found in database
+		資產要求：資產並未發現於資料庫中
 	</string>
 	<string name="AssetErrorEOF">
-		End of file
+		檔案結尾
 	</string>
 	<string name="AssetErrorCannotOpenFile">
-		Cannot open file
+		無法開啟檔案
 	</string>
 	<string name="AssetErrorFileNotFound">
-		File not found
+		檔案未發現
 	</string>
 	<string name="AssetErrorTCPTimeout">
-		File transfer timeout
+		檔案傳輸逾時
 	</string>
 	<string name="AssetErrorCircuitGone">
 		Circuit gone
@@ -370,13 +370,13 @@
 		聲音
 	</string>
 	<string name="calling card">
-		calling card
+		名片
 	</string>
 	<string name="landmark">
 		地標
 	</string>
 	<string name="legacy script">
-		legacy script
+		舊版腳本
 	</string>
 	<string name="clothing">
 		服裝
@@ -427,16 +427,16 @@
 		姿勢
 	</string>
 	<string name="simstate">
-		simstate
+		模擬器狀態
 	</string>
 	<string name="favorite">
-		favorite
+		我的最愛
 	</string>
 	<string name="symbolic link">
-		link
+		聯結
 	</string>
 	<string name="symbolic folder link">
-		folder link
+		資料夾聯結
 	</string>
 	<string name="AvatarEditingAppearance">
 		（外觀編輯中）
@@ -448,13 +448,13 @@
 		忙碌
 	</string>
 	<string name="AvatarMuted">
-		Blocked
+		封鎖的
 	</string>
 	<string name="anim_express_afraid">
-		Afraid
+		害怕
 	</string>
 	<string name="anim_express_anger">
-		Angry
+		生氣
 	</string>
 	<string name="anim_away">
 		Away
@@ -472,19 +472,19 @@
 		Blow Kiss
 	</string>
 	<string name="anim_express_bored">
-		Bored
+		無聊
 	</string>
 	<string name="anim_bow">
 		Bow
 	</string>
 	<string name="anim_clap">
-		Clap
+		拍手
 	</string>
 	<string name="anim_courtbow">
 		Court Bow
 	</string>
 	<string name="anim_express_cry">
-		Cry
+		哭泣
 	</string>
 	<string name="anim_dance1">
 		Dance 1
@@ -541,19 +541,19 @@
 		Kiss My Butt
 	</string>
 	<string name="anim_express_kiss">
-		Kiss
+		親吻
 	</string>
 	<string name="anim_laugh_short">
-		Laugh
+		笑
 	</string>
 	<string name="anim_musclebeach">
 		Muscle Beach
 	</string>
 	<string name="anim_no_unhappy">
-		No (Unhappy)
+		不（不快樂）
 	</string>
 	<string name="anim_no_head">
-		No
+		不
 	</string>
 	<string name="anim_nyanya">
 		Nya-nya-nya
@@ -598,10 +598,10 @@
 		Roundhouse Kick
 	</string>
 	<string name="anim_express_sad">
-		Sad
+		傷心
 	</string>
 	<string name="anim_salute">
-		Salute
+		敬禮
 	</string>
 	<string name="anim_shout">
 		Shout
@@ -610,7 +610,7 @@
 		Shrug
 	</string>
 	<string name="anim_express_smile">
-		Smile
+		微笑
 	</string>
 	<string name="anim_smoke_idle">
 		Smoke Idle
@@ -622,7 +622,7 @@
 		Smoke Throw Down
 	</string>
 	<string name="anim_express_surprise">
-		Surprise
+		驚喜
 	</string>
 	<string name="anim_sword_strike_r">
 		Sword Strike
@@ -637,22 +637,22 @@
 		Wave
 	</string>
 	<string name="anim_whisper">
-		Whisper
+		耳語
 	</string>
 	<string name="anim_whistle">
-		Whistle
+		吹口哨
 	</string>
 	<string name="anim_express_wink">
-		Wink
+		眨眼
 	</string>
 	<string name="anim_wink_hollywood">
-		Wink (Hollywood)
+		眨眼（好萊塢）
 	</string>
 	<string name="anim_express_worry">
-		Worry
+		擔心
 	</string>
 	<string name="anim_yes_happy">
-		Yes (Happy)
+		是（快樂）
 	</string>
 	<string name="anim_yes_head">
 		是
@@ -679,25 +679,25 @@
 		Can&apos;t find ROOT or JOINT.
 	</string>
 	<string name="whisper">
-		whispers:
+		低語：
 	</string>
 	<string name="shout">
-		shouts:
+		吶喊：
 	</string>
 	<string name="ringing">
-		Connecting to in-world Voice Chat...
+		聯接到虛擬世界的語音功能中...
 	</string>
 	<string name="connected">
-		Connected
+		已聯接
 	</string>
 	<string name="unavailable">
-		Voice not available at your current location
+		語音聊天功能於你目前所在的位置無法使用
 	</string>
 	<string name="hang_up">
-		Disconnected from in-world Voice Chat
+		虛擬世界中的語音聊天中斷
 	</string>
 	<string name="reconnect_nearby">
-		You will now be reconnected to Nearby Voice Chat
+		現在你將重新聯接到附近的語音聊天
 	</string>
 	<string name="ScriptQuestionCautionChatGranted">
 		&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].
@@ -706,7 +706,7 @@
 		&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
 	</string>
 	<string name="ScriptTakeMoney">
-		Take Linden dollars (L$) from you
+		由你身上拿走林登幣（L$）
 	</string>
 	<string name="ActOnControlInputs">
 		Act on your control inputs
@@ -730,25 +730,25 @@
 		Add and remove joints with other objects
 	</string>
 	<string name="ChangePermissions">
-		Change its permissions
+		變更它的權限
 	</string>
 	<string name="TrackYourCamera">
-		Track your camera
+		追蹤你的攝影機
 	</string>
 	<string name="ControlYourCamera">
-		Control your camera
+		控制你的攝影機
 	</string>
 	<string name="NotConnected">
-		Not Connected
+		未聯接
 	</string>
 	<string name="SIM_ACCESS_PG">
-		一般
+		一般普級
 	</string>
 	<string name="SIM_ACCESS_MATURE">
-		Moderate
+		適度成人
 	</string>
 	<string name="SIM_ACCESS_ADULT">
-		成人
+		完全成人
 	</string>
 	<string name="SIM_ACCESS_DOWN">
 		離線
@@ -796,16 +796,16 @@
 		Bitmap 圖像
 	</string>
 	<string name="avi_movie_file">
-		AVI 影片檔案
+		AVI 視頻檔案
 	</string>
 	<string name="xaf_animation_file">
 		XAF Anim File
 	</string>
 	<string name="xml_file">
-		XML File
+		XML 檔案
 	</string>
 	<string name="raw_file">
-		RAW File
+		RAW 檔案
 	</string>
 	<string name="compressed_image_files">
 		壓縮的圖像
@@ -868,13 +868,13 @@
 		裙子
 	</string>
 	<string name="alpha">
-		Alpha
+		半透明
 	</string>
 	<string name="tattoo">
 		刺青
 	</string>
 	<string name="physics">
-		Physics
+		身體物理
 	</string>
 	<string name="invalid">
 		無效
@@ -910,13 +910,13 @@
 		裙子未穿
 	</string>
 	<string name="alpha_not_worn">
-		Alpha not worn
+		半透明未穿
 	</string>
 	<string name="tattoo_not_worn">
 		刺青未穿
 	</string>
 	<string name="physics_not_worn">
-		Physics not worn
+		身體物理未穿
 	</string>
 	<string name="invalid_not_worn">
 		無效
@@ -961,13 +961,13 @@
 		創造新裙子
 	</string>
 	<string name="create_new_alpha">
-		Create new alpha
+		創造新半透明
 	</string>
 	<string name="create_new_tattoo">
 		創造新刺青
 	</string>
 	<string name="create_new_physics">
-		Create new physics
+		創造新身體物理
 	</string>
 	<string name="create_new_invalid">
 		無效
@@ -982,10 +982,10 @@
 		確定
 	</string>
 	<string name="GroupNotifyGroupNotice">
-		社團通知
+		群組通知
 	</string>
 	<string name="GroupNotifyGroupNotices">
-		社團通知
+		群組通知
 	</string>
 	<string name="GroupNotifySentBy">
 		送出由
@@ -1012,34 +1012,34 @@
 		你有約 %d 通知
 	</string>
 	<string name="BodyPartsRightArm">
-		Right Arm
+		右臂
 	</string>
 	<string name="BodyPartsHead">
 		頭部
 	</string>
 	<string name="BodyPartsLeftArm">
-		Left Arm
+		左臂
 	</string>
 	<string name="BodyPartsLeftLeg">
-		Left Leg
+		左腿
 	</string>
 	<string name="BodyPartsTorso">
 		軀幹
 	</string>
 	<string name="BodyPartsRightLeg">
-		Right Leg
+		右腿
 	</string>
 	<string name="GraphicsQualityLow">
-		Low
+		低
 	</string>
 	<string name="GraphicsQualityMid">
-		Mid
+		中
 	</string>
 	<string name="GraphicsQualityHigh">
-		High
+		高
 	</string>
 	<string name="LeaveMouselook">
-		Press ESC to return to World View
+		按下 ESC 鍵回復到世界的視角
 	</string>
 	<string name="InventoryNoMatchingItems">
 		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].
@@ -1053,19 +1053,19 @@
 	<string name="InventoryNoTexture">
 		You do not have a copy of this texture in your inventory
 	</string>
-	<string name="no_transfer" value="(no transfer)"/>
-	<string name="no_modify" value="(no modify)"/>
-	<string name="no_copy" value="(no copy)"/>
-	<string name="worn" value="(worn)"/>
-	<string name="link" value="(link)"/>
-	<string name="broken_link" value="(broken_link)"/>
+	<string name="no_transfer" value="（禁止轉讓）"/>
+	<string name="no_modify" value="（禁止修改）"/>
+	<string name="no_copy" value="（禁止複製）"/>
+	<string name="worn" value="（已穿）"/>
+	<string name="link" value="（聯結）"/>
+	<string name="broken_link" value="（損壞的聯結）"/>
 	<string name="LoadingContents">
 		內容載入中...
 	</string>
 	<string name="NoContents">
-		No contents
+		無內容
 	</string>
-	<string name="WornOnAttachmentPoint" value="(worn on [ATTACHMENT_POINT])"/>
+	<string name="WornOnAttachmentPoint" value="（已穿 [ATTACHMENT_POINT]）"/>
 	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
 	<string name="PermYes">
 		是
@@ -1084,7 +1084,7 @@
 	<string name="ViewAllGestures" value="察看全部 &gt;&gt;"/>
 	<string name="GetMoreGestures" value="取得更多 &gt;&gt;"/>
 	<string name="Animations" value="動作,"/>
-	<string name="Calling Cards" value="Calling Cards,"/>
+	<string name="Calling Cards" value="名片,"/>
 	<string name="Clothing" value="服裝,"/>
 	<string name="Gestures" value="姿勢,"/>
 	<string name="Landmarks" value="地標,"/>
@@ -1093,17 +1093,17 @@
 	<string name="Scripts" value="腳本,"/>
 	<string name="Sounds" value="聲音,"/>
 	<string name="Textures" value="材質,"/>
-	<string name="Snapshots" value="Snapshots,"/>
+	<string name="Snapshots" value="快照,"/>
 	<string name="No Filters" value="No"/>
 	<string name="Since Logoff" value="- 自上次登出"/>
 	<string name="InvFolder My Inventory">
 		我的收納區
 	</string>
 	<string name="InvFolder My Favorites">
-		My Favorites
+		我的最愛
 	</string>
 	<string name="InvFolder Library">
-		Library
+		資源庫
 	</string>
 	<string name="InvFolder Textures">
 		材質
@@ -1112,7 +1112,7 @@
 		聲音
 	</string>
 	<string name="InvFolder Calling Cards">
-		Calling Cards
+		名片
 	</string>
 	<string name="InvFolder Landmarks">
 		地標
@@ -1151,7 +1151,7 @@
 		Lost And Found
 	</string>
 	<string name="InvFolder Uncompressed Sounds">
-		Uncompressed Sounds
+		無壓縮聲音
 	</string>
 	<string name="InvFolder Animations">
 		動作
@@ -1160,10 +1160,10 @@
 		姿勢
 	</string>
 	<string name="InvFolder Favorite">
-		Favorites
+		我的最愛
 	</string>
 	<string name="InvFolder favorite">
-		Favorites
+		我的最愛
 	</string>
 	<string name="InvFolder Current Outfit">
 		目前裝扮
@@ -1220,34 +1220,34 @@
 		Ctrl
 	</string>
 	<string name="Chest">
-		Chest
+		胸部
 	</string>
 	<string name="Skull">
-		Skull
+		頭顱
 	</string>
 	<string name="Left Shoulder">
-		Left Shoulder
+		左肩
 	</string>
 	<string name="Right Shoulder">
-		Right Shoulder
+		右肩
 	</string>
 	<string name="Left Hand">
-		Left Hand
+		左手
 	</string>
 	<string name="Right Hand">
-		Right Hand
+		右手
 	</string>
 	<string name="Left Foot">
-		Left Foot
+		左腳
 	</string>
 	<string name="Right Foot">
-		Right Foot
+		右腳
 	</string>
 	<string name="Spine">
-		Spine
+		脊椎
 	</string>
 	<string name="Pelvis">
-		Pelvis
+		骨盆
 	</string>
 	<string name="Mouth">
 		嘴
@@ -1271,46 +1271,46 @@
 		鼻子
 	</string>
 	<string name="R Upper Arm">
-		R Upper Arm
+		右上臂
 	</string>
 	<string name="R Forearm">
-		R Forearm
+		右前臂
 	</string>
 	<string name="L Upper Arm">
-		L Upper Arm
+		左上臂
 	</string>
 	<string name="L Forearm">
-		L Forearm
+		左前臂
 	</string>
 	<string name="Right Hip">
-		Right Hip
+		右臀
 	</string>
 	<string name="R Upper Leg">
-		R Upper Leg
+		右大腿
 	</string>
 	<string name="R Lower Leg">
-		R Lower Leg
+		右小腿
 	</string>
 	<string name="Left Hip">
-		Left Hip
+		左臀
 	</string>
 	<string name="L Upper Leg">
-		L Upper Leg
+		左大腿
 	</string>
 	<string name="L Lower Leg">
-		L Lower Leg
+		左小腿
 	</string>
 	<string name="Stomach">
-		Stomach
+		腹肌
 	</string>
 	<string name="Left Pec">
-		Left Pec
+		左胸肌
 	</string>
 	<string name="Right Pec">
-		Right Pec
+		右胸肌
 	</string>
 	<string name="Invalid Attachment">
-		Invalid Attachment Point
+		無效的附件聯接點
 	</string>
 	<string name="YearsMonthsOld">
 		[AGEYEARS] [AGEMONTHS] old
@@ -1328,7 +1328,7 @@
 		[AGEDAYS] old
 	</string>
 	<string name="TodayOld">
-		高日剛加入
+		今日剛加入
 	</string>
 	<string name="AgeYearsA">
 		[COUNT] 年
@@ -1397,40 +1397,40 @@
 		No Payment Info On File
 	</string>
 	<string name="AgeVerified">
-		Age-verified
+		已年齡驗證
 	</string>
 	<string name="NotAgeVerified">
-		Not Age-verified
+		未年齡驗證
 	</string>
 	<string name="Center 2">
-		Center 2
+		中央 2
 	</string>
 	<string name="Top Right">
-		Top Right
+		右上
 	</string>
 	<string name="Top">
-		Top
+		上方
 	</string>
 	<string name="Top Left">
-		Top Left
+		左上
 	</string>
 	<string name="Center">
-		Center
+		中央
 	</string>
 	<string name="Bottom Left">
-		Bottom Left
+		左下
 	</string>
 	<string name="Bottom">
-		Bottom
+		下方
 	</string>
 	<string name="Bottom Right">
-		Bottom Right
+		右下
 	</string>
 	<string name="CompileQueueDownloadedCompiling">
-		Downloaded, now compiling
+		已下載，現在進行編譯中
 	</string>
 	<string name="CompileQueueScriptNotFound">
-		Script not found on server.
+		伺服器上未發現腳本。
 	</string>
 	<string name="CompileQueueProblemDownloading">
 		Problem downloading
@@ -1445,16 +1445,16 @@
 		Unknown failure to download
 	</string>
 	<string name="CompileQueueTitle">
-		Recompilation Progress
+		重新編譯進度
 	</string>
 	<string name="CompileQueueStart">
-		recompile
+		重新編譯
 	</string>
 	<string name="ResetQueueTitle">
-		Reset Progress
+		重設進度
 	</string>
 	<string name="ResetQueueStart">
-		reset
+		重設
 	</string>
 	<string name="RunQueueTitle">
 		設定執行中程序
@@ -1481,19 +1481,19 @@
 		腳本（物件超出範圍）
 	</string>
 	<string name="GodToolsObjectOwnedBy">
-		Object [OBJECT] owned by [OWNER]
+		物件 [OBJECT] 為 [OWNER] 所擁有
 	</string>
 	<string name="GroupsNone">
 		無
 	</string>
-	<string name="Group" value="（社團）"/>
+	<string name="Group" value="（群組）"/>
 	<string name="Unknown">
 		（未知）
 	</string>
 	<string name="SummaryForTheWeek" value="Summary for this week, beginning on"/>
 	<string name="NextStipendDay" value="The next stipend day is"/>
 	<string name="GroupIndividualShare" value="Group       Individual Share"/>
-	<string name="GroupColumn" value="社團"/>
+	<string name="GroupColumn" value="群組"/>
 	<string name="Balance">
 		Balance
 	</string>
@@ -1534,7 +1534,7 @@
 		Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])
 	</string>
 	<string name="RegionInfoAllowedGroups">
-		Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])
+		允許的群群組：（[ALLOWEDGROUPS]，最大 [MAXACCESS]）
 	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		地段腳本記憶體
@@ -1549,7 +1549,7 @@
 		Memory used: [COUNT] kb
 	</string>
 	<string name="ScriptLimitsParcelScriptURLs">
-		Parcel Script URLs
+		地段腳本 URLs
 	</string>
 	<string name="ScriptLimitsURLsUsed">
 		URLs used: [COUNT] out of [MAX]; [AVAILABLE] available
@@ -1561,7 +1561,7 @@
 		Error requesting information
 	</string>
 	<string name="ScriptLimitsRequestNoParcelSelected">
-		No Parcel Selected
+		無地段被選擇
 	</string>
 	<string name="ScriptLimitsRequestWrongRegion">
 		Error: script information is only available in your current region
@@ -1576,46 +1576,46 @@
 		Sitting On
 	</string>
 	<string name="ATTACH_CHEST">
-		Chest
+		胸部
 	</string>
 	<string name="ATTACH_HEAD">
 		頭部
 	</string>
 	<string name="ATTACH_LSHOULDER">
-		Left Shoulder
+		左肩
 	</string>
 	<string name="ATTACH_RSHOULDER">
-		Right Shoulder
+		右肩
 	</string>
 	<string name="ATTACH_LHAND">
-		Left Hand
+		左手
 	</string>
 	<string name="ATTACH_RHAND">
-		Right Hand
+		右手
 	</string>
 	<string name="ATTACH_LFOOT">
-		Left Foot
+		左腳
 	</string>
 	<string name="ATTACH_RFOOT">
-		Right Foot
+		右腳
 	</string>
 	<string name="ATTACH_BACK">
-		Back
+		背部
 	</string>
 	<string name="ATTACH_PELVIS">
-		Pelvis
+		骨盆
 	</string>
 	<string name="ATTACH_MOUTH">
-		Mouth
+		嘴巴
 	</string>
 	<string name="ATTACH_CHIN">
 		下巴
 	</string>
 	<string name="ATTACH_LEAR">
-		Left Ear
+		左耳
 	</string>
 	<string name="ATTACH_REAR">
-		Right Ear
+		右耳
 	</string>
 	<string name="ATTACH_LEYE">
 		左眼
@@ -1627,43 +1627,43 @@
 		鼻子
 	</string>
 	<string name="ATTACH_RUARM">
-		Right Upper Arm
+		右上臂
 	</string>
 	<string name="ATTACH_RLARM">
-		Right Lower Arm
+		右前臂
 	</string>
 	<string name="ATTACH_LUARM">
-		Left Upper Arm
+		左上臂
 	</string>
 	<string name="ATTACH_LLARM">
-		Left Lower Arm
+		左前臂
 	</string>
 	<string name="ATTACH_RHIP">
-		Right Hip
+		右臀
 	</string>
 	<string name="ATTACH_RULEG">
-		Right Upper Leg
+		右大腿
 	</string>
 	<string name="ATTACH_RLLEG">
-		Right Lower Leg
+		右小腿
 	</string>
 	<string name="ATTACH_LHIP">
-		Left Hip
+		左臀
 	</string>
 	<string name="ATTACH_LULEG">
-		Left Upper Leg
+		左大腿
 	</string>
 	<string name="ATTACH_LLLEG">
-		Left Lower Leg
+		左小腿
 	</string>
 	<string name="ATTACH_BELLY">
-		Belly
+		腹部
 	</string>
 	<string name="ATTACH_RPEC">
-		Right Pec
+		右胸肌
 	</string>
 	<string name="ATTACH_LPEC">
-		Left Pec
+		左胸肌
 	</string>
 	<string name="ATTACH_HUD_CENTER_2">
 		HUD Center 2
@@ -1702,13 +1702,13 @@
 		[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
 	<string name="PanelContentsTooltip">
-		Content of object
+		物件的內容
 	</string>
 	<string name="PanelContentsNewScript">
-		New Script
+		新腳本
 	</string>
 	<string name="BusyModeResponseDefault">
-		The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.
+		你傳送訊息的居民目前處於忙碌模式中，這意味著他要求不被打擾。你所傳的訊息仍將會留存並顯示於 IM 面板上供他稍後時查閱。
 	</string>
 	<string name="MuteByName">
 		（由名稱）
@@ -1720,22 +1720,22 @@
 		（物件）
 	</string>
 	<string name="MuteGroup">
-		（社團）
+		（群組）
 	</string>
 	<string name="MuteExternal">
-		(External)
+		（外部）
 	</string>
 	<string name="RegionNoCovenant">
-		There is no Covenant provided for this Estate.
+		此領地未提供任何契約要求。
 	</string>
 	<string name="RegionNoCovenantOtherOwner">
 		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
 	</string>
-	<string name="covenant_last_modified" value="Last Modified:"/>
+	<string name="covenant_last_modified" value="最後修改於："/>
 	<string name="none_text" value="（無）"/>
 	<string name="never_text" value="（絕不）"/>
 	<string name="GroupOwned">
-		社團所擁有
+		群組所擁有
 	</string>
 	<string name="Public">
 		公開
@@ -1744,7 +1744,7 @@
 		Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile
 	</string>
 	<string name="ClassifiedUpdateAfterPublish">
-		(will update after publish)
+		（將於發布後自動更新）
 	</string>
 	<string name="NoPicksClassifiedsText">
 		You haven&apos;t created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.
@@ -1765,10 +1765,10 @@
 		An object named
 	</string>
 	<string name="InvOfferOwnedByGroup">
-		owned by the group
+		群組所擁有
 	</string>
 	<string name="InvOfferOwnedByUnknownGroup">
-		owned by an unknown group
+		由一個未知的群組所擁有
 	</string>
 	<string name="InvOfferOwnedBy">
 		owned by
@@ -1955,7 +1955,7 @@
 		Linden Location
 	</string>
 	<string name="Adult">
-		成人
+		完全成人
 	</string>
 	<string name="Arts&amp;Culture">
 		Arts &amp; Culture
@@ -2060,7 +2060,7 @@ If this message persists, restart your computer.
 Would you like to send a crash report?
 	</string>
 	<string name="MBAlert">
-		Notification
+		通知
 	</string>
 	<string name="MBNoDirectX">
 		[APP_NAME] is unable to detect DirectX 9.0b or greater.
@@ -2069,7 +2069,7 @@ Would you like to send a crash report?
 Do you wish to continue?
 	</string>
 	<string name="MBWarning">
-		Warning
+		警告
 	</string>
 	<string name="MBNoAutoUpdate">
 		Automatic updating is not yet implemented for Linux.
@@ -2079,7 +2079,7 @@ Please download the latest version from www.secondlife.com.
 		RegisterClass failed
 	</string>
 	<string name="MBError">
-		Error
+		錯誤
 	</string>
 	<string name="MBFullScreenErr">
 		Unable to run fullscreen at [WIDTH] x [HEIGHT].
@@ -3577,13 +3577,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Health
 	</string>
 	<string name="LocationCtrlAdultIconTooltip">
-		成人地區
+		完全成人地區
 	</string>
 	<string name="LocationCtrlModerateIconTooltip">
-		Moderate Region
+		適度成人地區
 	</string>
 	<string name="LocationCtrlGeneralIconTooltip">
-		一般地區
+		一般普級地區
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] 更新
@@ -3640,10 +3640,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Your text chat has been disabled by a Group Moderator.
 	</string>
 	<string name="IM_default_text_label">
-		Click here to instant message.
+		點擊此處以傳送即時訊息。
 	</string>
 	<string name="IM_to_label">
-		To
+		至
 	</string>
 	<string name="IM_moderator_label">
 		(Moderator)
@@ -3742,10 +3742,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Error while moderating.
 	</string>
 	<string name="removed">
-		You have been removed from the group.
+		你已經由群組中被移除。
 	</string>
 	<string name="removed_from_group">
-		You have been removed from the group.
+		你已經由群組中被移除。
 	</string>
 	<string name="close_on_no_ability">
 		You no longer have the ability to be in the chat session.
@@ -3793,10 +3793,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		for deeding land
 	</string>
 	<string name="to create a group">
-		以創造社團
+		以創造群組
 	</string>
 	<string name="to join a group">
-		以加入社團
+		以加入群組
 	</string>
 	<string name="to upload">
 		以上傳
@@ -3826,7 +3826,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Officers
 	</string>
 	<string name="group_role_owners">
-		Owners
+		擁有者
 	</string>
 	<string name="group_member_status_online">
 		上線
@@ -3876,16 +3876,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		新裙子
 	</string>
 	<string name="New Alpha">
-		New Alpha
+		新半透明
 	</string>
 	<string name="New Tattoo">
 		新刺青
 	</string>
 	<string name="New Physics">
-		New Physics
+		新身體物理
 	</string>
 	<string name="Invalid Wearable">
-		Invalid Wearable
+		無效的可穿裝扮
 	</string>
 	<string name="New Gesture">
 		新姿勢
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index b18eb4a390..ffb4c903bb 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -3,25 +3,25 @@
 	<message_set name="errors">
 		<message name="invalid_tport">
 			Problem encountered processing your teleport request. You may need to log back in before you can teleport.
-If you continue to get this message, please check the [SUPPORT_SITE].
+如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 		</message>
 		<message name="invalid_region_handoff">
 			Problem encountered processing your region crossing. You may need to log back in before you can cross regions.
-If you continue to get this message, please check the [SUPPORT_SITE].
+如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 		</message>
 		<message name="blocked_tport">
-			Sorry, teleport is currently blocked. Try again in a moment.
-If you still cannot teleport, please log out and log back in to resolve the problem.
+			抱歉，目前瞬間傳送已被阻擋。請稍後再試。
+如果你仍無法進行瞬間傳送，請登出後重新入來解決此一問題。
 		</message>
 		<message name="nolandmark_tport">
-			Sorry, but system was unable to locate landmark destination.
+			抱歉，不過系統無法找到地標所在目的地。
 		</message>
 		<message name="timeout_tport">
-			Sorry, but system was unable to complete the teleport connection.
-Try again in a moment.
+			抱歉，不過系統無法完成瞬間傳送的聯接。
+請稍後再試。
 		</message>
 		<message name="noaccess_tport">
-			Sorry, you do not have access to that teleport destination.
+			抱歉，你並沒有權限進入要瞬間傳送的目的地。
 		</message>
 		<message name="missing_attach_tport">
 			Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
@@ -47,7 +47,7 @@ Try again in a moment.
 			Sending to destination.
 		</message>
 		<message name="redirecting">
-			Redirecting to different location.
+			重新導向至不同位置。
 		</message>
 		<message name="relaying">
 			Relaying to destination.
diff --git a/indra/newview/skins/minimal/xui/da/notifications.xml b/indra/newview/skins/minimal/xui/da/notifications.xml
index e77eeee8df..3d003ea3b3 100644
--- a/indra/newview/skins/minimal/xui/da/notifications.xml
+++ b/indra/newview/skins/minimal/xui/da/notifications.xml
@@ -1327,7 +1327,7 @@ Prøv igen om lidt.
 		No valid parcel could be found.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Et objekt ved navn &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ejet af [NAME_SLURL] tilbyder dig [ITEM_SLURL].  For at bruge denne genstand skal du skifte til avanceret tilstand, hvor du kan finde genstanden i din beholdning. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
+		Et objekt ved navn &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ejet af [NAME_SLURL] tilbyder dig &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;.  For at bruge denne genstand skal du skifte til avanceret tilstand, hvor du kan finde genstanden i din beholdning. Ønsker du at logge ud for at skifte tilstand? Valg af tilstand findes på login skærmbilledet.
 		<form name="form">
 			<button name="Keep" text="Behold genstand"/>
 			<button name="Discard" text="Afvis genstand"/>
diff --git a/indra/newview/skins/minimal/xui/da/panel_people.xml b/indra/newview/skins/minimal/xui/da/panel_people.xml
index 49cd2c71f2..8be4d695bd 100644
--- a/indra/newview/skins/minimal/xui/da/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/da/panel_people.xml
@@ -66,16 +66,16 @@ Leder du efter personer at være sammen med? Prøv destinationsknappen nedenfor.
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Vis billeder, grupper og anden beboer information"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Åben session med privat besked (IM)"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Opkald" name="call_btn" tool_tip="Kald til denne beboer"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Del" name="share_btn" tool_tip="Del en genstand fra beholdning"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportér" name="teleport_btn" tool_tip="Tilbyd teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/de/notifications.xml b/indra/newview/skins/minimal/xui/de/notifications.xml
index 1eee1d1c9b..9abf8cdbb9 100644
--- a/indra/newview/skins/minimal/xui/de/notifications.xml
+++ b/indra/newview/skins/minimal/xui/de/notifications.xml
@@ -9,7 +9,7 @@
 		</form>
 	</notification>
 	<notification name="ObjectGiveItem">
-		Ein Objekt namens &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, das [NAME_SLURL] gehört, bietet Ihnen [ITEM_SLURL] an. Zur Verwendung dieses Artikels müssen Sie in den erweiterten Modus umschalten, wo Sie den Artikel in Ihrem Inventar finden werden. Um in den erweiterten Modus umzuschalten, beenden Sie die Anwendung, starten Sie sie neu und ändern Sie die Moduseinstellung auf dem Anmeldebildschirm.
+		Ein Objekt namens &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, das [NAME_SLURL] gehört, bietet Ihnen &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt; an. Zur Verwendung dieses Artikels müssen Sie in den erweiterten Modus umschalten, wo Sie den Artikel in Ihrem Inventar finden werden. Um in den erweiterten Modus umzuschalten, beenden Sie die Anwendung, starten Sie sie neu und ändern Sie die Moduseinstellung auf dem Anmeldebildschirm.
 		<form name="form">
 			<button name="Keep" text="Artikel behalten"/>
 			<button name="Discard" text="Artikel ablehnen"/>
diff --git a/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml
index 0ef2234fec..56c2310f2f 100644
--- a/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Unbekannt"/>
 	<layout_stack name="button_stack">
 		<layout_panel name="view_profile_btn_panel">
 			<button label="Profil" name="view_profile_btn"/>
@@ -11,20 +10,20 @@
 		<layout_panel name="teleport_btn_panel">
 			<button label="Teleportieren" name="teleport_btn" tool_tip="Dieser Person einen Teleport anbieten"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Teilen" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Bezahlen" name="pay_btn"/>
-		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="Anrufen" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Anruf beenden" name="end_call_btn"/>
 		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice-Steuerung" name="voice_ctrls_btn"/>
+		<layout_panel name="block_btn_panel">
+			<button label="Ignorieren" name="block_btn"/>
+		</layout_panel>
+		<layout_panel name="unblock_btn_panel">
+			<button label="Freischalten" name="unblock_btn"/>
+		</layout_panel>
+		<layout_panel name="volume_ctrl_panel">
+			<slider name="volume_slider" tool_tip="Anrufvolumen" value="0,5"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/de/panel_people.xml b/indra/newview/skins/minimal/xui/de/panel_people.xml
index 4f8f70ad17..1b6565eb73 100644
--- a/indra/newview/skins/minimal/xui/de/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/de/panel_people.xml
@@ -48,13 +48,13 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
index cc551f7d58..477f210352 100644
--- a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
@@ -3,14 +3,13 @@
  legacy_header_height="18"
  can_resize="true"
  can_minimize="false" 
- height="360"
+ height="460"
  layout="topleft"
  min_height="360"
- left="645"
+ left="10000"
  top="10" 
- min_width="345"
+ min_width="335"
  name="floater_help_browser"
- save_rect="true"
  single_instance="true"
  title="HOW TO"
  width="335">
@@ -22,7 +21,7 @@
      name="done_text">
     </floater.string>
     <layout_stack
-     bottom="360"
+     bottom="460"
      follows="left|right|top|bottom"
      layout="topleft"
      left="5"
@@ -38,7 +37,7 @@
          user_resize="false"
          width="325">
             <web_browser
-              trusted_content="true" 
+              trusted_content="true"  
              bottom="-5"
              follows="left|right|top|bottom"
              layout="topleft"
diff --git a/indra/newview/skins/minimal/xui/en/floater_web_content.xml b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
index 50cb5b14ce..1d9a967d5a 100644
--- a/indra/newview/skins/minimal/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
@@ -17,6 +17,7 @@
     follows="left|right|top|bottom"
     layout="topleft"
     left="5"
+    animate="false"
     name="stack1"
     orientation="vertical"
     top="20"
@@ -155,14 +156,20 @@
       name="external_controls"
       top_delta="0"
       user_resize="false"
+      auto_resize="true"
       width="585">
       <web_browser
-        bottom="-22"
+        bottom="-2"
         follows="all"
         layout="topleft"
         left="0"
         name="webbrowser"
         top="0"/>
+      </layout_panel>
+    <layout_panel name="status_bar" 
+                  height="23"
+                  auto_resize="false"
+                  user_resize="false">
       <text
         type="string"
         length="200"
@@ -173,7 +180,7 @@
         name="statusbartext"
         parse_urls="false"
         text_color="0.4 0.4 0.4 1"
-        top_pad="5"
+        top_pad="3"
         width="495"/>
       <progress_bar
         color_bar="0.3 1.0 0.3 1"
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 6e8ad9adaf..0ce6cbc984 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -187,9 +187,9 @@
        name="status_bar_container"
        tab_stop="false"
        height="30"
-       left="-70"
+       left="-160"
        top="0"
-       width="70"
+       width="160"
        visible="false"/>
   <panel follows="top|bottom"
          height="500"
diff --git a/indra/newview/skins/minimal/xui/en/notifications.xml b/indra/newview/skins/minimal/xui/en/notifications.xml
index 84da9472cc..7b7cdb5fc6 100644
--- a/indra/newview/skins/minimal/xui/en/notifications.xml
+++ b/indra/newview/skins/minimal/xui/en/notifications.xml
@@ -24,7 +24,7 @@
    icon="notify.tga"
    name="ObjectGiveItem"
    type="offer">
-    An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] is offering you [ITEM_SLURL].  Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
+    An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] is offering you &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;.  Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
     <form name="form">
       <button
        index="0"
diff --git a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
index be13bc1bb7..2cb77bcdf3 100644
--- a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
@@ -23,102 +23,172 @@
      orientation="vertical"
      top_pad="5"
      width="145">
-      <layout_panel
-       auto_resize="false"
-       follows="top|left|right"
-       height="20"
-       layout="topleft"
-       left="2"
-       min_height="20"
-       width="140"
-       name="view_profile_btn_panel"
-       top="0"
-       user_resize="false">
-        <button
-         follows="left|top|right"
-         height="23"
-         label="Profile"
-         name="view_profile_btn"
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="20"
+         layout="topleft"
+         left="2"
+         min_height="20"
+         width="140"
+         name="view_profile_btn_panel"
          top="0"
-         width="140" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       follows="top|left|right"
-       height="25"
-       layout="topleft"
-       min_height="25"
-       width="140"
-       name="add_friend_btn_panel"
-       user_resize="false">
-        <button
-         follows="left|top|right"
-         height="23"
-         label="Add Friend"
-         name="add_friend_btn"
-         top="5"
-         width="140" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       follows="top|left|right"
-       height="25"
-       layout="topleft"
-       min_height="25"
-       width="140"
-       name="teleport_btn_panel"
-       user_resize="false">
-        <button
-             auto_resize="false"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="23"
+             label="Profile"
+             name="view_profile_btn"
+             top="0"
+             width="140" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="140"
+         name="add_friend_btn_panel"
+         user_resize="false">
+            <button
              follows="left|top|right"
              height="23"
-             label="Teleport"
-             name="teleport_btn"
-             tool_tip = "Offer to teleport this person"
+             label="Add Friend"
+             name="add_friend_btn"
+             top="5"
              width="140" />
-      </layout_panel>
-      <layout_panel
+        </layout_panel>
+        <layout_panel
          auto_resize="false"
          follows="top|left|right"
          height="25"
          layout="topleft"
          min_height="25"
          width="140"
-         name="call_btn_panel"
+         name="teleport_btn_panel"
          user_resize="false">
-        <button
-         follows="left|top|right"
-         height="23"
-         label="Call"
-         name="call_btn"
-         width="140" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       follows="top|left|right"
-       height="25"
-       layout="topleft"
-       min_height="25"
-       width="140"
-       name="end_call_btn_panel"
-       user_resize="false"
-       visible="false">
-        <button
-         follows="left|top|right"
-         height="23"
-         label="End Call"
-         name="end_call_btn"
-         width="140" />
-      </layout_panel>
-      <layout_panel
-       mouse_opaque="false"
-       auto_resize="true"
-       follows="top|left"
-       height="0"
-       layout="topleft"
-       min_height="0"
-       width="140"
-       name="spacer"
-       user_resize="false" />
+            <button
+                 auto_resize="false"
+                 follows="left|top|right"
+                 height="23"
+                 label="Teleport"
+                 name="teleport_btn"
+                 tool_tip = "Offer to teleport this person"
+                 width="140" />
+        </layout_panel>
+        <layout_panel
+           auto_resize="false"
+           follows="top|left|right"
+           height="25"
+           layout="topleft"
+           min_height="25"
+           width="140"
+           name="call_btn_panel"
+           user_resize="false">
+            <button
+             follows="left|top|right"
+             height="23"
+             label="Call"
+             name="call_btn"
+             width="140" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="140"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="left|top|right"
+             height="23"
+             label="End Call"
+             name="end_call_btn"
+             width="140" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="140"
+         name="block_btn_panel"
+         user_resize="false">
+            <button
+             follows="left|top|right"
+             height="23"
+             label="Block"
+             name="block_btn"
+             width="140" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="140"
+         name="unblock_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="left|top|right"
+             height="23"
+             label="Unblock"
+             name="unblock_btn"
+             width="140" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="54"
+         width="140"
+         name="volume_ctrl_panel"
+         visible="false" 
+         user_resize="false">
+            <slider
+             follows="top|left"
+             height="23"
+             increment="0.01"
+             left="0"
+             max_val="0.95"
+             min_val="0.05"
+             name="volume_slider"
+             show_text="false"
+             tool_tip="Call Volume"
+             top_pad="32"
+             value="0.5"
+             width="125" />
+            <button
+             follows="top|left"
+             height="16"
+             image_disabled="Audio_Off"
+             image_disabled_selected="AudioMute_Off"
+             image_hover_selected="AudioMute_Over"
+             image_selected="AudioMute_Off"
+             image_unselected="Audio_Off"
+             is_toggle="true"
+             left_pad="0"
+             top_delta="4"
+             name="mute_btn"
+             width="16" />
+        </layout_panel>
+        <layout_panel
+         mouse_opaque="false"
+         auto_resize="true"
+         follows="top|left"
+         height="0"
+         layout="topleft"
+         min_height="0"
+         width="140"
+         name="spacer"
+         user_resize="false" />
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
index 3903658e71..40d2df78e1 100644
--- a/indra/newview/skins/minimal/xui/en/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -124,27 +124,27 @@ label="Remember password"
   height="15"
   left_pad="10"
   name="mode_selection_text"
-top="20"
+  top="20"
   width="130">
-       Mode:
- </text>
-<combo_box
+    Mode:
+  </text>
+  <combo_box
   follows="left|bottom"
   height="23"
   max_chars="128"
-  top_pad="0"
   tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+  top_pad="0"
   name="mode_combo"
-  width="120">
-<combo_box.item
-  label="Basic"
-  name="Basic"
-  value="settings_minimal.xml" />
-<combo_box.item
-  label="Advanced"
-  name="Advanced"
-  value="" />
-</combo_box>
+  width="110">
+    <combo_box.item
+      label="Basic"
+      name="Basic"
+      value="settings_minimal.xml" />
+    <combo_box.item
+      label="Advanced"
+      name="Advanced"
+      value="" />
+  </combo_box>
 </layout_panel>
 <layout_panel
 tab_stop="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 6dc1a1c9b0..73a8564274 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -63,7 +63,7 @@ width="31" />
      mouse_opaque="false"
      name="location_combo"
      top_delta="0"
-     width="440">
+     width="325">
     </location_input>
     <icon follows="right"
           height="20"
diff --git a/indra/newview/skins/minimal/xui/en/panel_people.xml b/indra/newview/skins/minimal/xui/en/panel_people.xml
index 76baacb091..4739f86e95 100644
--- a/indra/newview/skins/minimal/xui/en/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_people.xml
@@ -428,7 +428,7 @@ Looking for people to hang out with? Try the Destinations button below.
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="im_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="41">
@@ -449,7 +449,7 @@ Looking for people to hang out with? Try the Destinations button below.
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="call_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="52">
@@ -470,7 +470,7 @@ Looking for people to hang out with? Try the Destinations button below.
 			height="23"
 			layout="bottomleft"
 			left_pad="3"
-			name="chat_btn_lp"
+			name="teleport_btn_lp"
 		    user_resize="false" 
 		    auto_resize="true"
 			width="77">
diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
index 6ccd0e938d..fdd6b5d6ec 100644
--- a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
@@ -12,7 +12,7 @@
  name="status"
  top="19"
  tab_stop="false"
- width="70">
+ width="185">
     <panel.string
      name="packet_loss_tooltip">
         Packet Loss
@@ -33,6 +33,27 @@
      name="buycurrencylabel">
         L$ [AMT]
     </panel.string>
+  <combo_box
+   follows="right|top"
+   left_pad="5"
+   drop_down_button.pad_left="10"
+   left="0"
+   top="5"
+   pad_left="5"
+   width="120"
+   height="23"
+   name="mode_combo"
+   tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+    >
+    <combo_box.item
+      label="Basic Mode"
+      name="Basic"
+      value="settings_minimal.xml" />
+    <combo_box.item
+      label="Advanced Mode"
+      name="Advanced"
+      value="" />
+  </combo_box>
      <button
      follows="right|top"
      height="16"
@@ -41,7 +62,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left="15"
+     left_pad="5"
      top="7"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
index fe06a2d816..ba148cf421 100644
--- a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
@@ -113,6 +113,14 @@
 	  font="SansSerifSmall"
 	  text_color="TextFgColor"
 	/>
+  <see_avatars_icon
+    name="see_avatars_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
+    follows="right|top"
+    />
   <combo_button
 		name="Location History"
                 label=""
diff --git a/indra/newview/skins/minimal/xui/es/notifications.xml b/indra/newview/skins/minimal/xui/es/notifications.xml
index b08ebb5f76..78b617c429 100644
--- a/indra/newview/skins/minimal/xui/es/notifications.xml
+++ b/indra/newview/skins/minimal/xui/es/notifications.xml
@@ -9,7 +9,7 @@
 		</form>
 	</notification>
 	<notification name="ObjectGiveItem">
-		Un objeto de nombre &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, propiedad de [NAME_SLURL], te ofrece un/a [ITEM_SLURL]. Para utilizar este ítem, cambia al modo Avanzado y búscalo en el inventario. Para cambiar al modo Avanzado, sal de la aplicación, reiníciala y cambia el ajuste de modo en la pantalla de inicio de sesión.
+		Un objeto de nombre &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, propiedad de [NAME_SLURL], te ofrece un/a &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;. Para utilizar este ítem, cambia al modo Avanzado y búscalo en el inventario. Para cambiar al modo Avanzado, sal de la aplicación, reiníciala y cambia el ajuste de modo en la pantalla de inicio de sesión.
 		<form name="form">
 			<button name="Keep" text="Conservar ítem"/>
 			<button name="Discard" text="Rechazar ítem"/>
diff --git a/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml
index 1be6997813..93b6526f77 100644
--- a/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml
@@ -10,20 +10,20 @@
 		<layout_panel name="teleport_btn_panel">
 			<button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Compartir" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Pagar" name="pay_btn"/>
-		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="Llamar" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Colgar" name="end_call_btn"/>
 		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de la voz" name="voice_ctrls_btn"/>
+		<layout_panel name="block_btn_panel">
+			<button label="Ignorar" name="block_btn"/>
+		</layout_panel>
+		<layout_panel name="unblock_btn_panel">
+			<button label="No ignorar" name="unblock_btn"/>
+		</layout_panel>
+		<layout_panel name="volume_ctrl_panel">
+			<slider name="volume_slider" tool_tip="Volumen de la llamada" value="0.5"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/es/panel_people.xml b/indra/newview/skins/minimal/xui/es/panel_people.xml
index 1e1c3411ae..a06f3010d7 100644
--- a/indra/newview/skins/minimal/xui/es/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_people.xml
@@ -49,14 +49,14 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/skins/minimal/xui/fr/notifications.xml b/indra/newview/skins/minimal/xui/fr/notifications.xml
index 41dd42c39f..05fa03cdc1 100644
--- a/indra/newview/skins/minimal/xui/fr/notifications.xml
+++ b/indra/newview/skins/minimal/xui/fr/notifications.xml
@@ -9,7 +9,7 @@
 		</form>
 	</notification>
 	<notification name="ObjectGiveItem">
-		Un objet nommé &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; appartenant à [NAME_SLURL] vous offre [ITEM_SLURL]. Pour utiliser cet article, vous devez passer en mode Avancé. L&apos;article se trouve dans votre inventaire. Pour changer de mode, quittez l&apos;application, redémarrez-la, puis sélectionnez un autre mode sur l&apos;écran de connexion.
+		Un objet nommé &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; appartenant à [NAME_SLURL] vous offre &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;. Pour utiliser cet article, vous devez passer en mode Avancé. L&apos;article se trouve dans votre inventaire. Pour changer de mode, quittez l&apos;application, redémarrez-la, puis sélectionnez un autre mode sur l&apos;écran de connexion.
 		<form name="form">
 			<button name="Keep" text="Garder l&apos;article"/>
 			<button name="Discard" text="Refuser l&apos;article"/>
diff --git a/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml
index fdc5aeca49..1643cf3229 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<text name="avatar_name" value="Inconnu"/>
 	<layout_stack name="button_stack">
 		<layout_panel name="view_profile_btn_panel">
 			<button label="Profil" name="view_profile_btn"/>
@@ -11,20 +10,20 @@
 		<layout_panel name="teleport_btn_panel">
 			<button label="Téléporter" name="teleport_btn" tool_tip="Proposer de téléporter cette personne."/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Partager" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Payer" name="pay_btn"/>
-		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="Appeler" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Quitter l&apos;appel" name="end_call_btn"/>
 		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Contrôles vocaux" name="voice_ctrls_btn"/>
+		<layout_panel name="block_btn_panel">
+			<button label="Ignorer" name="block_btn"/>
+		</layout_panel>
+		<layout_panel name="unblock_btn_panel">
+			<button label="Ne plus ignorer" name="unblock_btn"/>
+		</layout_panel>
+		<layout_panel name="volume_ctrl_panel">
+			<slider name="volume_slider" tool_tip="Volume de l&apos;appel." value="0,5"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/fr/panel_people.xml b/indra/newview/skins/minimal/xui/fr/panel_people.xml
index 72fb4d807f..427a420b91 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_people.xml
@@ -49,14 +49,14 @@ Vous recherchez des résidents avec qui passer du temps ? Essayez avec le bouto
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Appeler" name="call_btn" tool_tip="Appeler ce résident."/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation"/>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/skins/minimal/xui/it/notifications.xml b/indra/newview/skins/minimal/xui/it/notifications.xml
index 05e13bc4f3..998e38ff5a 100644
--- a/indra/newview/skins/minimal/xui/it/notifications.xml
+++ b/indra/newview/skins/minimal/xui/it/notifications.xml
@@ -2418,7 +2418,7 @@ Riprova tra qualche istante.
 		Non è stato trovato nessun territorio valido.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Un oggetto denominato &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; di proprietà di [NAME_SLURL] ti ha offerto [ITEM_SLURL]:  Per usare questo oggetto è necessario passare alla modalità Avanzata e cercarlo nell&apos;Inventario. Per passare alla modalità Avanzata, esci e riavvia l&apos;applicazione e cambia le impostazioni della modalità nella schermata di accesso.
+		Un oggetto denominato &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; di proprietà di &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt; ti ha offerto [ITEM_SLURL]:  Per usare questo oggetto è necessario passare alla modalità Avanzata e cercarlo nell&apos;Inventario. Per passare alla modalità Avanzata, esci e riavvia l&apos;applicazione e cambia le impostazioni della modalità nella schermata di accesso.
 		<form name="form">
 			<button name="Keep" text="Mantieni oggetto"/>
 			<button name="Discard" text="Rifiuta oggetto"/>
diff --git a/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml
index 756db84c1c..269931a1a4 100644
--- a/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml
@@ -10,20 +10,20 @@
 		<layout_panel name="teleport_btn_panel">
 			<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport a questa persona"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Condividi" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Paga" name="pay_btn"/>
-		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="Chiama" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Chiudi chiamata" name="end_call_btn"/>
 		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Regolazione voce" name="voice_ctrls_btn"/>
+		<layout_panel name="block_btn_panel">
+			<button label="Blocca" name="block_btn"/>
+		</layout_panel>
+		<layout_panel name="unblock_btn_panel">
+			<button label="Sblocca" name="unblock_btn"/>
+		</layout_panel>
+		<layout_panel name="volume_ctrl_panel">
+			<slider name="volume_slider" tool_tip="Volume chiamata" value="0.5"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/it/panel_people.xml b/indra/newview/skins/minimal/xui/it/panel_people.xml
index 068c8bb808..81e886acf0 100644
--- a/indra/newview/skins/minimal/xui/it/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/it/panel_people.xml
@@ -66,16 +66,16 @@ Stai cercando persone da frequentare? Prova il pulsante Destinazioni in basso.
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/ja/notifications.xml b/indra/newview/skins/minimal/xui/ja/notifications.xml
index 6ad0ed1ac6..43934c9317 100644
--- a/indra/newview/skins/minimal/xui/ja/notifications.xml
+++ b/indra/newview/skins/minimal/xui/ja/notifications.xml
@@ -2465,7 +2465,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		有効な区画が見つかりませんでした。
 	</notification>
 	<notification name="ObjectGiveItem">
-		[NAME_SLURL] が所有する &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [ITEM_SLURL] を渡そうとしています。このアイテムを使うにはアドバンスモードへの切り替えが必要です。アドバンスモードでログインしなおすと、あなたの持ち物にこのアイテムが見つかります。アドバンスモードに切り替えるには、このアプリケーションを終了して再起動し、ログイン画面でモード設定を変更してください。
+		[NAME_SLURL] が所有する &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt; を渡そうとしています。このアイテムを使うにはアドバンスモードへの切り替えが必要です。アドバンスモードでログインしなおすと、あなたの持ち物にこのアイテムが見つかります。アドバンスモードに切り替えるには、このアプリケーションを終了して再起動し、ログイン画面でモード設定を変更してください。
 		<form name="form">
 			<button name="Keep" text="アイテムを受け取る"/>
 			<button name="Discard" text="アイテムを拒否する"/>
diff --git a/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml
index f2429ac12a..14c38c796f 100644
--- a/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_im_control_panel">
-	<text name="avatar_name" value="不明"/>
 	<layout_stack name="button_stack">
 		<layout_panel name="view_profile_btn_panel">
 			<button label="プロフィール" name="view_profile_btn"/>
@@ -11,20 +10,20 @@
 		<layout_panel name="teleport_btn_panel">
 			<button label="テレポート" name="teleport_btn" tool_tip="この人にテレポートを送ります"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="共有" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="支払う" name="pay_btn"/>
-		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="コール" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="コール終了" name="end_call_btn"/>
 		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="ボイスコントロール" name="voice_ctrls_btn"/>
+		<layout_panel name="block_btn_panel">
+			<button label="ブロック" name="block_btn"/>
+		</layout_panel>
+		<layout_panel name="unblock_btn_panel">
+			<button label="ブロック解除" name="unblock_btn"/>
+		</layout_panel>
+		<layout_panel name="volume_ctrl_panel">
+			<slider name="volume_slider" tool_tip="コールの音量" value="0.5"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/ja/panel_people.xml b/indra/newview/skins/minimal/xui/ja/panel_people.xml
index 9eb45d9a80..5caeebc151 100644
--- a/indra/newview/skins/minimal/xui/ja/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/ja/panel_people.xml
@@ -66,16 +66,16 @@
 			<layout_panel name="view_profile_btn_lp">
 				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="共有" name="share_btn" tool_tip="「持ち物」のアイテムを共有する"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/pl/notifications.xml b/indra/newview/skins/minimal/xui/pl/notifications.xml
index 6e62478ed0..6475a37465 100644
--- a/indra/newview/skins/minimal/xui/pl/notifications.xml
+++ b/indra/newview/skins/minimal/xui/pl/notifications.xml
@@ -2384,7 +2384,7 @@ Spróbuj ponowanie za kilka minut.
 		Nieważana posiadłość.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Obiekt o nazwie &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, którego właścicielem jest [NAME_SLURL] oferuje Tobie [ITEM_SLURL].  Korzystanie z tego obieku wymaga przelączenia się na tryb zaawansowany, w którym będzie można odszukać obiekt w Twojej Szafie. W celu przełączenia trybu życia na zaawansowany, zamknij i uruchom ponownie aplikację. Przed ponownym zalogowaniem zmień tryb życia na ekranie logowania.
+		Obiekt o nazwie &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, którego właścicielem jest [NAME_SLURL] oferuje Tobie &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;.  Korzystanie z tego obieku wymaga przelączenia się na tryb zaawansowany, w którym będzie można odszukać obiekt w Twojej Szafie. W celu przełączenia trybu życia na zaawansowany, zamknij i uruchom ponownie aplikację. Przed ponownym zalogowaniem zmień tryb życia na ekranie logowania.
 		<form name="form">
 			<button name="Keep" text="Zaakceptuj obiekt"/>
 			<button name="Discard" text="Odrzuć obiekt"/>
diff --git a/indra/newview/skins/minimal/xui/pl/panel_people.xml b/indra/newview/skins/minimal/xui/pl/panel_people.xml
index dbfee739f4..3b3aaa0987 100644
--- a/indra/newview/skins/minimal/xui/pl/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/pl/panel_people.xml
@@ -66,16 +66,16 @@ Chcesz spotkać ludzi? Skorzystaj z przycisku &quot;Atrakcje turystyczne&quot; p
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Profil" name="view_profile_btn" tool_tip="Pokaż zdjęcie, grupy i inne informacje o Rezydencie"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Otwórz wiadomości IM"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Dzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="share_btn_lp">
 				<button label="Udostępnij" name="share_btn" tool_tip="Udostępnij obiekt z Szafy"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleport"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/pt/notifications.xml b/indra/newview/skins/minimal/xui/pt/notifications.xml
index 30ba6f68bf..9e5ff6fe60 100644
--- a/indra/newview/skins/minimal/xui/pt/notifications.xml
+++ b/indra/newview/skins/minimal/xui/pt/notifications.xml
@@ -9,7 +9,7 @@
 		</form>
 	</notification>
 	<notification name="ObjectGiveItem">
-		Um objeto chamado &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, de [NAME_SLURL], está lhe oferecendo [ITEM_SLURL].  Esta ação requer o modo Avançado. Passe para o modo Avançado e você verá o item em seu Inventário. Para passar para o modo Avançado, feche e reinicialize esse aplicativo e mude o modo (indicado na tela de login).
+		Um objeto chamado &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, de [NAME_SLURL], está lhe oferecendo &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;.  Esta ação requer o modo Avançado. Passe para o modo Avançado e você verá o item em seu Inventário. Para passar para o modo Avançado, feche e reinicialize esse aplicativo e mude o modo (indicado na tela de login).
 		<form name="form">
 			<button name="Keep" text="Guardar item"/>
 			<button name="Discard" text="Recusar item"/>
diff --git a/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml
index d223ee9c69..190323c3b0 100644
--- a/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml
@@ -10,20 +10,20 @@
 		<layout_panel name="teleport_btn_panel">
 			<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="Compartilhar" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="Pagar" name="pay_btn"/>
-		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="Ligar" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Encerrar ligação" name="end_call_btn"/>
 		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Controles de voz" name="voice_ctrls_btn"/>
+		<layout_panel name="block_btn_panel">
+			<button label="Bloquear" name="block_btn"/>
+		</layout_panel>
+		<layout_panel name="unblock_btn_panel">
+			<button label="Desbloquear" name="unblock_btn"/>
+		</layout_panel>
+		<layout_panel name="volume_ctrl_panel">
+			<slider name="volume_slider" tool_tip="Volume da ligação" value="0.5"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/pt/panel_people.xml b/indra/newview/skins/minimal/xui/pt/panel_people.xml
index d46c440eb9..0e98c586c6 100644
--- a/indra/newview/skins/minimal/xui/pt/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/pt/panel_people.xml
@@ -49,13 +49,13 @@ Em busca de alguém para conversar? Confira o botão Destinos abaixo.
 			<layout_panel name="view_profile_btn_lp">
 				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="im_btn_lp">
 				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="call_btn_lp">
 				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
 			</layout_panel>
-			<layout_panel name="chat_btn_lp">
+			<layout_panel name="teleport_btn_lp">
 				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
 			</layout_panel>
 		</layout_stack>
author	Logan Dethrow <log@lindenlab.com>	2011-09-09 14:20:19 -0400
committer	Logan Dethrow <log@lindenlab.com>	2011-09-09 14:20:19 -0400
commit	8a952e42e97cfb286192aba0fbfc43986912cd29 (patch)
tree	6aa00aad42189239aa81972328e057afc215bf7d /indra/newview/skins
parent	c47b398b75fcdbb479ad9ad2765014c5fa338df7 (diff)
parent	89b9800579a37fbbdfca7789716a2d012d96cfa5 (diff)