154 files changed, 8116 insertions, 2281 deletions

diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 60fb4e0..9151ee9 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -397,5 +397,10 @@
   <texture name="media_btn_stoploading.png"/>
   <texture name="media_panel_divider.png"/>
   <texture name="media_panel_scrollbg.png"/>
+  
+  <texture name="go-previous-4.png"/>
+  <texture name="go-next-4.png"/>
+  <texture name="view-refresh-5.png"/> 
+  <texture name="go-home-4.png"/>
 
 </textures>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index d0f72c2..95cdcd0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -57,24 +57,24 @@
 
   Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
 
-        3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-        DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-        expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-        GL Copyright (C) 1999-2004 Brian Paul.
-        Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-        jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-        jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-        SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
-        Code from FAAD2 is copyright (c) Nero AG, www.nero.com
+        3Dconnexion SDK Copyright © 1992-2007 3Dconnexion
+        APR Copyright © 2000-2004 The Apache Software Foundation
+        cURL Copyright © 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+        DBus/dbus-glib Copyright © 2002, 2003  CodeFactory AB / Copyright © 2003, 2004 Red Hat, Inc.
+        expat Copyright © 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+        FreeType Copyright © 1996-2002, The FreeType Project (www.freetype.org).
+        GL Copyright © 1999-2004 Brian Paul.
+        Havok.com(TM) Copyright © 1999-2001, Telekinesys Research Limited.
+        jpeg2000 Copyright © 2001, David Taubman, The University of New South Wales (UNSW)
+        jpeglib Copyright © 1991-1998, Thomas G. Lane.
+        ogg/vorbis Copyright © 2001, Xiphophorus
+        OpenSSL Copyright © 1998-2002 The OpenSSL Project.
+        SDL Copyright © 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+        SSLeay Copyright © 1995-1998 Eric Young (eay@cryptsoft.com)
+        xmlrpc-epi Copyright © 2000 Epinions, Inc.
+        zlib Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.
+        google-perftools Copyright © 2005, Google Inc.
+        Code from FAAD2 is copyright © Nero AG, www.nero.com
 
         All rights reserved.  See LICENSE-libraries.txt for details.
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index d57ca5f..fcaa869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -888,7 +888,7 @@ Only large parcels can be listed in search.
                                  height="16"
                                  left="10"
                                  length="1"
-                                 name="at URL:"
+                                 name="Current URL:"
                                  type="string"
                                  width="65">
                                 Current URL:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
index 9f55f67..50ec87c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
@@ -93,4 +93,4 @@
   <button bottom_delta="0" follows="top|right" height="22" label="OK"
     right="-85" name="btn_ok" tool_tip="" enabled="true" width="80" />
   
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
index 13b334b..a1eb3c8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
@@ -93,12 +93,12 @@
      font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
      tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="CmdLineChatbarClearChat" control_name="CmdLineChatbarClearChat" width="200"/>
   <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="loltxt15" width="512">        Set the media url (usage: cmd url type)</text>
+        name="set_media_url_text" width="512">        Set the media url (usage: cmd url type)</text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         tool_tip="Sets and plays your media stream to the entered url" name="CmdLineChatbarMedia" control_name="CmdLineChatbarMedia" width="200"/>
   <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="loltxt15" width="512">        Set the music stream url (usage: cmd url)</text>
+        name="set_music_url_text" width="512">        Set the music stream url (usage: cmd url)</text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         tool_tip="sets and plays your music stream to the entered url" name="CmdLineChatbarMusic" control_name="CmdLineChatbarMusic" width="200"/>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
index 157588d..51ba35f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
@@ -17,4 +17,4 @@
       right="-5" name="btn_cancel" width="85" />
   <button bottom_delta="0" follows="bottom|right" height="20" label="OK"
             left_delta="-90" name="btn_ok" width="85" />
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 3ab7c7b..554f79d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -170,7 +170,7 @@
                                 </menu_item_call>
                         </menu>
                         <menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
-                             mouse_opaque="false" name="New Body Parts" opaque="true" width="118">
+                             mouse_opaque="false" label="New Body Parts" name="New Body Parts" opaque="true" width="118">
                                 <menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
                                      name="New Shape" width="118">
                                         <on_click filter="" function="Inventory.DoCreate" userdata="shape" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
index f9bb3a7..a8ce59c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
@@ -118,12 +118,12 @@
     default_image_name="Default"
     can_apply_immediately="true"
     follows="left|top"
-    label="Texture"
     bottom_delta="20"
     left_delta="0"
     mouse_opaque="true"
     name="texture_view"
     visible="true"
+    enabled="false"
     />
 
   <check_box
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index c1bfdcc..76eee6f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -3,20 +3,20 @@
      height="440" min_height="140" min_width="467" name="floater_about"
      rect_control="FloaterMediaRect" title="Web Browser" width="560">
         <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
-                <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
+                <layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false"
                      width="800">
-                        <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
-                             width="55" />
-                        <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
-                             name="forward" width="68" />
-                        <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
-                             left_delta="70" name="reload" width="70" />
-                        <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="75" max_chars="255" name="address" width="485" />
-                        <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="487" name="go" width="55" />
-                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
-                             left_delta="58" name="home" width="55" />
+                        <button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back"
+                             width="25" />
+                        <button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27"
+                             name="forward" width="25" />
+                        <button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png" 
+                             left_delta="27" name="reload" width="25" />
+                        <combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20"
+                             left_delta="29" max_chars="255" name="address" width="622" />
+                        <button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif" 
+                             left_delta="625" name="go" width="55" />
+                        <button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
+                             left_delta="58" name="home" width="35" />
                 </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
                      width="800">
@@ -33,22 +33,19 @@
     </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
-                        <button bottom="0" enabled="false" follows="left|top" height="20"
-                             label="Send Current URL to Parcel" left="0" name="assign" width="200" />
+                        <button bottom="0" enabled="false" follows="left|top" height="22"
+                             label="Send Current URL To Parcel" left="0" name="assign" width="200" />
                 </layout_panel>
                 <layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
                      width="540">
                         <web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20"
                              width="540" />
-                        <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
+                        <button bottom="4" follows="bottom|left" height="22" label="Open In External Browser" font="SansSerif"
                              left="0" name="open_browser" width="185" />
-                        <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
-                             label="Always open in my web browser" left_delta="184" name="open_always"
-                             width="200" />
-                        <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set As Home"
-                             left="-176" name="set_home" width="104" />
-                        <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
-                             name="close" width="70" />
+                        <check_box bottom="6" control_name="UseExternalBrowser" follows="bottom|left" height="22"
+                             label="Always open in external browser" left_delta="190" name="open_always" width="200" />
+      <button bottom="4" enabled="false" follows="bottom|right" height="22" label="Set As Home" font="SansSerif"
+                             left="-110" name="set_home" width="104" />
                 </layout_panel>
         </layout_stack>
   <string name="home_page_url">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
index fe2d977..ce6ab7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
@@ -20,14 +20,14 @@
         <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
              tear_off="false" width="220">
-    <menu drop_shadow="true" enabled="true" mouse_opaque="false" name="File" opaque="true" tear_off="false">
+    <menu drop_shadow="true" enabled="true" label="File" mouse_opaque="false" name="File" opaque="true" tear_off="false">
       <menu_item_call enabled="false" mouse_opaque="true" label="Save" name="Save Menu" shortcut="control|S" />
       <menu_item_separator />
       <menu_item_call enabled="false" mouse_opaque="true" label="Export Text..." name="Export Text..." />
       <menu_item_call enabled="false" mouse_opaque="true" label="Import Text..." name="Import Text..." />
     </menu>
                 <menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
-                     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
+                    label="Edit" mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
                         <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
                              mouse_opaque="true" name="Undo" width="139" />
                         <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
index 7db7330..bfe30d4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -187,7 +187,7 @@
                                    tool_tip="Report avatars getting within or beyond the draw distance" />
 
                         <check_box height="16" label="Avatars within/beyond the shout range"
-                                   left="20" bottom_delta="-18" name="alerts_chat"
+                                   left="20" bottom_delta="-18" name="alerts_shout"
                                    width="200" follows="bottom|left"
                                    hidden="false" mouse_opaque="true" font="SansSerifSmall"
                                    initial_value="true" enabled="true" radio_style="false"
@@ -324,4 +324,4 @@
                                />
                 </panel>
         </tab_container>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 87907ec..ffdafe2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right">
-        <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false">
-                <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
-                        <on_click function="File.Quit" userdata="" />
-                </menu_item_call>
-        </menu>
-        <menu create_jump_keys="true" label="Edit" name="Edit" 
-        opaque="true" tear_off="false">
+<menu_bar name="Login Menu" opaque="true" tear_off="false" 
+          mouse_opaque="false"
+          drop_shadow="false"
+          height="18" bottom="-18" follows="left|top|right">
+        <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false"
+        drop_shadow="true" mouse_opaque="false">
+    <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
+      <on_click function="File.Quit" userdata="" />
+    </menu_item_call>
+  </menu>
+  <menu create_jump_keys="true" label="Edit" name="Edit"
+        opaque="true" tear_off="false"
+        drop_shadow="true" mouse_opaque="false">
                 <menu_item_call label="Preferences..." name="Preferences..." shortcut="control|P">
                         <on_click function="ShowFloater" userdata="preferences" />
                 </menu_item_call>
         </menu>
         <menu create_jump_keys="true" label="Help" name="Help" 
-        opaque="true" tear_off="false">
+        opaque="true" tear_off="false"
+        drop_shadow="true" mouse_opaque="false">
                 <menu_item_call label="Grid Help" name="Grid Help" shortcut="F1">
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
@@ -32,7 +38,8 @@
                         <on_click function="ShowFloater" userdata="about" />
                 </menu_item_call>
         </menu>
-        <menu name="Advanced" create_jump_keys="true" opaque="true">
+        <menu name="Advanced" create_jump_keys="true" opaque="true"
+        drop_shadow="true" mouse_opaque="false">
                 <menu_item_call name="Debug Settings" label="Debug Settings">
                         <on_click function="Advanced.ShowDebugSettings" userdata="" />
                 </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 603c212..03967d9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right"
-          opaque="false" tear_off="false">
+          opaque="false" mouse_opaque="false" tear_off="false">
 
 
   <!-- FILE -->
 
   <menu name="File" create_jump_keys="true" label="File"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu label="Upload" create_jump_keys="true" name="Upload"
           opaque="true" tear_off="true">
@@ -103,6 +104,7 @@
   <!-- EDIT -->
 
   <menu name="Edit" create_jump_keys="true" label="Edit"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Undo" enabled="false" label="Undo"
                     shortcut="control|Z">
@@ -156,13 +158,16 @@
     <menu_item_separator />
 
     <menu name="Attach Object" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
           label="Attach Object" opaque="true" tear_off="true" />
 
     <menu name="Detach Object" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
           label="Detach Object" opaque="true" tear_off="true" />
 
 
     <menu name="Take Off Clothing" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
           label="Take Off Clothing" opaque="true" tear_off="true">
 
       <menu_item_call name="Shirt" enabled="false" label="Shirt">
@@ -295,6 +300,7 @@
   <!-- VIEW -->
 
   <menu name="View" create_jump_keys="true" label="View"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Mouselook" label="Mouselook"
                     shortcut="M">
@@ -406,6 +412,7 @@
     </menu_item_check>
     <menu_item_separator />
     <menu name="Hover Tips" create_jump_keys="true" label="Hover Tips"
+          drop_shadow="true" mouse_opaque="false"
           opaque="true" tear_off="true">
       <menu_item_check name="Show Tips" label="Show Tips"
                        shortcut="control|shift|T">
@@ -449,8 +456,9 @@
       <on_check function="View.CheckHUDAttachments" />
     </menu_item_check>
     <menu_item_separator />
-    <menu name="Zoom Level" create_jump_keys="true"
-            label="Zoom Level" opaque="true" tear_off="true">
+    <menu name="Zoom Level" label="Zoom Level" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
+          opaque="true" tear_off="true">
       <menu_item_call name="Zoom In" label="Zoom In"
                       shortcut="control|0">
         <on_click function="View.ZoomIn" userdata="" />
@@ -483,6 +491,7 @@
   <!-- WORLD -->
 
   <menu name="World" create_jump_keys="true" label="World"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Chat" label="Chat" shortcut="">
       <on_click function="World.Chat" userdata="" />
@@ -562,8 +571,9 @@
       <on_click function="ShowFloater" userdata="about region" />
     </menu_item_call>
     <menu_item_separator />
-    <menu name="Environment Settings" create_jump_keys="true"
-          label="Environment Settings" opaque="true" tear_off="true">
+    <menu name="Environment Settings" label="Environment Settings"
+          create_jump_keys="true" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Sunrise" label="Sunrise">
         <on_click function="World.EnvSettings" userdata="sunrise" />
       </menu_item_call>
@@ -595,8 +605,10 @@
   <!-- TOOLS -->
 
   <menu name="Tools" create_jump_keys="true" label="Tools"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true" visible="false">
     <menu name="Select Tool" create_jump_keys="true" label="Choose Tool"
+          drop_shadow="true" mouse_opaque="false"
           opaque="true" tear_off="true">
       <menu_item_call name="Focus" label="Focus" shortcut="control|1">
         <on_click function="Tools.SelectTool" userdata="focus" />
@@ -626,6 +638,7 @@
       <on_enable function="Tools.SomethingSelectedNoHUD" />
     </menu_item_call>
     <menu name="Selection Options" label="Selection Options"
+          drop_shadow="true" mouse_opaque="false"
           create_jump_keys="true" opaque="true" tear_off="true">
       <menu_item_check name="Select Only My Objects"
                        label="Select Only My Objects">
@@ -774,6 +787,7 @@
     </menu_item_call>
                 <menu name="Recompile Scripts in Selection" create_jump_keys="true"
                       label="Recompile Scripts in Selection" opaque="true"
+          drop_shadow="true" mouse_opaque="false"
           tear_off="true">
                   <menu_item_call name="Mono" label="Mono">
                           <on_click function="Tools.SelectedScriptAction"
@@ -820,6 +834,7 @@
   <!-- HELP -->
 
   <menu name="Help" create_jump_keys="true" label="Help"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Grid Help" label="Grid Help"
                     shortcut="F1">
@@ -868,14 +883,14 @@
 
   <!-- ADVANCED -->
 
-  <menu name="Advanced" drop_shadow="true"
-        opaque="true" tear_off="true">
+  <menu label="Advanced" name="Advanced" drop_shadow="true"
+        mouse_opaque="false" opaque="true" tear_off="true">
 
 
     <!-- CONSOLES -->
 
-    <menu name="Consoles" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Consoles" name="Consoles" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="Frame Console" label="Frame Console"
                        shortcut="control|shift|2">
         <on_click function="Advanced.ToggleConsole"
@@ -958,8 +973,8 @@
 
     <!-- HUD INFO -->
 
-    <menu name="HUD Info" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="HUD Info" name="HUD Info" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="Velocity" label="Velocity">
         <on_click function="Advanced.ToggleHUDInfo"
                   userdata="velocity" />
@@ -1027,12 +1042,12 @@
 
     <!-- RENDERING -->
 
-    <menu name="Rendering" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Rendering" name="Rendering" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
       <!-- TYPES -->
-      <menu name="Types" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Types" name="Types" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="Simple" label="Simple"
                          shortcut="control|alt|shift|1">
           <on_click function="Advanced.ToggleRenderType"
@@ -1128,8 +1143,8 @@
 
 
       <!-- FEATURES -->
-      <menu name="Features" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Features" name="Features" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="UI" label="UI"
                          shortcut="alt|shift|F1">
           <on_click function="Advanced.ToggleFeature"
@@ -1191,8 +1206,8 @@
 
 
       <!-- INFO DISPLAYS -->
-      <menu name="Info Displays" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Info Displays" name="Info Displays" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="Verify" label="Verify">
           <on_click function="Advanced.ToggleInfoDisplay"
                     userdata="verify" />
@@ -1318,8 +1333,8 @@
 
 
       <!-- RENDER TESTS -->
-      <menu name="Render Tests" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Render Tests" name="Render Tests" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="Camera Offset" label="Camera Offset">
           <on_click function="ToggleControl"
                     userdata="CameraOffset" />
@@ -1463,8 +1478,8 @@
 
     <!-- WORLD -->
 
-    <menu name="World" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="World" name="World" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <!-- Disabled because you can't do this in Windlight.
       <menu_item_check name="Mouse Moves Sun"
                        label="Mouse Moves Sun"
@@ -1499,9 +1514,11 @@
 
     <!-- RLVa -->
 
-    <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
+    <menu label="RLVa" name="RLVa" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
-      <menu name="Debug" drop_shadow="true" opaque="true" tear_off="true">
+      <menu label="Debug"  name="Debug" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
 
         <menu_item_check name="Show Debug Messages"
                          label="Show Debug Messages">
@@ -1574,8 +1591,8 @@
 
     <!-- UI -->
 
-    <menu name="UI" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="UI" name="UI" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
       
       <menu_item_check name="Use default system color picker"
@@ -1735,8 +1752,8 @@
 
     <!-- XUI -->
 
-    <menu name="XUI" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="XUI" name="XUI" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Floater Test"
                       label="Floater Test">
         <on_click function="Advanced.ShowFloaterTest"
@@ -1781,11 +1798,11 @@
 
     <!-- CHARACTER -->
 
-    <menu name="Character" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Character" name="Character" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
-      <menu name="Grab Baked Texture" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Grab Baked Texture" name="Grab Baked Texture" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
 
         <menu_item_call name="Iris" enabled="false"
                         label="Iris">
@@ -1825,8 +1842,8 @@
       </menu>
 
       <!-- CHARACTER TESTS -->
-      <menu name="Character Tests" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Character Tests" name="Character Tests" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_call name="Appearance To XML"
                         label="Appearance To XML">
           <on_click function="Advanced.ToggleAppearanceToXML"
@@ -1996,8 +2013,8 @@
 
     <!-- CRASH -->
 
-    <menu name="Crash" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Crash" name="Crash" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Force Bad Memory Access"
                       label="Force Bad Memory Access">
         <on_click function="Advanced.Crash"
@@ -2034,8 +2051,8 @@
 
     <!-- NETWORK -->
 
-    <menu name="Network" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Network" name="Network" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Enable Message Log"
                       label="Enable Message Log">
         <on_click function="Advanced.EnableMessageLog"
@@ -2071,8 +2088,8 @@
 
     <!-- RECORDER -->
 
-    <menu name="Recorder" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Recorder" name="Recorder" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="Full Session Logging"
                        label="Full Session Logging">
         <on_click function="ToggleControl"
@@ -2129,8 +2146,8 @@
     
     <!-- ADMIN OPTIONS -->
 
-    <menu name="Admin Options" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Admin Options" name="Admin Options" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="View Admin Options"
                    label="View Admin Options"
                    shortcut="control|alt|V">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 1dcde4f..b682534 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1733,7 +1733,7 @@ Cannot find the region this land is in.
  type="alertmodal">
 Unable to buy land:
 
-Your allowed/preferred maturity level does not permit you to buy this land. You may need to your maturity level in Preferences first.
+Your allowed/preferred maturity level does not permit you to buy this land. You may need to adjust your maturity level in Preferences first.
 </notification>
 
 <notification
@@ -6920,44 +6920,44 @@ Typing stop packets - sends encrypted messages differently so they do not wind u
  type="alert">
 The following constants are accepted in this tab:
 
-PX  --  X-axis position
-PY  --  Y-axis position
-PZ  --  Z-axis position
-SX  --  X-axis size
-SY  --  Y-axis size
-SZ  --  Z-axis size
-RX  --  X-axis rotation
-RY  --  Y-axis rotation
-RZ  --  Z-axis rotation
-CB  --  Path cut begin
-CE  --  Path cut end
-HLW  --  Hollow size
-SKW  --  Skew
-PB  --  Slice/Dimple/Profile cut begin
-PE  --  Slice/Dimple/Profile cut end
-TB  --  Twist begin
-TE  --  Twist end
-SHX  --  X-axis top shear
-SHY  --  Y-axis top shear
-HLX  --  X-axis hole size
-HLY  --  Y-axis hole size
-TPX  --  X-axis taper
-TPY  --  Y-axis taper
-ROF  --  Radius offset
-REV  --  Revolutions
-
-PI  --  pi
-TWO_PI  --  2pi
-PI_BY_TWO  --  pi/2
-SQRT2  --  Square root of 2
-DEG_TO_RAD  --  DEG_TO_RAD conversion (pi/180)
-RAD_TO_DEG  --  RAD_TO_DEG conversion (180/pi)
-GRAVITY  --  -9.8
-
-*  --  Multiplication
-\  --  Division
-  --  Addition
--  --  Subtraction
+PX  —  X-axis position
+PY  —  Y-axis position
+PZ  —  Z-axis position
+SX  —  X-axis size
+SY  —  Y-axis size
+SZ  —  Z-axis size
+RX  —  X-axis rotation
+RY  —  Y-axis rotation
+RZ  —  Z-axis rotation
+CB  —  Path cut begin
+CE  —  Path cut end
+HLW  —  Hollow size
+SKW  —  Skew
+PB  —  Slice/Dimple/Profile cut begin
+PE  —  Slice/Dimple/Profile cut end
+TB  —  Twist begin
+TE  —  Twist end
+SHX  —  X-axis top shear
+SHY  —  Y-axis top shear
+HLX  —  X-axis hole size
+HLY  —  Y-axis hole size
+TPX  —  X-axis taper
+TPY  —  Y-axis taper
+ROF  —  Radius offset
+REV  —  Revolutions
+
+PI  —  π
+TWO_PI  —  2π
+PI_BY_TWO  —  π/2
+SQRT2  —  Square root of 2
+DEG_TO_RAD  —  degrees to radians (pi/180)
+RAD_TO_DEG  —  radians to degrees (180/pi)
+GRAVITY  —  -9.8
+
+*  —  Multiplication
+\  —  Division
+  —  Addition
+-  —  Subtraction
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
@@ -6975,18 +6975,18 @@ For information about this feature, click "More Info".
  type="alert">
 The following constants are accepted in this tab:
 
-TSU  --  Repeats per face (horizontal)
-TSV  --  Repeats per face (vertical)
-TOU  --  Offsets per face (horizontal)
-TOV  --  Offsets per face (vertical)
-TRNS --  Transparency
-TROT --  Texture rotation
-GLOW --  Glow
-
-*  --  Multiplication
-\  --  Division
-  --  Addition
--  --  Subtraction
+TSU  —  Repeats per face (horizontal)
+TSV  —  Repeats per face (vertical)
+TOU  —  Offsets per face (horizontal)
+TOV  —  Offsets per face (vertical)
+TRNS —  Transparency
+TROT —  Texture rotation
+GLOW —  Glow
+
+*  —  Multiplication
+\  —  Division
+  —  Addition
+-  —  Subtraction
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 35ecc6e..d60f985 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -213,6 +213,6 @@
         border_visible="false" border_drop_shadow_visible="false"
         font="SansSerifSmall" mouse_opaque="true"
         hover="true" hover_color="50 115 185">
-    [CHANNEL] [VERSION]
+    [VERSION]
   </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index fbd605f..b589a1d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -1,122 +1,176 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Advanced" left="102" mouse_opaque="true"
      name="advanced_panel" width="517">
-  <!-- Start organizing these when we get enough of 'em - MC -->
-  <!-- The time is now! Chris Tuchs -->
+
   <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false"
-   name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+      name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+    
     
     <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Main" left="102" mouse_opaque="true"
-     name="main_panel" width="517">
-      <check_box bottom="-30" enabled="true"
+         height="408" label="Main" left="102" mouse_opaque="true"
+         name="main_panel" width="517">
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="user_interface_text" v_pad="0" width="394">
+        User Interface:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16"
-           initial_value="false" label="Disable login/logout screens" left="12"
+           initial_value="false" label="Disable login/logout screens" left_delta="30"
            mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
            width="217" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
                  font="SansSerifSmall" height="16" initial_value="false"
-                 label="Disable teleport screen" left="12" mouse_opaque="true"
+                 label="Disable teleport screen" left="270" mouse_opaque="true"
                  name="disable_tp_screen_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show WindLight toolbar" left="50"  mouse_opaque="true"
+           name="toggle_windlight_control" radio_style="false" width="237"
+           control_name="EnableWindlightRemote" />
+      <check_box bottom_delta="-18" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Use legacy pie menus" left_delta="0"
+           mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
+           width="256" />
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />      
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="avatar_text" v_pad="0" width="394">
+        Avatar:
+      </text>
+      
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-          label="Show client names in nametags" left="12" mouse_opaque="true"
+          label="Show client names in nametags" left_delta="30" mouse_opaque="true"
           name="client_name_tag_check" radio_style="false" width="160" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
+           label="Show client names in hovertip" left="270" mouse_opaque="true"
            name="client_name_hover_check" radio_style="false" width="160" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Show your client name to others" left_delta="0" mouse_opaque="true"
+           label="Show your client name to others" left="50" mouse_opaque="true"
            name="client_name_tag_broadcast_check" radio_style="false" width="217" />
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-122"
-           can_apply_immediately="true" color="0.79 0.44 0.88 1"
-           enabled="true" follows="left|top"
-           height="65" label="Imprudence" left="250" mouse_opaque="true"
-           name="client_tag_color" width="65" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           label="Show client names with color" left_delta="0" mouse_opaque="true"
-           name="client_name_color_check" radio_style="false" width="160" />
-      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
-           name="shadows_check" radio_style="false" width="217" />
-      <text bottom_delta="-25" left="16" height="15" width="300"
-           follows="top|left">
-          Allow region WindLight settings (LightShare):
-      </text>
-      <combo_box name="lightshare_combo"
-                 bottom_delta="-2" left_delta="250" height="18" width="135"
-                 allow_text_entry="false" follows="left|top">
-        <combo_item type="string" name="never" value="0">
-          Never
-        </combo_item>
-        <combo_item type="string" name="ask" value="1">
-          Ask me every time
-        </combo_item>
-        <combo_item type="string" name="always" value="2">
-          Always
-        </combo_item>
-      </combo_box>
-      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           label="Use HTTP texture fetching (experimental)" left="12" mouse_opaque="true"
-           name="http_texture_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Increase rez speed via draw distance stepping" left="12" mouse_opaque="true"
-           name="speed_rez_check" radio_style="false" width="217" />
-      <spinner bottom_delta="-18" decimal_digits="0"
-           tool_tip="Interval in seconds between each draw distance increment"
-           follows="left|top" height="16" increment="1" initial_val="12"
-           label="Step interval every:" label_width="105" left_delta="20" max_val="20"
-           min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
-      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
-                 name="speed_rez_seconds_text" width="115">
-        seconds
-      </text>
-      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           tool_tip="Toggle editing animation and standing up when entering appearance mode" 
-           label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
+           tool_tip="Toggle editing animation and standing up when entering appearance mode"
+           label="Animate avatar when editing appearance" left_delta="0" mouse_opaque="true"
            name="appearance_anim_check" radio_style="false" width="217" />
-      <check_box bottom_delta="-25" control_name="HeadFollowsMouse" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" 
-           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left="12"
+      <check_box bottom_delta="-18" control_name="HeadFollowsMouse" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16"
+           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left_delta="0"
            mouse_opaque="true" name="head_follows_mouse_checkbox" radio_style="false"
            width="256" />
-      <check_box bottom_delta="-25" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-           label="Use legacy pie menus" left="12"
-           mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
-           width="256" />
-      <check_box bottom_delta="-25" enabled="true"
+      <check_box bottom_delta="-18" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-           initial_value="false" label="Share language with objects" left="12"
+           initial_value="false" label="Share language with objects" left_delta="0"
            mouse_opaque="true" name="language_is_public"
            radio_style="false" tool_tip="This lets in-world objects know your preferred language."
            width="256" />
-      <check_box bottom_delta="-25" enabled="true"
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
+           left_delta="0" mouse_opaque="true" name="automatic_fly" radio_style="false"
+           width="178" />
+      <check_box bottom_delta="-18" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Arrow keys always move avatar when chatting" left_delta="0"
+           mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
+           width="237" />
+
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="chat_text" v_pad="0" width="394">
+        Chat:
+      </text>
+
+      <check_box bottom_delta="-25" control_name="ScriptErrorsAsChat" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Show script errors and warnings as regular chat" left_delta="30"
+           mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
+           width="275" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show timestamps with messages" left_delta="0" mouse_opaque="true"
+           name="show_timestamps_check" radio_style="false" width="237" />
+      <check_box bottom_delta="-18" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-           initial_value="false" label="Use MU* pose style chat and IM" left="12"
+           initial_value="false" label="Use MU* pose style chat and IM" left_delta="0"
            mouse_opaque="true" name="allow_mupose"
            radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
            width="256" />
       <check_box bottom_delta="0" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-           initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
+           initial_value="false" label="Auto-close OOC (( )) chat" left="270"
            mouse_opaque="true" name="auto_close_ooc"
            radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
            width="256" />
-      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-           initial_value="false" label="Use the chatbar as a command line" left="12"
-           mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
-      <button bottom_delta="-20" follows="left|top" font="SansSerif" height="20" width="150"
-           label="Chatbar Commands" name="command_line_btn" left="12"
-           tool_tip="Set specific chatbar command line commands here" />
+      
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="textbox" v_pad="0" width="394">
+        World:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left_delta="30" mouse_opaque="true"
+           name="shadows_check" radio_style="false" width="217" />
+      <text bottom_delta="-25" left_delta="0" height="15" width="300"
+           follows="top|left" name="lightshare_text">
+        Allow region WindLight settings (LightShare):
+      </text>
+      <combo_box name="lightshare_combo"
+                 bottom_delta="-2" left="275" height="18" width="160"
+                 allow_text_entry="false" follows="left|top">
+        <combo_item type="string" name="never" value="0">
+          Never
+        </combo_item>
+        <combo_item type="string" name="ask" value="1">
+          Ask me every time
+        </combo_item>
+        <combo_item type="string" name="always" value="2">
+          Always
+        </combo_item>
+      </combo_box>
 
   <!-- Uncomment when we start using the crash logger - MC -->
   <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -138,69 +192,33 @@
       Never send
     </combo_item>
   </combo_box>-->
+      
 
     </panel>
     
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
-       left="1" mouse_opaque="true" name="SpellCheck" width="418">
-      <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
-         name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
-         right="490" width="18"/>
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         label="Show misspelled words in red" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
-         control_name="EmeraldSpellDisplay" width="126"/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt1" width="512">
-        Current language (dictionary):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
-         control_name="EmeraldSpellBase" tool_tip=""/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt3" width="512">
-        Downloaded languages (dictionaries):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
-         control_name="EmSpell_Avail" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
-         name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
-      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
-         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt2" width="512">
-        Additional custom languages (dictionaries):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
-         control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
-         name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
-      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
-         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt4" width="512">
-To use spellcheck, right-click a misspelled word
-(red or otherwise) and select its replacement
-      </text>
-      <button name="ac_button" label="AutoCorrect Options..." halign="center"
-         tool_tip="Modify the AutoCorrect word list and settings" left="12"
-         bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
-    </panel>
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Eye Candy"
+    
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Avatar Cloud"
        left="1" mouse_opaque="true"  filename="panel_particle_settings.xml" name="AvatarCloud" width="418">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-                font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
-                You must be logged in to change this
-        </text>
-        <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16"
-             label="Preview avatar as cloud" left="10"
-             mouse_opaque="true" name="preview_cloud"
-             radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
-             width="80" />
+      
+      
+            <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                    bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+                    font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                    mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
+                    You must be logged in to change this
+            </text>
+            <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16"
+                 label="Preview avatar as cloud" left="10"
+                 mouse_opaque="true" name="preview_cloud"
+                 radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
+                 width="80" />
+      
+      
     </panel>
+    
+    
   </tab_container>
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 355d7e8..5a94d6a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -1,93 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
      name="Media panel" width="517">
+  
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
              mouse_opaque="true" name="muting_text" v_pad="0" width="128">
                 Volume:
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
-                Streaming:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
-                Audio:
-        </text>
-        <panel border="true" bottom="-187" enabled="true" filename="panel_audio.xml"
-             follows="left|top|right|bottom" height="180" label="Volume" left="148"
+  
+  <panel border="true" bottom_delta="-180" enabled="true" filename="panel_audio.xml"
+             follows="left|top|right|bottom" height="180" label="Volume" left_delta="30"
              mouse_opaque="true" name="Volume Panel" width="260" />
-        <check_box bottom="-205" control_name="AudioStreamingMusic" enabled="true"
+
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+             mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
+    Streaming:
+  </text>
+
+  <check_box bottom_delta="-25" control_name="AudioStreamingMusic" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play streaming music when available (uses more bandwidth)"
-             left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
+             left_delta="30" mouse_opaque="true" name="streaming_music" radio_style="false"
              width="339" />
   <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Show stream info in chat" left="162" mouse_opaque="true"
+             label="Show stream info in chat" left_delta="30" mouse_opaque="true"
        name="show_stream_title" radio_style="false" width="338" />
-        <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
+  <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play Streaming Media When Available (uses more bandwidth)"
-             left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
+             left_delta="-30" mouse_opaque="true" name="streaming_video" radio_style="false"
              width="338" />
-        <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
+  <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Automatically play media" left="162"
+             initial_value="true" label="Automatically play media" left_delta="30"
              mouse_opaque="true" name="auto_streaming_video" radio_style="false"
              width="338" />
-        <check_box bottom_delta="-20" control_name="MediaOnAPrimUI" enabled="true"
+  <check_box bottom_delta="-20" control_name="MediaOnAPrimUI" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Media helper widget" left="162"
+             initial_value="true" label="Media helper widget" left_delta="0"
              mouse_opaque="true" name="media_helper_widget" radio_style="false"
-             width="338" />     
-        <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+             width="338" />
+  <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Filter media URLs" left="142"
+             initial_value="true" label="Filter media URLs" left_delta="-30"
              mouse_opaque="true" name="enable_media_filter" radio_style="false"
              width="200" />
-        <button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
+  <button name="show_media_filter" font="SansSerifSmall" label="Media Filter Settings" halign="center"
              tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
-             enabled="false" mouse_opaque="true" follows="top|right"
-             bottom_delta="-2" right="-15" height="20" width="180" />
-        <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
+             enabled="false" mouse_opaque="true" follows="left|top"
+             bottom_delta="-2" left="270" height="20" width="160" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+             mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
+    Audio:
+  </text>
+
+        <check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Mute audio when window minimized" left="142" mouse_opaque="true"
+             label="Mute audio when minimized" left_delta="30" mouse_opaque="true"
              name="mute_when_minimized" radio_style="false" width="215" />
   <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="10"
-             initial_val="10" label="[CURRENCY] change threshold:" label_width="158" left="148"
+             initial_val="10" label="[CURRENCY] sound threshhold:" label_width="138" left_delta="0"
              max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
-             width="212" />
+             width="192" />
   <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             increment="10" initial_val="20" label="Health change threshold:"
-             label_width="158" left="148" max_val="10000" min_val="0"
-             mouse_opaque="true" name="Health change threshold" width="212" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-       mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128">
-    Ambient:
-  </text>
-  <check_box bottom_delta="-4" enabled="true" follows="left|top"
+             increment="10" initial_val="20" label="Health sound threshold:"
+             label_width="138" left_delta="0"  max_val="10000" min_val="0"
+             mouse_opaque="true" name="Health change threshold" width="192" />
+  <check_box bottom_delta="40" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Enable wind generation" left="142" mouse_opaque="true"
+       label="Enable wind generation" left="270" mouse_opaque="true"
        name="mute_wind_check" radio_style="false" width="217" />
   <slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
        enabled="true" follows="left|top" height="15" increment="0.1"
-       initial_val="1" label="Doppler effect:" label_width="100" left="148"
+       initial_val="1" label="Doppler effect:" label_width="100" left_delta="0"
        max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
-       show_text="true" width="250" />
+       show_text="true" width="200" />
   <slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
              enabled="true" follows="left|top" height="15" increment="0.1"
-             initial_val="1" label="Rolloff factor:" label_width="100" left="148"
+             initial_val="1" label="Rolloff factor:" label_width="100" left_delta="0"
              max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
-             show_text="true" width="250" />
+             show_text="true" width="200" />
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 9ead3bf..e14442a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -1,196 +1,358 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Chat" left="102" mouse_opaque="true" name="chat"
     width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box" v_pad="0" width="128">
-                Font Size:
-        </text>
-        <radio_group bottom="-40" draw_border="true" enabled="true"
-             follows="left|top" height="30" left="148" mouse_opaque="true"
-             name="chat_font_size" width="331">
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
-                     name="radio" width="98">
-                        Small
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
-                     name="radio2" width="98">
-                        Medium
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
-                     name="radio3" width="98">
-                        Large
-                </radio_item>
-        </radio_group>
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
-    Translate Chat:
-  </text>
-  <check_box bottom_delta="-3" control_name="TranslateChat" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
-             name="translate_chat" radio_style="false" width="237" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
-             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
-    Translate into this language:
-  </text>
-  <combo_box allow_text_entry="true" bottom_delta="-5" enabled="true"
-             follows="left|top" height="16" left_delta="183" max_chars="135"
-             mouse_opaque="true" name="translate_language_combobox" width="146">
-    <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-      System Default
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="English" value="en">
-      English
-    </combo_item>
-
-    <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
-
-    <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-      Dansk (Danish)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-      Deutsch (German)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-      Español (Spanish)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
-      Français (French)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-      Italiano (Italian)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-      Magyar (Hungarian)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-      Nederlands (Dutch)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-      Polski (Polish)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-      Portugués (Portuguese)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
-      Русский (Russian)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-      Türkçe (Turkish)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
-      Українська (Ukrainian)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-      中文 (简体) (Chinese)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-      日本語 (Japanese)
-    </combo_item>
-    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-      한국어 (Korean)
-    </combo_item>
-  </combo_box>
+
+  <tab_container bottom="0" height="450" left="0" mouse_opaque="false"
+      name="chattab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+
+
+    <!-- CHAT OPTIONS PANEL -->
+
+
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+           height="408" label="Chat &amp; IMs" left="102" mouse_opaque="true"
+           name="chat_panel" width="517">
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="text_box" v_pad="0" width="128">
+        Chat Text Size:
+      </text>
+
+      <combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top"
+           height="16" left_delta="30" max_chars="100" mouse_opaque="true"
+           name="chat_font_size" width="160">
+        <combo_item type="string" length="1" enabled="true" name="0" value="0">
+          Small
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="1" value="1">
+          Medium
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="2" value="2">
+          Large
+        </combo_item>
+      </combo_box>
+      
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+          height="1" left="55" name="border" width="380" />
+      
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="text_box3" v_pad="0" width="135">
+        Chat Console:
+      </text>
+      <spinner bottom_delta="-25" control_name="ChatPersistTime" decimal_digits="0"
+                 enabled="true" follows="left|top" height="16" increment="1"
+                 initial_val="10" label="Fade chat after" label_width="80" left_delta="30"
+                 max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
+                 width="130" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="6" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="135" mouse_opaque="false" name="text_box4" v_pad="0"
+                 width="80">
+        seconds and
+      </text>
+      <spinner bottom_delta="-6" decimal_digits="0"
+                 enabled="true" follows="left|top" height="16" increment="1"
+                 initial_val="10" left_delta="82" max_val="50" min_val="1" mouse_opaque="true"
+                 name="max_chat_count" width="60" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="6" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="65" mouse_opaque="false" name="text_box5" v_pad="0"
+                 width="60">
+        lines
+      </text>
+      
+      <slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
+                 decimal_digits="3" enabled="true" follows="left|top" height="12"
+                 increment="0.05" initial_val="1" label="Console opacity:" left="50" max_val="1"
+                 min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
+                 value="0.4" width="200" />
+      <check_box bottom_delta="-4" control_name="ChatFullWidth" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Full screen width (requires restart)" left="270"
+                 mouse_opaque="true" name="chat_full_width_check" radio_style="false"
+                 width="239" />
+      
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+          height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+         font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+         mouse_opaque="false" name="text_box7" v_pad="0" width="128">
+        Chat Bubbles:
+      </text>
+      
+      <check_box bottom_delta="-25" control_name="UseChatBubbles" enabled="true" follows="left|top"
+                 font="SansSerifSmall" height="16" initial_value="false"
+                 label="Show chat bubbles" left_delta="30" mouse_opaque="true"
+                 name="bubble_text_chat" radio_style="false" width="237" />
+      <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
+                 font="SansSerifSmall" height="16" initial_value="false"
+                 label="Show local chat and bubbles" left="270" mouse_opaque="true"
+                 name="local_bubble_text_chat" radio_style="false" width="237" />
+      <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
+                 decimal_digits="3" enabled="true" follows="left|top" height="12"
+                 increment="0.05" initial_val="1" label="Bubble opacity:" left="50" max_val="1"
+                 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
+                 value="0.5" width="200" />
+      
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+          height="1" left="55" name="border" width="380" />
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                  bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="text_box6" v_pad="0" width="135">
+        Chatbar:
+      </text>
+
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Close chatbar after hitting return" left_delta="30" mouse_opaque="true"
+           name="close_chat_on_return_check" radio_style="false" width="237" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show custom chat channel" left="270" mouse_opaque="true"
+           name="toggle_channel_control" radio_style="false" width="237" />
+      <check_box bottom_delta="-20" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+                 label="Play typing animation when chatting" left="50" mouse_opaque="true"
+                 name="play_typing_animation" radio_style="false" width="237" />
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Use the chatbar as a command line" left="50"
+           mouse_opaque="true" name="command_line_check" radio_style="false" width="250"/>
+      <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="20" width="160"
+           label="Chatbar Commands" name="command_line_btn" left="270"
+           tool_tip="Set specific chatbar command line commands here" />
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                  bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="Instant Messages:" v_pad="0" width="135">
+        Instant Messages:
+      </text>
+
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+           height="16" initial_value="false" label="Send offline IMs to email ([EMAIL])"
+           left_delta="30" mouse_opaque="true" name="send_im_to_email" radio_style="false"
+           width="350" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+           mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
+        Show IMs in:
+      </text>
+      <check_box bottom_delta="-6" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Main chat" left="150" mouse_opaque="true"
+           name="include_im_in_chat_console" radio_style="false" width="100" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Local Chat window" left="270" mouse_opaque="true"
+           name="include_im_in_chat_history" radio_style="false" width="100" />
+      <check_box bottom_delta="-20" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Vertical IM tabs (requires restart)" left="50" mouse_opaque="true"
+           name="vertical-imtabs-toggle" radio_style="false" width="270" />
+
+
+    </panel>
+    
+    
+    <!-- SPELL CHECKING AND TRANSLATE PANEL -->
+
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Spell Checking &amp; Translate"
+         left="1" mouse_opaque="true" name="spell_check_tab" width="418">
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="false" name="text_box" v_pad="0" width="128">
+        Spell Checking:
+      </text>
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+         label="Enable spell checking" left_delta="30" mouse_opaque="true" name="EmeraldSpellDisplay"
+         control_name="EmeraldSpellDisplay" width="126"/>
+      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="30"
+         name="EmSpell_txt4" width="512">
+        Right-click a misspelled/red-underlined word to correct
+      </text>
+
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="-30"
+         name="EmSpell_txt1" width="512">
+        Current language (dictionary):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
+         control_name="EmeraldSpellBase" tool_tip=""/>
+
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+         name="EmSpell_txt3" width="512">
+        Downloaded languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
+         control_name="EmSpell_Avail" tool_tip=""/>
+
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+         name="EmSpell_Add" tool_tip="" left_delta="255" width="110"/>
+
+      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
+         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="50" width="250"/>
+
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+         name="EmSpell_txt2" width="512">
+        Additional custom languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
+         control_name="EmSpell_Installed" tool_tip=""/>
+
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+         name="EmSpell_Remove" tool_tip="" left_delta="255" width="110"/>
+
+      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
+
+      <button name="ac_button" label="AutoCorrect..." halign="center"
+         tool_tip="Modify the AutoCorrect word list and settings" left="50"
+         bottom_delta="-40" width="160" height="20" font="SansSerifSmall" follows="left|top"/>
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="false" name="text_translate" v_pad="0" width="128">
+        Translate Chat:
+      </text>
+      <check_box bottom_delta="-25" control_name="TranslateChat" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Use machine translation while chatting (powered by Google)" left_delta="30" mouse_opaque="true"
+           name="translate_chat" radio_style="false" width="237" />
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+           mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+        Translate into this language:
+      </text>
+
+      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true"
+           follows="left|top" height="16" left="270" max_chars="135"
+           mouse_opaque="true" name="translate_language_combobox" width="160">
+        <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+          System Default
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="English" value="en">
+          English
+        </combo_item>
+
+        <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+
+        <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+          Dansk (Danish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+          Deutsch (German)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+          Español (Spanish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+          Français (French)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+          Italiano (Italian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+          Magyar (Hungarian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+          Nederlands (Dutch)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+          Polski (Polish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+          Portugués (Portuguese)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+          Русский (Russian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+          Türkçe (Turkish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+          Українська (Ukrainian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+          中文 (简体) (Chinese)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+          日本語 (Japanese)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+          한국어 (Korean)
+        </combo_item>
+      </combo_box>
+
+
+      <button bottom="-20" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
+             right="490" width="18"/>
+
+
+    </panel>
+    
+    
+  </tab_container>
+  
   
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box3" v_pad="0" width="135">
-                Chat Console:
-        </text>
-        <spinner bottom_delta="-8" control_name="ChatPersistTime" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="10" label="Fade chat after" label_width="80" left="148"
-             max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
-             width="130" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="6" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="282" mouse_opaque="false" name="text_box4" v_pad="0"
-             width="80">
-                (seconds)
-        </text>
-        <spinner bottom_delta="-6" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="10" left="340" max_val="50" min_val="1" mouse_opaque="true"
-             name="max_chat_count" width="60" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="6" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="405" mouse_opaque="false" name="text_box5" v_pad="0"
-             width="60">
-                (# lines)
-        </text>
-        <slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
-             decimal_digits="3" enabled="true" follows="left|top" height="12"
-             increment="0.05" initial_val="1" label="Console opacity:" left="148" max_val="1"
-             min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
-             value="0.4" width="225" />
-        <check_box bottom_delta="-25" control_name="ChatFullWidth" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Use full screen width  (requires restart)" left="148"
-             mouse_opaque="true" name="chat_full_width_check" radio_style="false"
-             width="239" />
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
-    Chat Bubbles:
-  </text>
-  <check_box bottom_delta="-8" control_name="UseChatBubbles" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show chat bubbles" left="148" mouse_opaque="true"
-             name="bubble_text_chat" radio_style="false" width="237" />
-  <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show local chat and bubbles" left="288" mouse_opaque="true"
-             name="local_bubble_text_chat" radio_style="false" width="237" />
-  <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
-             decimal_digits="3" enabled="true" follows="left|top" height="12"
-             increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
-             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
-             value="0.5" width="225" />
+  <string name="log_in_to_change">
+    log in to change
+  </string>
+  <string name="default_email_used">
+    using default address
+  </string>
   
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-              bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box6" v_pad="0" width="135">
-    Miscellaneous:
-  </text>
-        <check_box bottom_delta="-8" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Close chat bar after hitting return" left="148" mouse_opaque="true"
-             name="close_chat_on_return_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Arrow keys always move avatar when chatting" left="148"
-             mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
-             width="237" />
-        <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
-             name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-18" control_name="ScriptErrorsAsChat" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show script errors and warnings as regular chat" left="148"
-             mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
-             width="275" />
-        <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Play typing animation when chatting" left="148" mouse_opaque="true"
-             name="play_typing_animation" radio_style="false" width="237" />
-        <check_box bottom_delta="-18" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" 
-             label="Show custom chat channel" left="148" mouse_opaque="true"
-             name="toggle_channel_control" radio_style="false" width="237" />
 
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 40a75a6..9b55822 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -1,115 +1,152 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-    height="408" label="Chat Colors" left="102" mouse_opaque="true" name="colors"
+    height="408" label="Colors" left="102" mouse_opaque="true" name="colors"
     width="517">
+
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+        mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
+    Selection Beam Color:
+  </text>
+  
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
+             can_apply_immediately="false" color="1 1 1 1"
+             enabled="true" follows="left|top" height="65" label="" left="50"
+             mouse_opaque="true" name="effect_color_swatch"
+             tool_tip="Click to open Color Picker" width="65" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270"
+        mouse_opaque="true" name="client_tag_color_textbox" v_pad="0" width="394">
+    Client Tag Color:
+  </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
+       can_apply_immediately="true" color="0.79 0.44 0.88 1"
+       enabled="true" follows="left|top"
+       height="65" label="Imprudence" left_delta="30" mouse_opaque="true"
+       name="client_tag_color" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Color client tags" left_delta="76" mouse_opaque="true"
+       name="client_name_color_check" radio_style="false" width="160" />
+  
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top"
+       height="1" left="55" name="border" width="380" />  
+  
+  
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
              mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-    Chat Colors:
+    Chat:
   </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-             enabled="true" follows="left|top" height="65" label="Your chat" left="120"
+             enabled="true" follows="left|top" height="65" label="Your chat" left="50"
              mouse_opaque="true" name="user" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
              enabled="true" follows="left|top" height="65" label="Others' chat" left_delta="76"
              mouse_opaque="true" name="agent" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0.6 0.6 1 1"
              enabled="true" follows="left|top" height="65" label="IMs" left_delta="76"
              mouse_opaque="true" name="im" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0.8 1 1 1"
              enabled="true" follows="left|top"
              height="65" label="System" left_delta="76" mouse_opaque="true"
              name="system" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0.82 0.82 0.99 1"
              control_name="ScriptErrorColor" enabled="true" follows="left|top"
              height="65" label="Script errors" left_delta="76" mouse_opaque="true"
              name="script_error" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="65" label="Object chat" left="120" mouse_opaque="true"
+             height="65" label="Object chat" left="50" mouse_opaque="true"
              name="objects" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
        control_name="ObjectIMColor" enabled="true" follows="left|top"
              height="65" label="Object IMs" left_delta="76" mouse_opaque="true"
        name="object_ims" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              enabled="true" follows="left|top"
              height="65" label="Owner chat" left_delta="76" mouse_opaque="true" name="owner"
              width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0 0 0 1"
              enabled="true" follows="left|top"
              height="65" label="Bubble chat" left_delta="76" mouse_opaque="true"
              name="background" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
              can_apply_immediately="true" color="0.6 0.6 1 1"
              enabled="true" follows="left|top" height="65"
              label="Links" left_delta="76" mouse_opaque="true" name="links" width="65" />
+  
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-85"
+       can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
+       enabled="true" follows="left|top" height="65" label="Friends" left="50"
+       mouse_opaque="true" name="FriendsChatColor" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="true" label="Highlight chat from friends" left_delta="76"
+       mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
 
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
-    Line Highlighting:
-  </text>
-
-  <check_box bottom_delta="-7" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-      initial_value="true" label="Highlight chat from friends" left="120"
-      mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
-      can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
-      enabled="true" follows="left|top" height="65" label="Friends" left_delta="20"
-      mouse_opaque="true" name="FriendsChatColor" width="65" />
-
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-     font="SansSerifSmall" height="16" initial_value="true"
-     label="Highlight local chat containing your name" left="120" mouse_opaque="true"
-     name="HighlightOwnNameInChat" radio_style="false" width="217" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-121"
+       can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
+       enabled="true" follows="left|top" height="65" label="Your name" left="50"
+       mouse_opaque="true" name="OwnNameChatColor" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="true"
+       label="Highlight local chat containing your name and/or nicknames:" left_delta="76" mouse_opaque="true"
+       name="HighlightOwnNameInChat" radio_style="false" width="217" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-      initial_value="true" label="Highlight group chat containing your name" left_delta="0"
-      mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
-      can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
-      enabled="true" follows="left|top" height="65" label="Your name" left_delta="20"
-      mouse_opaque="true" name="OwnNameChatColor" width="65" />
+       initial_value="true" label="Highlight group chat containing your name and/or nicknames:" left_delta="0"
+       mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
 
-  <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20" 
-      left="140" name="nick01_text" width="150">
-    Highlight nickname 1:
-  </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
-      enabled="true" follows="left|top" font="SansSerif"
-      handle_edit_keys_directly="true" height="20" left_delta="125"
+
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-22"
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 1"
+      handle_edit_keys_directly="true" height="18" left_delta="0"  
       max_length="50" mouse_opaque="true" name="nick01"
-      select_all_on_focus_received="true" width="160" word_wrap="false" />
+      select_all_on_focus_received="true" width="110" word_wrap="false" />
 
-  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20" 
-      left="140" name="nick02_text" width="150">
-    Highlight nickname 2:
-  </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
-      enabled="true" follows="left|top" font="SansSerif"
-      handle_edit_keys_directly="true" height="20" left_delta="125"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 2"
+      handle_edit_keys_directly="true" height="18" left_delta="120"
       max_length="50" mouse_opaque="true" name="nick02"
-      select_all_on_focus_received="true" width="160" word_wrap="false" />
+      select_all_on_focus_received="true" width="110" word_wrap="false" />
 
-  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
-      left="140" name="nick03_text" width="150">
-    Highlight nickname 3:
-  </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
-      enabled="true" follows="left|top" font="SansSerif"
-      handle_edit_keys_directly="true" height="20" left_delta="125"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 3"
+      handle_edit_keys_directly="true" height="18" left_delta="120"
       max_length="50" mouse_opaque="true" name="nick03"
-      select_all_on_focus_received="true" width="160" word_wrap="false" />
+      select_all_on_focus_received="true" width="110" word_wrap="false" />
+
 
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
index c64ce9f..cd896b8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -1,15 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
-<panel name="font_panel" label="Fonts"
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
+<panel name="fonts_panel" label="Fonts"
        bottom="-409" left="102" height="408" width="517"
        border="true" follows="left|top|right|bottom">
 
-  <text bottom="-25" left="10" height="15" width="300">
-    User interface font (requires restart):
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="fontselect" v_pad="0" width="128" font-style="BOLD|SHADOW">
+    Select UI Font:
+  </text>
+  <text font="SansSerifSmall" bottom="-22" left_delta="80" height="12" name="(requires restart)" width="300">
+    (requires restart)
   </text>
 
   <radio_group name="fonts" draw_border="false"
-               top="-30" left="20" bottom="0" right="-20"
+               top="-30" left="50" bottom="0" right="-20"
                follows="top|left|bottom|right">
 
     <radio_item name="DroidSans" bottom="-20" left="0" height="20">
@@ -48,12 +68,37 @@
 
 
   <spinner name="font_mult" label="Font size multiplier:" label_width="130"
-           bottom="-280" left="20" height="16" width="180" follows="left|top"
+           bottom_delta="150" left="50" height="16" width="180" follows="left|top"
            decimal_digits="2" increment="0.01" max_val="3.0" min_val="0.1"
            tool_tip="Multiply all font sizes by this amount." />
 
   <check_box name="font_round" follows="left|top"
-             bottom="-300" left="20" height="16" width="300"
+             bottom_delta="-20" left_delta="0" height="16" width="300"
              label="Force integer font sizes (may fix blurry fonts)" />
 
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="UI Size:" v_pad="0" width="128" font-style="BOLD|SHADOW">
+    UI Size:
+  </text>
+  
+  <slider bottom_delta="22" can_edit_text="true" label_width="0" label=""
+             decimal_digits="3" enabled="true" height="16" increment="0.001"
+             initial_val="1" left="50" max_val="1.4" min_val="0.75" mouse_opaque="true"
+             name="ui_scale_slider" show_text="true" value="1" width="160" />
+  <button bottom_delta="-48" enabled="true" follows="left|top"
+             font="SansSerifSmall" halign="center" height="20" label="Reset to Default"
+             left="270" mouse_opaque="true"
+             name="reset_ui_size" scale_image="true" width="160" />
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use resolution independent scale" left="50" mouse_opaque="true"
+             name="ui_auto_scale" radio_style="false" width="256" />
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 8b354b4..e96def5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -1,18 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="General" left="102" mouse_opaque="true"
      name="general_panel" width="517">
+  
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW" 
              mouse_opaque="true" name="start_location_textbox" v_pad="0" width="394">
-                Start Location:
+                Default Start Location:
         </text>
         <string name="region_name_prompt">
                 &lt;Type region name&gt;
         </string>
   <combo_box name="default_location_combo"
-             bottom="-22" left="155" height="16" width="150"
+             bottom_delta="-25" left="50" height="16" width="160"
              follows="left|top" font="SansSerifSmall"
              mouse_opaque="true" allow_text_entry="true" max_chars="128">
     <combo_item name="MyHome" value="My Home">
@@ -26,153 +43,122 @@
     </combo_item>
   </combo_box>
   <button name="grid_btn" label="Grid Manager"
-          bottom_delta="-3" left="330" height="20" width="100"
+          bottom_delta="-3" left="270" height="20" width="160"
           follows="left|top" font="SansSerifSmall" halign="center"
                       mouse_opaque="true" scale_image="TRUE" />
-  <check_box bottom="-44" enabled="true" follows="left|top"
+  <check_box bottom_delta="-17" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="true"
-       label="Show start location at login screen" left="151" mouse_opaque="true"
+       label="Show at login screen" left="50" mouse_opaque="true"
        name="show_location_checkbox" radio_style="false" width="256" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+       height="1" left="55" name="border" width="380" />
+  
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
              mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
                 Nametags:
         </text>
-        <combo_box bottom_delta="0" follows="left|top" height="18" left="155"
-             mouse_opaque="true" name="fade_out_combobox" width="146">
+        <combo_box bottom_delta="-30" follows="left|top" height="18" left="50"
+             mouse_opaque="true" name="fade_out_combobox" width="160">
                 <combo_item name="Never" value="Never">
-                        Never show
+                        Never show nametags
                 </combo_item>
                 <combo_item name="Show Temporarily" value="Show Temporarily">
-                        Temporarily show
+                        Briefly show nametags
                 </combo_item>
                 <combo_item name="Always" value="Always">
-                        Always show
+                        Always show nametags
                 </combo_item>
         </combo_box>
         <check_box bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true"
-             label="Small avatar names" left="330" name="small_avatar_names_checkbox"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Large nametags" left="270" name="large_avatar_names_checkbox"
              width="200" />
         <check_box bottom_delta="-20" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
+             label="Hide my nametag" left="50" name="show_my_name_checkbox"
              width="200" />
-
-        <check_box bottom_delta="-20" follows="left|top"
+        <check_box bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Highlight friends tags" left="151" name="highlight_friends_checkbox"
+             label="Bold my friends' nametags" left="270" name="highlight_friends_checkbox"
              width="200" />
-        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
-             halign="left" height="16" left="10" name="Display_Names_textbox" v_pad="0"
-             width="394">
+  <check_box bottom_delta="-20" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Hide group titles in nametags" left="50" mouse_opaque="true"
+       name="show_all_title_checkbox" radio_style="false" width="256" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+       height="1" left="55" name="border" width="380" />
+  
+
+        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="10" left="20" name="Display_Names_textbox" v_pad="0"
+             width="394" font-style="BOLD|SHADOW">
                 Display Names:
         </text>
         <radio_group name="displaynames" draw_border="false"
-               bottom_delta="0" left_delta="60" height="18"
+               bottom_delta="-30" left="50" height="18"
                follows="top|left"
                control_name="DisplayNamesUsage">
-                <radio_item name="0" bottom_delta="-8" left_delta="40" height="18">
-                Legacy Names
+                <radio_item name="0" bottom_delta="-8" left="0" height="18">
+                Show legacy names
                 </radio_item>
-                <radio_item name="1" bottom_delta="0" left_delta="50" height="18">
-                Display Names
+                <radio_item name="1" bottom_delta="0" left_delta="70" height="18">
+                Show display names
                 </radio_item>
-                <radio_item name="2" bottom_delta="0" left_delta="50" height="18">
+                <radio_item name="2" bottom_delta="0" left_delta="70" height="18">
                 Show Both
                 </radio_item>
         </radio_group>
-        <check_box bottom_delta="-20" follows="left|top" control_name="LegacyNamesForFriends"
+        <check_box bottom_delta="-17" follows="left|top" control_name="LegacyNamesForFriends"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show legacy names for friends" left="151" name="legacy_friends_checkbox"
+             label="Show legacy names for friends" left="50" name="legacy_friends_checkbox"
              width="200" />
-        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
-             halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
-             width="394">
-                Group Titles:
-        </text>
-        <check_box bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide all group titles" left="151" mouse_opaque="true"
-             name="show_all_title_checkbox" radio_style="false" width="256" />
-        <check_box bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide my group title" left="330" name="show_my_title_checkbox"
-             radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-                Selection Beam Color:
-        </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
-             can_apply_immediately="false" color="1 1 1 1"
-             enabled="true" follows="left|top" height="55" label="" left="153"
-             mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="45" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+        height="1" left="55" name="border" width="380" />
+  
+
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
-    UI Size:
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
+       mouse_opaque="true" name="afk_textbox" v_pad="0" width="394">
+    Idle Away:
   </text>
-  <slider bottom_delta="42" can_edit_text="true"
-             decimal_digits="3" enabled="true" height="16" increment="0.001"
-             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom_delta="-48" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Reset"
-             label_selected="Reset" left_delta="226" mouse_opaque="true"
-             name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom_delta="-14" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use resolution independent scale" left="151" mouse_opaque="true"
-             name="ui_auto_scale" radio_style="false" width="256" />
-  <spinner bottom_delta="-24" decimal_digits="0" enabled="true"
-             follows="left|top" height="16" increment="1" initial_val="300"
-             label="Away Timeout:" label_width="141" left="10" max_val="600"
-             min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="6" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
-             mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
-                seconds
-        </text>
-    <check_box bottom_delta="-5" enabled="true" follows="left|top"
-                   font="SansSerifSmall" height="16" initial_value="false"
-                   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
-                   name="afk_timeout_checkbox" radio_style="false" width="256" />
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Go Away/AFK when idle after" left="50" mouse_opaque="true"
+       name="afk_timeout_checkbox" radio_style="false" width="256" />
+  <spinner bottom_delta="0" decimal_digits="0" enabled="true"
+             follows="left|top" height="16" increment="1" initial_val="5"
+             label="" label_width="0" left="270" max_val="360"
+             min_val="1" mouse_opaque="true" name="afk_timeout_spinner" width="50" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-       mouse_opaque="true" name="Mini-Map Notify:" v_pad="0" width="128">
-    Mini-Map Notify:
+       bottom_delta="5" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="55"
+       mouse_opaque="true" name="minutes_textbox" v_pad="0" width="128">
+    minute(s)
   </text>
-  <check_box bottom_delta="-4" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Entering chat range" left="151"
-             mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
-             width="256" />
-  <check_box bottom_delta="0" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Entering sim" left="330"
-       mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
-       width="256" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
              mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
-                 Rating:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
-             mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
-                 I want to access content rated:
+                 Access Content Rated:
         </text>
-        <combo_box bottom_delta="-6" follows="left|top" height="18" left="315"
-             mouse_opaque="true" name="maturity_desired_combobox" width="150">
+        <combo_box bottom_delta="-25" follows="left|top" height="18" left="50"
+             mouse_opaque="true" name="maturity_desired_combobox" width="160">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
                 </combo_item>
@@ -185,100 +171,108 @@
         </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
-             mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
+             mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="160">
                  PG only
         </text>
 
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+        height="1" left="55" name="border" width="380" />
+  
 
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
-             mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
-                Clock:
-        </text>
-        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-             height="18" left="153" max_chars="20" mouse_opaque="true"
-             name="time_combobox" width="146">
-                <combo_item type="string" name="12HourTime" value="PST 12">
-                        12-hour PST/PDT
-                </combo_item>
-                <combo_item type="string" name="24HourTime" value="PST 24">
-                        24-hour PST/PDT
-                </combo_item>
-                <combo_item type="string" name="UTCTime" value="UTC">
-                        UTC
-                </combo_item>
-        </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
              mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
-                Language:
-        </text>
-        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true"
-             follows="left|top" height="18" left="153" max_chars="135"
-             mouse_opaque="true" name="language_combobox" width="146">
-                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-                        System Default
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
-                        English
-                </combo_item>
-                
-                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
-                
-                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-                        Dansk (Danish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-                        Deutsch (German) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
-                        Français (French) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-                        Italiano (Italian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-                        Magyar (Hungarian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-                        Nederlands (Dutch) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-                        Polski (Polish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-                        Portugués (Portuguese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
-                        Русский (Russian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-                        Türkçe (Turkish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
-                        Українська (Ukrainian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        中文 (简体) (Chinese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean) - Beta
-                </combo_item>
-        </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true"
+    Language:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-30" enabled="true"
+             follows="left|top" height="18" left="50" max_chars="135"
+             mouse_opaque="true" name="language_combobox" width="160">
+    <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+      System Default
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
+      English
+    </combo_item>
+
+    <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+
+    <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+      Dansk (Danish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+      Deutsch (German) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+      Español (Spanish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+      Français (French) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+      Italiano (Italian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+      Magyar (Hungarian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+      Nederlands (Dutch) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+      Polski (Polish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+      Portugués (Portuguese) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+      Русский (Russian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+      Türkçe (Turkish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+      Українська (Ukrainian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+      中文 (简体) (Chinese) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+      日本語 (Japanese) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+      한국어 (Korean) - Beta
+    </combo_item>
+  </combo_box>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="18" left_delta="150" mouse_opaque="true" name="language_textbox2"
-             v_pad="0" width="400">
-                (requires restart for full effect)
-        </text>
+             height="18" left="50" mouse_opaque="true" name="language_textbox2"
+             v_pad="0" width="380">
+    (requires restart)
+  </text>
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="50" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270" font-style="BOLD|SHADOW"
+     mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
+    Inworld Clock:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-30" enabled="true" follows="left|top"
+             height="18" left="300" max_chars="20" mouse_opaque="true"
+             name="time_combobox" width="160">
+    <combo_item type="string" name="12HourTime" value="PST 12">
+      12-hour PST/PDT
+    </combo_item>
+    <combo_item type="string" name="24HourTime" value="PST 24">
+      24-hour PST/PDT
+    </combo_item>
+    <combo_item type="string" name="UTCTime" value="UTC">
+      UTC
+    </combo_item>
+  </combo_box>
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index fe19929..2e92689 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -1,75 +1,92 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Graphics" left="102" mouse_opaque="true"
      name="Display panel" width="517">
+  
+  
         <button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
              left="470" name="GraphicsPreferencesHelpButton" width="22" />
-        <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
+
+  
+  <text type="string" length="1" bottom="-20" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="10" left="20" name="Display_textbox" v_pad="0"
+             width="394" font-style="BOLD|SHADOW">
+    Display Mode:
+  </text>  
+  
+  
+        <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false"
-             label="Run meta-impy in a window" left="10" mouse_opaque="true"
+       tool_tip="If unchecked, viewer will display full-screen when logged in" 
+             label="Windowed mode" left_delta="30" mouse_opaque="true"
              name="windowed mode" radio_style="false" width="100" />
-  <check_box bottom_delta="0" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-       label="Show WindLight toolbar" left="275" mouse_opaque="true"
-             name="toggle_windlight_control" radio_style="false" width="237"
-             control_name="EnableWindlightRemote" />
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
-             embedded_items="false" enabled="false" follows="left|top"
-             font="SansSerifSmall" height="20" hide_border="true"
-             hide_scrollbar="true" left="10" max_length="65535" mouse_opaque="true"
-             name="FullScreenInfo" tab_stop="false" width="350" word_wrap="true">
-                If unchecked, viewer will display full-screen when logged in.
-        </text_editor>
+
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
              mouse_opaque="true" name="WindowSizeLabel" v_pad="0" width="128">
                 Window size:
         </text>
-        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+             mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
+    Display resolution:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-4" enabled="true" follows="left|top"
              height="18" left="185" max_chars="20" mouse_opaque="true"
-             name="windowsize combo" width="150">
+             name="windowsize combo" width="160">
                 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
-                        800x600 
+                        800×600 
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480">
-                        720x480 (NTSC)
+                        720×480 (NTSC)
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="768x576" value="768 x 576">
-                        768x576 (PAL)
+                        768×576 (PAL)
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
-                        1024x768
+                        1024×768
                 </combo_item>
     <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
-      1280x720 (HDV720)
+      1280×720 (HDV720)
     </combo_item>
     <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
-      1440x1080 (HDV1080)
+      1440×1080 (HDV1080)
     </combo_item>
     <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
-      1920x1080 (HD1080)
+      1920×1080 (HD1080)
     </combo_item>
   </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
-                Display resolution:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
              height="18" left="185" max_chars="20" mouse_opaque="true"
-             name="fullscreen combo" width="150" />
+             name="fullscreen combo" width="160" />
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-39" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="10" mouse_opaque="true" name="AspectRatioLabel1"
+             left="50" mouse_opaque="true" name="AspectRatioLabel1"
              tool_tip="width / height" v_pad="0" width="160">
                 Aspect ratio:
         </text>
-        <combo_box allow_text_entry="true" bottom="-43" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="true" bottom_delta="-4" enabled="true" follows="left|top"
              height="16" left="185" max_chars="100" mouse_opaque="true"
-             name="aspect_ratio" tool_tip="width / height" width="150">
+             name="aspect_ratio" tool_tip="width / height" width="160">
                 <combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
                         4:3 (Standard CRT)
                 </combo_item>
@@ -83,321 +100,318 @@
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
+        <check_box bottom_delta="-2" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Auto-detect ratio" left="358" mouse_opaque="true"
+             label="Auto-detect" left_delta="165" mouse_opaque="true"
              name="aspect_auto_detect" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
-                Quality and
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="0" mouse_opaque="true"
-             name="QualityText" v_pad="0" width="95">
-                performance:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="115" mouse_opaque="true" name="FasterText" v_pad="0" width="80">
-                Faster
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+        height="1" left="55" name="border" width="380" />
+
+  
+  <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" h_pad="0"
+      halign="left" height="10" left="20" name="textbox" v_pad="0"
+      width="394" font-style="BOLD|SHADOW">
+    Performance
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="158" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             left="110" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
              name="ShadersPrefText2" v_pad="0" width="40">
-                Mid
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+    Mid
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
              name="ShadersPrefText3" v_pad="0" width="40">
-                High
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+    High
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
              name="ShadersPrefText4" v_pad="0" width="40">
-                Ultra
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="334" mouse_opaque="true" name="HigherText2" v_pad="0" width="80">
-                Higher
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="0" mouse_opaque="true"
-             name="QualityText2" v_pad="0" width="95">
-                Quality
-        </text>
-        <icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14" follows="left|top" 
-             image_name="rounded_square.tga" left="173" name="LowGraphicsDivet"
+    Ultra
+  </text>
+  <icon bottom_delta="18" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+             image_name="rounded_square.tga" left="123" name="LowGraphicsDivet"
              width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             image_name="rounded_square.tga" left_delta="44" name="MidGraphicsDivet"
+  <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+             image_name="rounded_square.tga" left_delta="60" name="MidGraphicsDivet"
              width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             image_name="rounded_square.tga" left_delta="44" name="HighGraphicsDivet"
+  <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+             image_name="rounded_square.tga" left_delta="61" name="HighGraphicsDivet"
              width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             image_name="rounded_square.tga" left_delta="44" name="UltraGraphicsDivet"
+  <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+             image_name="rounded_square.tga" left_delta="61" name="UltraGraphicsDivet"
              width="2" />
-        <slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
+  <slider bottom_delta="0" can_edit_text="false" control_name="RenderQualityPerformance"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="0" label="" label_width="0"
-             left="165" max_val="3" min_val="0" mouse_opaque="true"
-             name="QualityPerformanceSelection" show_text="false" width="150" />
-        <check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
+             left="115" max_val="3" min_val="0" mouse_opaque="true"
+             name="QualityPerformanceSelection" show_text="false" width="200" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="2" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+             left="340" mouse_opaque="true" name="HigherText2" v_pad="0" width="200">
+    Graphics Quality
+  </text>
+  
+  
+  <check_box bottom_delta="-50" control_name="RenderCustomSettings" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Custom" left="385" mouse_opaque="true"
+             initial_value="true" label="Advanced options" left="50" mouse_opaque="true"
              name="CustomSettings" radio_style="false" width="256" />
-        <view_border bevel_style="none" border_thickness="1" bottom="-415" follows="left|top"
-             height="300" left="5" name="GraphicsBorder" width="485" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+
+  <button bottom_delta="0" enabled="true" font="SansSerifSmall" halign="center" height="20"
+       label="Recommended Settings" left="210" mouse_opaque="true"
+       name="Defaults" scale_image="true" width="160" follows="left|top" />
+  <button bottom_delta="0" enabled="true" font="SansSerifSmall" halign="center" height="20"
+             label="Hardware"
+             left_delta="165" mouse_opaque="true" name="GraphicsHardwareButton"
+             scale_image="true" width="110" follows="left|top" />
+  
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10"
              left="10" mouse_opaque="true" name="ShadersText" v_pad="0" width="128">
-                Shaders:
-        </text>
-        <check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
+    Shaders:
+  </text>
+  <check_box bottom_delta="-23" control_name="RenderObjectBump" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="true"
-             label="Bump mapping and shiny" left="10" mouse_opaque="true"
+             label="Bump mapping and shiny" left_delta="10" mouse_opaque="true"
              name="BumpShiny" radio_style="false" width="256" />
-        <check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
+  <check_box bottom_delta="-18" control_name="VertexShaderEnable" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Basic shaders" left_delta="0"
              mouse_opaque="true" name="BasicShaders" radio_style="false"
              tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
              width="315" />
-        <check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
+  <check_box bottom_delta="-18" control_name="WindLightUseAtmosShaders" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Atmospheric shaders" left_delta="0"
              mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
              width="256" />
-        <check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
+  <check_box bottom_delta="-18" control_name="RenderWaterReflections" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Water reflections" left_delta="0"
              mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10"
+             left_delta="-10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
              width="128">
-                Reflection Detail:
-        </text>
-        <radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
-             enabled="true" follows="left|top" height="70"
-             left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
-             width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="0" width="315">
-                        Terrain and trees
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="1" width="315">
-                        All static objects
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="2" width="315">
-                        All avatars and objects
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="3" width="315">
-                        Everything
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-313" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+    Water Reflections:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-23" enabled="true" follows="left|top"
+             height="16" left_delta="10" max_chars="100" mouse_opaque="true" control_name="RenderReflectionDetail"
+             name="ReflectionDetailCombo" width="160">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
+      Terrain and trees
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
+      All static objects
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="2" value="2">
+      All avatars and objects
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="3" value="3">
+      Everything
+    </combo_item>
+  </combo_box>
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="-10"
              mouse_opaque="true" name="AvatarRenderingText" v_pad="0" width="128">
-                Avatar Rendering:
-        </text>
-        <check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
+    Avatar Rendering:
+  </text>
+  <check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Avatar impostors" left_delta="0" mouse_opaque="true"
+             label="Avatar impostors" left_delta="10" mouse_opaque="true"
              name="AvatarImpostors" radio_style="false" width="256" />
-        <check_box bottom_delta="-17" control_name="RenderAvatarVP" enabled="true"
+  <check_box bottom_delta="-18" control_name="RenderAvatarVP" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Hardware skinning" left_delta="0" mouse_opaque="true"
              name="AvatarVertexProgram" radio_style="false" width="256" />
-        <check_box bottom_delta="-17" control_name="RenderAvatarCloth" enabled="true"
+  <check_box bottom_delta="-18" control_name="RenderAvatarCloth" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Avatar cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
              radio_style="false" width="256" />
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="-10"
+             mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
+    Terrain Detail:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-23" enabled="true" follows="left|top"
+             height="16" left_delta="10" max_chars="100" mouse_opaque="true" control_name="RenderTerrainDetail"
+             name="TerrainDetailCombo" width="160">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
+      Low
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
+      High
+    </combo_item>
+  </combo_box>
+
+
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 
-       mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
-    Max. non-imposters:
+     bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10"
+     left="210" mouse_opaque="true" name="LimitsText" v_pad="0" width="128">
+    Limits:
   </text>
-  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
-       decimal_digits="0" enabled="true" follows="left|top" height="16"
-       increment="1" initial_val="35" label="" 
-       label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
-       name="AvatarMaxVisible" show_text="true" width="100" />
-        <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
+  <slider bottom_delta="-23" can_edit_text="true" control_name="RenderFarClip"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="4" initial_val="160" label="Draw distance (meters):"
-             label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
+             label_width="140" left_delta="10" max_val="1024" min_val="32" mouse_opaque="true"
              name="DrawDistance" show_text="true" width="262" />
-        <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
+  <slider bottom_delta="-18" can_edit_text="true" control_name="RenderMaxPartCount"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="256" initial_val="4096"
              label="Max. particle count:" label_width="140" left_delta="0"
              max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
              show_text="true" width="262" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
+  <slider bottom_delta="-18" can_edit_text="true" control_name="RenderAvatarMaxVisible"
+       decimal_digits="0" enabled="true" follows="left|top" height="16"
+       increment="1" initial_val="35" label="Max. non-imposters:"
+       label_width="140" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
+       name="AvatarMaxVisible" show_text="true" width="250" />
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderGlowResolutionPow"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="8" label="Post process quality:"
              label_width="140" left_delta="0" max_val="9" min_val="8"
              mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left="215" mouse_opaque="true" name="MeshDetailText" v_pad="0"
+             height="12" left_delta="0" mouse_opaque="true" name="MeshDetailText" v_pad="0"
              width="128">
-                Mesh Detail:
-        </text>
-        <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
+    Mesh Detail:
+  </text>
+  <slider bottom_delta="-23" can_edit_text="false" control_name="RenderVolumeLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
              increment="0.125" initial_val="160" label="  Objects:"
              label_width="140" left_delta="0" max_val="4" min_val="0"
              mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderFlexTimeFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
              increment="0.1" initial_val="160" label="  Flexiprims:"
              label_width="140" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="FlexibleMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTreeLODFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderTreeLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
              increment="0.125" initial_val="160" label="  Trees:"
              label_width="140" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarLODFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderAvatarLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
              increment="0.125" initial_val="160" label="  Avatars:"
              label_width="140" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderTerrainLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
              increment="0.125" initial_val="160" label="  Terrain:"
              label_width="140" left_delta="0" max_val="2" min_val="1"
              mouse_opaque="true" name="TerrainMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="WLSkyDetail"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="WLSkyDetail"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="8" initial_val="160" label="  Sky:"
              label_width="140" left_delta="0" max_val="128" min_val="16"
              mouse_opaque="true" name="SkyMeshDetail" show_text="false" width="223" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-172" drop_shadow_visible="true" enabled="true" follows="left|top"
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-266" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="444" mouse_opaque="true" name="PostProcessText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-44" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="444" mouse_opaque="true" name="ObjectMeshDetailText" v_pad="0"
              width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="12" left_delta="0" mouse_opaque="true"
              name="FlexibleMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="12" left_delta="0" mouse_opaque="true"
              name="TreeMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="12" left_delta="0" mouse_opaque="true"
              name="AvatarMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="12" left_delta="0" mouse_opaque="true"
              name="TerrainMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="12" left_delta="0" mouse_opaque="true"
              name="SkyMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
+    Low
+  </text>
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
              width="128">
-                Lighting Detail:
-        </text>
-        <radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" left_delta="0"
-             mouse_opaque="true" name="LightingDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="SunMoon" width="156">
-                        Sun and moon only
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="LocalLights" width="156">
-                        Nearby local lights
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="360"
-             mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
-                Terrain Detail:
-        </text>
-        <radio_group bottom_delta="-43" control_name="RenderTerrainDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" left_delta="0"
-             mouse_opaque="true" name="TerrainDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="0" width="315">
-                        Low
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="2" width="315">
-                        High
-                </radio_item>
-        </radio_group>
-        <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Recommended Settings" left="130" mouse_opaque="true"
-             name="Defaults" scale_image="true" width="170" follows="left|bottom" />
-  <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Hardware Options" label_selected="Hardware Options"
-             left="310" mouse_opaque="true" name="GraphicsHardwareButton"
-             scale_image="true" width="170" follows="left|bottom" />
+    Lighting Detail:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-23" enabled="true" follows="left|top"
+             height="16" left_delta="10" max_chars="100" mouse_opaque="true" control_name="RenderLightingDetail"
+             name="LightingDetailCombo" width="160">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
+      Sun and moon only
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
+      Nearby local lights
+    </combo_item>
+  </combo_box>  
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom="-448" follows="left|top"
+             height="271" left="5" name="GraphicsBorder" width="488" />  
+  
+  
         <string name="resolution_format">
-                [RES_X] x [RES_Y]
+                [RES_X] × [RES_Y]
         </string>
         <string name="aspect_ratio_text">
                 [NUM]:[DEN]
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 2c71998..93bc84c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -1,117 +1,111 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="IMs &amp; Logging" left="102" mouse_opaque="true" name="im"
+     height="408" label="Logging &amp; Privacy" left="102" mouse_opaque="true" name="im"
      width="517">
+  
+  
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box" v_pad="0" width="128">
-    My Online Status:
+       bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+       mouse_opaque="false" name="Logging:" v_pad="0" width="128">
+    Logging:
   </text>
-  <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false"
-             label="Only my Friends and Groups can see when I am online"
-             left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
-             width="350" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-    IM Options:
-  </text>
-  <string name="log_in_to_change">
-    log in to change
-  </string>
-  <string name="default_email_used">
-    using default address
-  </string>
-  <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false" label="Send IM to email ([EMAIL])"
-             left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
-             width="350" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-59" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-             mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
-    Show IMs in:
-  </text>
-  <check_box bottom="-65" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Main chat" left="248" mouse_opaque="true"
-             name="include_im_in_chat_console" radio_style="false" width="100" />
-  <check_box bottom="-65" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Local Chat window" left="348" mouse_opaque="true"
-             name="include_im_in_chat_history" radio_style="false" width="100" />
-  <check_box bottom="-85" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show timestamps in IM" left="148" mouse_opaque="true"
-             name="show_timestamps_check" radio_style="false" width="237" />
-  <check_box bottom="-105" enabled="true"
+
+  <check_box bottom_delta="-25" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16"
-       initial_value="false" label="Show online Friend notifications" left="148"
-       mouse_opaque="true" name="friends_online_notify_checkbox"
-       radio_style="false" width="256" />
-  <check_box bottom_delta="-20" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-           label="Vertical IM tabs (requires restart)" left_delta="0" mouse_opaque="true"
-           name="vertical-imtabs-toggle" radio_style="false" width="270" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box3" v_pad="0" width="128">
-    Busy Mode Response:
-  </text>
-  <text_editor type="string" length="1" bottom_delta="-60" embedded_items="false" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="70" left="148" max_length="255"
-             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
-  <button bottom_delta="-25" follows="top|right" height="22" label="IM Response Options"
-     left="164" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
-     width="180" />
-  <button bottom_delta="0" follows="left|top" height="22" label="OTR Options"
-     left="330" name="otr_adv_btn" tool_tip="Off The Record options"
-     width="120" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-23" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box4" v_pad="0" width="128">
-    Logging Options:
-  </text>
-  <check_box bottom_delta="-7" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Save a log of IM on my computer" left="148"
-             mouse_opaque="true" name="log_instant_messages" radio_style="false"
-             width="237" />
+       initial_value="false" label="Save a log of IM on my computer" left_delta="30"
+       mouse_opaque="true" name="log_instant_messages" radio_style="false"
+       width="237" />
   <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Show timestamps in IM log" left="168"
+             initial_value="false" label="Show timestamps in IM log" left_delta="30"
              mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
              width="217" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show the end of last IM conversation" left="168" mouse_opaque="true"
+             label="Show the end of last IM conversation" left_delta="0" mouse_opaque="true"
              name="log_show_history" radio_style="false" width="217" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
-             left="148" mouse_opaque="true" name="log_chat" radio_style="false"
+             left_delta="-30" mouse_opaque="true" name="log_chat" radio_style="false"
              width="237" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
+             label="Show timestamps in Local Chat log" left_delta="30" mouse_opaque="true"
              name="log_chat_timestamp" radio_style="false" width="217" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
+             label="Show incoming IM in Local Chat log" left_delta="0" mouse_opaque="true"
              name="log_chat_IM" radio_style="false" width="217" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Include date with timestamps" left="148" mouse_opaque="true"
+             label="Include date with timestamps" left_delta="-30" mouse_opaque="true"
              name="log_date_timestamp" radio_style="false" width="237" />
-  <button bottom_delta="-22" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Change Path" label_selected="Change Path" left="148"
-             mouse_opaque="true" name="log_path_button" width="96" />
-  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="1"
-             drop_shadow_visible="true" enabled="false" follows="top|left|right"
-             font="SansSerifSmall" halign="right" height="19" left="248"
-             max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+       mouse_opaque="false" name="Log location:" v_pad="0" width="128">
+    Log location:
+  </text>
+  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-25"
+       drop_shadow_visible="true" enabled="false" follows="top|left|right" width="395" 
+       font="SansSerifSmall" halign="right" height="19" left_delta="0"
+       max_length="254" mouse_opaque="false" name="log_path_string" />
+  <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="Change Location" left_delta="0"
+             mouse_opaque="true" name="log_path_button" width="160" />
+
+
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+       mouse_opaque="false" name="Privacy:" v_pad="0" width="128">
+    Privacy:
+  </text>
+  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" initial_value="false"
+             label="Only my Friends and Groups can see when I am online"
+             left_delta="30" mouse_opaque="true" name="online_visibility" radio_style="false"
+             width="350" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+             mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+    Busy Mode Response:
+  </text>
+  <text_editor type="string" length="1" bottom_delta="-75" embedded_items="false" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="70" left_delta="0" max_length="255"
+             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
+  <button bottom_delta="-30" follows="top|left" height="20" label="Auto-Response Options"
+       left_delta="0" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
+       width="160" font="SansSerifSmall" />
+  <button bottom_delta="0" follows="left|top" height="22" label="OTR Options"
+     left_delta="200" name="otr_adv_btn" tool_tip="Off The Record options"
+     width="120" />
+
+  <string name="log_in_to_change">
+    log in to change
+  </string>
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 70c8464..5713933 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -1,152 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Input &amp; Camera" left="102" mouse_opaque="true"
      name="Input panel" width="517">
+
+
+  <text name="double_click_action_label" font-style="BOLD|SHADOW"
+      bottom="-26" left="20" height="16" width="200"
+      follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Double-Click Action:
+  </text>
+
+  <combo_box name="double_click_action"
+             bottom_delta="-25" left_delta="30" height="18" width="160"
+             follows="left|top" mouse_opaque="true">
+    <combo_item name="None" value="None">
+      No action
+    </combo_item>
+    <combo_item name="Go" value="Go">
+      Autopilot
+    </combo_item>
+  </combo_box>
+
+  <text name="go_action_label"
+              bottom_delta="-25" left_delta="0" height="18" width="200"
+        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Autopilot:
+  </text>
+
+  <combo_box name="go_action"
+             bottom_delta="0" left_delta="70" height="18" width="90"
+             follows="left|top" mouse_opaque="true">
+    <combo_item name="Move" value="Move">
+      Move
+    </combo_item>
+    <combo_item name="Teleport" value="Teleport">
+      Teleport
+    </combo_item>
+  </combo_box>
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+  
+  
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
              mouse_opaque="true" name=" Mouselook Options:" v_pad="0" width="266">
                 Mouselook:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
              mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
                 Mouse sensitivity:
         </text>
-        <slider_bar bottom="-26" enabled="true" follows="left|top"
-             height="16" increment="0.25" initial_val="2" left="276" max_val="15"
-             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
-        <check_box bottom_delta="-18" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" label="Invert mouse" left="148"
+        <slider_bar bottom_delta="-6" enabled="true" follows="left|top"
+             height="16" increment="0.25" initial_val="2" left_delta="98" max_val="15"
+             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="88" />
+        <check_box bottom_delta="0" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" label="Invert mouse" left="270"
              mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
-  <check_box bottom_delta="-18" enabled="true"
+  <check_box bottom_delta="-20" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Show avatar in mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
+       label="Show my avatar in mouselook" left_delta="0" mouse_opaque="true" name="first_person_avatar_visible"
        radio_style="false" width="256" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+
+
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
-    Auto-Fly:
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
+       mouse_opaque="true" name="text2" v_pad="0" width="128">
+    Joystick:
   </text>
-  <check_box bottom_delta="-6" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
-             left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
-             width="178" />
+  <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
+             label="Joystick Setup" left="50" mouse_opaque="true"
+             name="joystick_setup_button" width="160" />
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+  
+
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
-    Default Camera:
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+             mouse_opaque="true" name="Camera Options:" v_pad="0" width="266">
+    Camera:
   </text>
+  <check_box bottom_delta="-25" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Automatic edit camera movement" left="50" mouse_opaque="true"
+       name="edit_camera_movement" radio_style="false"
+       tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+       width="201" />
+  <check_box bottom_delta="-20" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Automatic appearance camera movement" left_delta="0" mouse_opaque="true"
+             name="appearance_camera_movement" radio_style="false"
+             tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+  <check_box bottom_delta="-20" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Disable camera constraints" left_delta="0" mouse_opaque="true"
+             name="Disable camera constraints" radio_style="false"
+             tool_tip="Disables camera limits such as distance and terrain" width="242" />
+  <check_box bottom_delta="-20" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Disable minimum zoom distance" left_delta="30" mouse_opaque="true"
+       name="disable_min_zoom_check" radio_style="false"
+       tool_tip="Disables minimum zoom distance for prims and avatars" width="242" />
+  
+  
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
              mouse_opaque="true" name="camera_fov_label" v_pad="0" width="128">
-    Camera view angle:
+    View angle:
   </text>
   <slider bottom_delta="-6" can_edit_text="true"
-             decimal_digits="2" enabled="true" follows="left|top" width="128" height="16"
-             increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
+             decimal_digits="2" enabled="true" follows="left|top" width="100" height="16"
+             increment=".025" initial_val="1.57" left_delta="98" max_val="2.97" min_val=".17"
              mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
+  
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
              mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
-    Camera follow distance:
+    Follow distance:
   </text>
   <slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale"
              decimal_digits="2" enabled="true" follows="left|top" height="16"
-             increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
+             increment=".025" initial_val="1" left_delta="98" min_val=".5" max_val="3"
              mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
-             width="128" />
+             width="100" />
+  
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
        mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
-    Camera transition time:
+    Transition time:
   </text>
   <slider bottom_delta="-6" can_edit_text="true" decimal_digits="1"
        enabled="true" follows="left|top" height="16" increment="0.1"
-       initial_val="0.4" left="276" max_val="4" min_val="0" mouse_opaque="true"
-       name="zoom_time" show_text="false" value="2" width="128" />
+       initial_val="0.4" left_delta="98" max_val="4" min_val="0" mouse_opaque="true"
+       name="zoom_time" show_text="false" value="2" width="100" />
+
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
              mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
-    Camera smoothing:
+    Smoothing:
   </text>
   <slider bottom_delta="-6" can_edit_text="true"
              decimal_digits="1" enabled="true" follows="left|top" height="16"
-             increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
+             increment="0.1" initial_val="1" left_delta="98" max_val="9" min_val="0"
              mouse_opaque="true" name="camera_position_smoothing" show_text="false" value="2"
-             width="128" />
-  <check_box bottom_delta="-24" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Automatic edit camera movement" left="148" mouse_opaque="true"
-             name="edit_camera_movement" radio_style="false"
-             tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-             width="201" />
-  <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Automatic appearance camera movement" left="148" mouse_opaque="true"
-             name="appearance_camera_movement" radio_style="false"
-             tool_tip="Use automatic camera positioning while in edit mode" width="242" />
-  <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Disable camera constraints" left="148" mouse_opaque="true"
-             name="Disable camera constraints" radio_style="false"
-             tool_tip="Disables camera limits such as distance and terrain" width="242" />
-  <check_box bottom_delta="-18" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Disable minimum zoom distance" left="168" mouse_opaque="true"
-       name="disable_min_zoom_check" radio_style="false"
-       tool_tip="Disables minimum zoom distance for prims and avatars" width="242" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="text2" v_pad="0" width="128">
-                Joystick:
-        </text>
-        <button bottom_delta="-4" follows="left|top" font="SansSerif" height="20"
-             label="Joystick Setup" left="148" mouse_opaque="true"
-             name="joystick_setup_button" width="155" />
-
-
-        <text name="double_click_action_label"
-              bottom_delta="-35" left="10" height="18" width="200"
-        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
-    Double-Click Action:
-        </text>
-
-  <combo_box name="double_click_action"
-             bottom_delta="0" left_delta="138" height="18" width="150"
-             follows="left|top" mouse_opaque="true">
-                <combo_item name="None" value="None">
-                        None
-                </combo_item>
-                <combo_item name="Go" value="Go">
-                        Autopilot
-                </combo_item>
-  </combo_box>
-
+             width="100" />
 
-        <text name="go_action_label"
-              bottom_delta="-20" left="10" height="18" width="200"
-        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
-    Autopilot Style:
-        </text>
-
-  <combo_box name="go_action"
-             bottom_delta="0" left_delta="138" height="18" width="150"
-             follows="left|top" mouse_opaque="true">
-                <combo_item name="Move" value="Move">
-                        Move
-                </combo_item>
-                <combo_item name="Teleport" value="Teleport">
-                        Teleport
-                </combo_item>
-  </combo_box>
 
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 7d6bb4a..57d8f31 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -1,178 +1,434 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Network" left="102" mouse_opaque="true" name="network"
      width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box" v_pad="0" width="200">
-                Maximum bandwidth:
-        </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
-             decimal_digits="0" enabled="true" follows="left|top" height="15"
-             increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
-             mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
-             width="180" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="4" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="186" mouse_opaque="false" name="text_box2"
-             v_pad="0" width="200">
-                kbps (kilobits per second)
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="200">
-                Disk cache size (MB):
-        </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
-             decimal_digits="0" enabled="true" follows="left|top" height="15"
-             increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
-             mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-        <button bottom_delta="-4" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Clear Disk Cache" left="340"
-             left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
-             width="150" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-17" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="12" mouse_opaque="false" name="cache_location_label"
-             v_pad="0" width="200">
-                Disk cache location:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
-             enabled="false" follows="left|top" font="SansSerif"
-             handle_edit_keys_directly="true" height="20" left_delta="0"
-             max_length="4096" mouse_opaque="true" name="cache_location"
-             select_all_on_focus_received="false" width="470" word_wrap="false" />
-        <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="22" label="Set" label_selected="Set" left_delta="0"
-             mouse_opaque="true" name="set_cache" scale_image="true" width="100" />
-        <button bottom="-105" bottom_delta="0" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Reset"
-             label_selected="Set" left_delta="103" mouse_opaque="true"
-             name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
-             enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Enable custom outgoing port" left="12"
-             mouse_opaque="true" name="connection_port_enabled" radio_style="false"
-       tool_tip="Enables custom port for outgoing connections" 
-             width="256" />
-        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
-             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             increment="1" initial_val="13000" label="Port number:" label_width="75"
-             left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
-             name="connection_port" width="140" />
-  
-  <!-- XMLRPC PROXY -->
-
-  <check_box bottom_delta="-25" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="15" mouse_opaque="true"
-             name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="20" mouse_opaque="false" name="xmlrpc_proxy_text_label"
-             v_pad="0" width="128">
-                Address:
-        </text>
-        <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="112" name="xmlrpc_proxy_editor"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="200" />
-        <spinner bottom_delta="-20" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="35"
-             max_val="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
-             width="140" />
-
-  <!-- SOCKS 5 PROXY -->
-
-  <check_box bottom_delta="-24" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable SOCKS 5 proxy" left="15" mouse_opaque="true"
-             name="socks5_proxy_enabled" radio_style="false" width="256" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="35" mouse_opaque="false" name="socks5_host_label"
-             v_pad="0" width="128">
-    SOCKS 5 host:
-  </text>
-  <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="113" name="socks5_proxy_host"
-             tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
-             width="200" />
-  <spinner bottom_delta="-20" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="35"
-             max_val="65535" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
-             width="140" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="35" mouse_opaque="false" name="socks5_auth_label"
-             v_pad="0" width="128">
-    SOCKS 5 authentication:
-  </text>
-  <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="35"
-             name="socks5_auth" width="420">
-    <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
-        tool_tip="No authentication">
-      None
-    </radio_item>
-    <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
-        tool_tip="Username / Password authentication">
-      Username / Password
-    </radio_item>
-  </radio_group>
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-16" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="122" mouse_opaque="false" name="socks5_username_label"
-             v_pad="0" width="128">
-    Username:
-  </text>
-  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="200" name="socks5_proxy_username"
-             tool_tip="Username for the Socks5 proxy"
-             width="200" />
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="122" mouse_opaque="false" name="socks5_password_label"
-             v_pad="0" width="128">
-    Password:
-  </text>
-  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="200" name="socks5_proxy_password"
-             tool_tip="Password for the Socks5 proxy"
-             width="200" />
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
-     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-     height="10" left="35" mouse_opaque="false" name="http_proxy_label"
-     v_pad="0" width="128">
-    HTTP proxy:
-  </text>
-  <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="35"
-             name="socks5_http_proxy_type" width="380" >
-    <radio_item height="20" bottom="0" left="100" name="None" width="50"
-        tool_tip="No HTTP proxy">
-      None
-    </radio_item>
-    <radio_item height="20" bottom="0" left="170" name="Socks" width="50"
-        tool_tip="Use Socks for HTTP proxy">
-      SOCKS 5
-    </radio_item>
-    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
-        tool_tip="Use web proxy for HTTP proxy">
-      Web
-    </radio_item>
-  </radio_group>
+
+
+  <tab_container bottom="0" height="450" left="0" mouse_opaque="false"
+     name="networktab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+
+    
+    <!-- BANDWIDTH SETTINGS PANEL -->
+    
+
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+       height="408" label="Performance" left="102" mouse_opaque="true"
+       name="bandwidth_panel" width="517">
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="text_box" v_pad="0" width="200">
+        Maximum Viewer Bandwidth:
+      </text>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="Speed:"
+                 v_pad="0" width="200">
+        Speed:
+      </text>      
+      <slider bottom_delta="-4" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
+                 decimal_digits="0" enabled="true" follows="left|top" height="15"
+                 increment="10" initial_val="1000" left_delta="50" max_val="5000" min_val="50"
+                 mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
+                 width="160" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="4" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="166" mouse_opaque="false" name="text_box2"
+                 v_pad="0" width="200">
+        kbps (kilobits per second)
+      </text>
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+           mouse_opaque="false" name="Texture Fetching:" v_pad="0" width="200">
+        Texture Fetching:
+      </text>
+
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Use HTTP texture fetching (experimental)" left="50" mouse_opaque="true"
+           name="http_texture_check" radio_style="false" width="217" />
+
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Increase rez speed via draw distance stepping" left_delta="0" mouse_opaque="true"
+           name="speed_rez_check" radio_style="false" width="217" />
+      <spinner bottom_delta="-20" decimal_digits="0"
+           tool_tip="Interval in seconds between each draw distance increment"
+           follows="left|top" height="16" increment="1" initial_val="12"
+           label="Step interval every:" label_width="105" left_delta="30" max_val="20"
+           min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
+      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
+                 name="speed_rez_seconds_text" width="115">
+        seconds
+      </text>      
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+           mouse_opaque="false" name="Disk Cache:" v_pad="0" width="200">
+        Disk Cache:
+      </text>
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="cache_size_label_l"
+                 v_pad="0" width="200">
+        Size:
+      </text>
+      <slider bottom_delta="-4" can_edit_text="true" control_name="CacheSize"
+                 decimal_digits="0" enabled="true" follows="left|top" height="15"
+                 increment="10" initial_val="50" left_delta="50" max_val="1000" min_val="10"
+                 mouse_opaque="true" name="disk_cache_size" show_text="true" width="160" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="4" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="166" mouse_opaque="false" name="text_box5"
+                 v_pad="0" width="200">
+        megabytes
+      </text>      
+      
+      <button bottom_delta="-30" enabled="true" follows="left|top"
+                 font="SansSerifSmall" halign="center" height="20" label="Clear Disk Cache"
+                 left="50" mouse_opaque="true" name="clear_disk_cache" scale_image="true"
+                 width="160" />
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="cache_location_label"
+                 v_pad="0" width="200">
+        Location:
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-25"
+                 enabled="false" follows="left|top" font="SansSerif"
+                 handle_edit_keys_directly="true" height="20" left_delta="0"
+                 max_length="4096" mouse_opaque="true" name="disk_cache_location"
+                 select_all_on_focus_received="false" width="395" word_wrap="false" />
+      <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+                 halign="center" height="20" label="Change Location" left_delta="0"
+                 mouse_opaque="true" name="set_disk_cache" scale_image="true" width="160" />
+      <button bottom_delta="0" enabled="true" follows="left|top"
+                 font="SansSerifSmall" halign="center" height="20" label="Reset to Default"
+                 left_delta="165" mouse_opaque="true"
+                 name="reset_disk_cache" scale_image="true" width="160" />
+
+
+    </panel>
+
+
+    <!-- PROXY SETTINGS PANEL -->
+
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Proxy Settings"
+           left="1" mouse_opaque="true" name="proxies" width="418">
+
+
+      <!-- XMLRPC PROXY -->
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+           mouse_opaque="false" name="text_box" v_pad="0" width="200">
+        XMLRPC:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="50" mouse_opaque="true"
+                 name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="30" mouse_opaque="false" name="xmlrpc_proxy_text_label"
+                 v_pad="0" width="128">
+        Address:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left_delta="50" name="xmlrpc_proxy_editor"
+                 tool_tip="The name or IP address of the proxy you would like to use"
+                 width="200" />
+      <spinner bottom_delta="-20" decimal_digits="0"
+                 enabled="true" follows="left|top" height="16" increment="1"
+                 initial_val="80" label="Port number:" label_width="75" left_delta="-50"
+                 max_val="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
+                 width="140" />
+      
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+      
+      
+      <!-- SOCKS 5 PROXY -->
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+           mouse_opaque="false" name="text_box" v_pad="0" width="200">
+        SOCKS 5:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Enable SOCKS 5 proxy" left="50" mouse_opaque="true"
+                 name="socks5_proxy_enabled" radio_style="false" width="256" />
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="30" mouse_opaque="false" name="socks5_host_label"
+                 v_pad="0" width="128">
+        SOCKS 5 host:
+      </text>
+      <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left_delta="80" name="socks5_proxy_host"
+                 tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
+                 width="200" />
+      <spinner bottom_delta="-20" decimal_digits="0"
+                 enabled="true" follows="left|top" height="16" increment="1"
+                 initial_val="80" label="Port number:" label_width="78" left_delta="-80"
+                 max_val="65535" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
+                 width="140" />
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="0" mouse_opaque="false" name="socks5_auth_label"
+                 v_pad="0" width="128">
+        SOCKS 5 authentication:
+      </text>
+      <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left_delta="0"
+                 name="socks5_auth" width="420">
+        <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
+            tool_tip="No authentication">
+          None
+        </radio_item>
+        <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
+            tool_tip="Username / Password authentication">
+          Username / Password
+        </radio_item>
+      </radio_group>
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="122" mouse_opaque="false" name="socks5_username_label"
+                 v_pad="0" width="128">
+        Username:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left="200" name="socks5_proxy_username"
+                 tool_tip="Username for the Socks5 proxy"
+                 width="200" />
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="122" mouse_opaque="false" name="socks5_password_label"
+                 v_pad="0" width="128">
+        Password:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left="200" name="socks5_proxy_password"
+                 tool_tip="Password for the Socks5 proxy"
+                 width="200" />
+      
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left="20" mouse_opaque="false" name="http_proxy_label"
+           v_pad="0" width="128">
+        HTTP Textures Proxy:
+      </text>
+      <radio_group bottom_delta="-25" draw_border="false" follows="left|top" height="20" left="50"
+                 name="socks5_http_proxy_type" width="380" >
+        <radio_item height="20" bottom="0" left="50" name="None" width="50"
+            tool_tip="No HTTP proxy">
+          None
+        </radio_item>
+        <radio_item height="20" bottom="0" left="160" name="Socks" width="50"
+            tool_tip="Use Socks for HTTP proxy">
+          SOCKS 5
+        </radio_item>
+        <radio_item height="20" bottom="0" left="270" name="Web" width="50"
+            tool_tip="Use web proxy for HTTP proxy">
+          Web
+        </radio_item>
+      </radio_group>
+      
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left="20" mouse_opaque="false" name="port_label"
+           v_pad="0" width="128">
+        Ougoing Connections:
+      </text>
+      <check_box bottom_delta="-25" control_name="ConnectionPortEnabled"
+           enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Enable custom outgoing port" left_delta="30"
+           mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+           tool_tip="Enables custom port for outgoing connections"
+           width="256" />
+      <spinner bottom_delta="-20" control_name="ConnectionPort"
+                 decimal_digits="0" enabled="true" follows="left|top" height="16"
+                 increment="1" initial_val="13000" label="Port number:" label_width="75"
+                 left_delta="30" max_val="13050" min_val="13000" mouse_opaque="true"
+                 name="connection_port" width="140" />
+      
+      
+    </panel>
+
+
+    <!-- WEB BROWSER PANEL -->
+
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Web Browser"
+           left="1" mouse_opaque="true" name="web_browser" width="418">
+
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left="20" mouse_opaque="false" name="open_links_label"
+           v_pad="0" width="128">
+        Open Links In:
+      </text>
+      
+      <radio_group bottom_delta="-45" draw_border="false" follows="top|left" height="40" left="50"
+         name="use_external_browser" width="480">
+        <radio_item bottom="-20" height="20" left="0" name="external" width="480"
+          tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">
+          My external browser (Firefox, Safari, Internet Explorer, etc.)
+        </radio_item>
+        <radio_item bottom="-40" height="20" left="0" name="internal" width="480"
+          tool_tip="Use the internal browser for help, web links, etc. This browser opens as a new window inside Imprudence.">
+          Imprudence's internal browser
+        </radio_item>
+      </radio_group>
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+          follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+          height="10" left="20" mouse_opaque="false" name="internal_browser_label"
+          v_pad="0" width="128">
+        Internal Browser:
+      </text>
+      
+      <button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Clear Internal Browser Cache" left_delta="30"
+           mouse_opaque="true" name="clear_web_cache" scale_image="true" width="320" />
+      
+      <check_box bottom_delta="-35" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Accept cookies while using internal browser" left_delta="0" mouse_opaque="true"
+           tool_top="Allows the internal browser to accept cookies from websites"
+           name="cookies_enabled" radio_style="false" width="256" />
+      <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Clear Cookies" left_delta="30"
+           tool_tip="Clear Cookies"
+           mouse_opaque="true" name="clear_ookies" scale_image="true" width="160" />
+      
+      <check_box bottom_delta="-35" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Enable proxy for internal browser" left="50" mouse_opaque="true"
+           name="web_proxy_enabled" radio_style="false" width="256" />
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left_delta="30" mouse_opaque="false" name="proxy_text_label"
+           v_pad="0" width="128">
+        Address:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+           height="20" left_delta="50" name="web_proxy_editor"
+           tool_tip="The name or IP address of the proxy you would like to use"
+           width="200" />
+      <spinner bottom_delta="-20" decimal_digits="0"
+           enabled="true" follows="left|top" height="16" increment="1"
+           initial_val="80" label="Port number:" label_width="75" left_delta="-50"
+           max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
+           width="140" />
+
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+
+
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+          follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+          height="10" left="20" mouse_opaque="false" name="search_url_label"
+          v_pad="0" width="200">
+        Custom All (Web) Search URL:
+      </text>      
+      
+      <line_editor bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="18" left_delta="30" name="world_search_editor"
+           tool_tip="Address of the world search engine you would like to use"
+           width="395" />
+      <button  bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Clear" left_delta="0"
+           tool_tip="clear field"
+           mouse_opaque="true" name="world_search_clear" scale_image="true" width="160" />
+      <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Reset to Default" left_delta="165"
+           mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="160" />
+
+
+    </panel>
+
+
+  </tab_container>
+
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 2168137..061d02c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -1,47 +1,117 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
-     title="Popups" width="400">
-        <text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
-                Hide These Popups:
-        </text>
-        <scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
-        <button follows="top|left" height="20" label="Enable This Popup" left="15"
-             name="enable_popup" width="175" />
-        <button follows="top|left" height="20" label="Enable All Popups" left="200"
-             name="reset_dialogs_btn"
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
+<panel border="true" bottom="-409" height="408" label="Notifications" left="0" name="popups"
+     title="Notifications" width="400">
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="dont_show_label" v_pad="0" width="200" font-style="BOLD|SHADOW">
+    Hide These Notifications:
+  </text>
+  
+        <scroll_list follows="top|left" height="88" left="50" name="disabled_popups" width="420"/>
+  
+        <button follows="top|left" height="20" label="Enable This" left="50" bottom_delta="-22" 
+             name="enable_popup" width="160" font="SansSerifSmall" />
+        <button follows="top|left" height="20" label="Enable All" left="270"
+             name="reset_dialogs_btn" font="SansSerifSmall" 
              tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
-             width="175" bottom_delta="0" />
-        <text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
-                Show These Popups:
-        </text>
-        <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
-        <button bottom_delta="-24" follows="top|left" height="20"
-             label="Disable All Popups" left="200"
-             name="skip_dialogs_btn"
+             width="160" bottom_delta="0" />
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="show_label" v_pad="0" width="200" font-style="BOLD|SHADOW">
+    Show These Notifications:
+  </text>
+  
+        <scroll_list follows="top|left" height="88" left="50" name="enabled_popups" width="420" />
+  
+        <button bottom_delta="-22" follows="top|left" height="20"
+             label="Disable All" left="270"
+             name="skip_dialogs_btn" font="SansSerifSmall" 
              tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
-             width="175" />
+             width="160" />
+
+    
+    <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+         height="1" left="55" name="border" width="380" />
+    
+    
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
+             height="10" left="20" mouse_opaque="false" name="text_box2" v_pad="0"
              width="270">
-                Offers of Notecards, Textures and Landmarks:
+                Inventory Offers:
         </text>
         <check_box bottom_delta="-25" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Automatically accept" left="40" mouse_opaque="true"
+             label="Automatically accept" left="50" mouse_opaque="true"
              name="accept_new_inventory" radio_style="false" width="270" />
         <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Automatically view after accepting" left="40" mouse_opaque="true"
+             label="Automatically view Notecards, Textures and Landmarks after accepting" left_delta="0" mouse_opaque="true"
              name="show_new_inventory" radio_style="false" width="270" />
-        <check_box bottom_delta="-20" enabled="true"
+ <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Automatically show newly accepted objects in inventory" left="40" mouse_opaque="true"
+             label="Automatically show newly accepted objects in inventory" left_delta="0" mouse_opaque="true"
              name="show_in_inventory" radio_style="false" width="270" />
-  <check_box bottom_delta="-30" enabled="true"
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20" font-style="BOLD|SHADOW"
+     mouse_opaque="true" name="radar_text" v_pad="0" width="128">
+    Chat Notifications:
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
+       mouse_opaque="true" name="When an avatar enters:" v_pad="0" width="128">
+    When an avatar enters:
+  </text>
+  <check_box bottom_delta="-6" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Chat range" left="270"
+             mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
+             width="256" />
+  <check_box bottom_delta="0" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Current region" left="390"
+       mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+       width="256" />
+
+  <check_box bottom_delta="-20" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="false" label="When Friends come online" left="50"
+       mouse_opaque="true" name="friends_online_notify_checkbox"
+       radio_style="false" width="256" />
+  <check_box bottom_delta="0" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Notify when [CURRENCY] spent or received" left="15"
+       label="When [CURRENCY] spent or received" left="270"
        mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
        width="256" />
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 4a5c95a..eae0103 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -1,14 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Skins" left="102" mouse_opaque="true"
      name="Skins panel" width="517">
+  
+  
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
              mouse_opaque="true" name="muting_text" v_pad="0" width="500">
-    Select a skin (requires restart). (Please see the skin folders for information and credits)
+    Select Skin:
   </text>
-  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
+ 
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="80"
+     mouse_opaque="true" name="requires_restart_text" v_pad="0" width="500">
+    (requires restart).  See skin folder for credits
+  </text>
+  
+  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="50"
              name="skin_selection" width="480">
     <radio_item bottom="-20" height="20" left="0" name="meta7" width="480">
       meta 7
@@ -24,40 +49,40 @@
     </radio_item>
   </radio_group>
   
-  <button left="130" bottom="-125" width="216" height="95" name="meta7_preview" 
+  <button left="150" bottom="-130" width="216" height="95" name="meta7_preview" 
           scale_image="true" label="" image_selected="skin_thumbnail_meta7.png" 
-          image_unselected="skin_thumbnail_meta7.png" image_hover_selected="skin_thumbnail_meta7.png"
+          image_hover_selected="skin_thumbnail_meta7.png" image_unselected="skin_thumbnail_meta7.png" 
           image_hover_unselected="skin_thumbnail_meta7.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="m7white_preview" 
-          scale_image="true" label="" image_selected="skin_thumbnail_white_meta7.png" 
-          image_hover_selected="skin_thumbnail_white_meta7.png" image_unselected="skin_thumbnail_white_meta7.png" 
+  <button left="150" bottom_delta="-100" width="216" height="95" name="m7white_preview"
+          scale_image="true" label="" image_selected="skin_thumbnail_white_meta7.png"
+          image_hover_selected="skin_thumbnail_white_meta7.png" image_unselected="skin_thumbnail_white_meta7.png"
           image_hover_unselected="skin_thumbnail_white_meta7.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="pslpurple_preview"
-          scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png"
-          image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png"
+  <button left="150" bottom_delta="-100" width="216" height="95" name="pslpurple_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png" 
+          image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png" 
           image_hover_unselected="skin_thumbnail_pslpurple.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="classic_preview" 
+  <button left="150" bottom_delta="-100" width="216" height="95" name="classic_preview" 
           scale_image="true" label="" image_selected="skin_thumbnail_default.png" 
           image_hover_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" 
           image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
-  <text name="skin_current_text"
-              left="10" bottom="5" halign="left" height="12"
+  <text name="skin_current_text" font-style="BOLD|SHADOW"
+              left="20" bottom="5" halign="left" height="12"
         follows="left|bottom" h_pad="0" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
-              font="SansSerif" mouse_opaque="true">
-    Other Skin Name:
+              font="SansSerifSmall" mouse_opaque="true">
+    Custom Skin Name:
   </text>
   <line_editor name="skin_current_edit"
-               bottom_delta="0" left_delta="120" height="20" width="120"
+               bottom_delta="-2" left_delta="110" height="18" width="160"
                follows="left|bottom" font="SansSerif"
                bevel_style="in" border_style="line" border_thickness="1"
                max_length="31" mouse_opaque="true"
                handle_edit_keys_directly="true"
                select_all_on_focus_received="true" />
   <button name="save_skin" label="Save"
-          bottom_delta="-2" left_delta="120" height="24" width="90"
-          follows="left|center" font="SansSerif" halign="center"
+          bottom_delta="-2" left_delta="165" height="20" width="110"
+          follows="left|center" font="SansSerifSmall" halign="center"
                 mouse_opaque="true" scale_image="TRUE" />
 </panel>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index b4939ca..d9c3f5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -1,20 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Voice" left="102" mouse_opaque="true" name="chat"
+
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+
+USE LINES BETWEEN GROUPS
+
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+
+GROUP LABEL CONTENTS ARE INDENTED 30px
+
+USE left="270" FOR TABBING OPTIONS
+-->
+
+<panel border="true" bottom="-20" enabled="true" follows="left|top|right|bottom"
+     height="408" label="Voice" left="102" mouse_opaque="true" name="voice_chat"
      width="517">
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
-             embedded_items="false" enabled="false" follows="left|top"
-             font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
-             left_delta="8" max_length="65535" mouse_opaque="true"
-             name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
-                Voice Chat Is Not Available
-        </text_editor>
-        <check_box bottom_delta="0" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable voice chat" left="8" mouse_opaque="true"
-             name="enable_voice_check" radio_style="false" width="200" />
+
+  
+  <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-30"
+     embedded_items="false" enabled="false" follows="left|top"
+     font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
+     left="20" max_length="65535" mouse_opaque="true"
+     name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
+    Voice Chat Is Not Available
+  </text_editor>
+  <check_box bottom="-26" enabled="true"
+     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+     label="Enable voice chat" left="20" mouse_opaque="true"
+     name="enable_voice_check" radio_style="false" width="200" />
+  
+  
         <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40"
-             left_delta="20" name="ear_location" width="364">
+             left_delta="30" name="ear_location" width="364">
                 <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
                         Hear Voice Chat from camera position.
                 </radio_item>
@@ -22,17 +41,19 @@
                         Hear Voice Chat from avatar position.
                 </radio_item>
         </radio_group>
-        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
-             embedded_items="false" enabled="true" follows="left|top"
+  
+  
+        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-30"
+             embedded_items="false" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
              font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
-             left_delta="0" max_length="65535" mouse_opaque="true"
+             left="20" max_length="65535" mouse_opaque="true"
              name="push_to_talk_heading" width="445" word_wrap="true">
                 Push To Talk:
         </text>
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true"
-             left_delta="20" max_length="65535" mouse_opaque="true"
+             left_delta="30" max_length="65535" mouse_opaque="true"
              name="voice_chat_description" tab_stop="false" width="465" word_wrap="true">
                 Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
         </text_editor>
@@ -51,34 +72,38 @@
              drop_shadow_visible="true" enabled="false"
              follows="top|left" font="SansSerifSmall" halign="right" height="19"
              left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"
-             width="280" />
-        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+             width="320" />
+        <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="center"
              height="20" label="Set Key" left_delta="0" mouse_opaque="true"
-             name="set_voice_hotkey_button" width="115" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
-             label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
+             name="set_voice_hotkey_button" width="160" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" height="20"
+             label="Reset to Default" left_delta="165" mouse_opaque="true"
              name="set_voice_middlemouse_button" width="160" />
-        <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
-             embedded_items="false" enabled="true" follows="left|top" height="16"
-             left="28" name="privacy_heading" width="445">
+  
+  
+        <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-30" font="SansSerifSmall"
+             embedded_items="false" enabled="true" follows="left|top" height="16" font-style="BOLD|SHADOW"
+             left="30" name="privacy_heading" width="445">
                 Privacy:
         </text>
         <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Only accept voice calls from people on My Friends list"
-             left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
+             label="Only accept calls from my friends"
+             left_delta="30" mouse_opaque="true" name="voice_call_friends_only_check"
              radio_style="false" width="200" />
         <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Switch off microphone when ending IM calls"
+             label="Switch off microphone when ending calls"
                  mouse_opaque="true" name="auto_disengage_mic_check"
              radio_style="false" width="200" />
-        <button bottom_delta="-40" follows="left|top" font="SansSerif" height="20"
-             label="Device Settings" left="28" mouse_opaque="true"
-             name="device_settings_btn" width="155" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
-                label="Reconnect to Voice" left_delta="160" mouse_opaque="true"
-                name="reset_voice" width="160" />
+  
+  
+        <button bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="20"
+             label="Device Settings" left="30" mouse_opaque="true"
+             name="device_settings_btn" width="160" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" height="20"
+        label="Reconnect to Voice" left_delta="160" mouse_opaque="true"
+        name="reset_voice" width="160" />
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-32"
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"
@@ -86,4 +111,6 @@
              name="device_settings_text" tab_stop="false" width="450" word_wrap="true">
                 NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat, and changes you make will be immediately applied.
         </text_editor>
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
deleted file mode 100644
index b4dbbb5..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Web Browser" left="102" mouse_opaque="true" name="web"
-     width="517">
-        <radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
-             name="use_external_browser" width="480">
-                <radio_item bottom="-20" height="20" left="0" name="external" width="480" 
-                  tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">
-                        Use external web browser (Firefox, Safari, Internet Explorer)
-                </radio_item>
-                <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 
-                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside the viewer.">
-                        Use built-in web browser
-                </radio_item>
-        </radio_group>
-        <button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="22" label="Clear Built-In Browser Cache" left="35"
-             mouse_opaque="true" name="clear_cache" scale_image="true" width="250" />
-        <check_box bottom_delta="-35" enabled="true" follows="left|top" 
-                   font="SansSerifSmall" height="16" initial_value="false"
-             label="Accept cookies while using built-in web browser" left="15" mouse_opaque="true"
-       tool_top="Allows the built-in web browser to accept cookies from websites" 
-             name="cookies_enabled" radio_style="false" width="256" />
-        <button  bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="Clear Cookies" left_delta="20" 
-             tool_tip="Clear Cookies"
-             mouse_opaque="true" name="clear_ookies" scale_image="true" width="110" />
-        <check_box bottom_delta="-35" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable proxy for built-in web browser" left="15" mouse_opaque="true"
-             name="web_proxy_enabled" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="20" mouse_opaque="false" name="proxy_text_label"
-             v_pad="0" width="128">
-                Address:
-        </text>
-        <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="112" name="web_proxy_editor"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="200" />
-        <spinner bottom_delta="-20" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="35"
-             max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
-             width="140" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-30" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="200">
-    Custom All (web) search tab URL:
-  </text>
-        <line_editor bottom_delta="-25" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="18" left="15" name="world_search_editor"
-             tool_tip="Address of the world search engine you would like to use"
-             width="400" />
-        <button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="Reset" left="15" 
-             tool_tip="Reset to default"
-             mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="80" />
-        <button  bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="Clear" left_delta="85" 
-             tool_tip="clear field"
-             mouse_opaque="true" name="world_search_clear" scale_image="true" width="80" />
-
-</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index 5dd738a..bcbff32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -25,7 +25,7 @@ regions in the estate.
                 (unknown)
         </text>
         <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
-             follows="top|left" height="350" left="6" width="250" />
+             follows="top|left" height="290" left="6" width="250" />
         <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
              left="12" name="use_global_time_check" width="200" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about.xml b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
index b14f06f..bb975e0 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="关于第二人生">
+  <tab_container name="about_tab">
+    <panel label="版本" name="support_panel">
+      <button label="复制到剪贴板"         name="copy_btn" />
+    </panel>
+    <panel label="工作人员" name="credits_panel" />
+  </tab_container>
+
         <string name="you_are_at">
                 您现在位于 [POSITION]
         </string>
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
index d9c52a2..c83cb24 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -2,10 +2,10 @@
 <floater name="floaterland" title="关于土地">
         <tab_container name="landtab">
                 <panel label="一般" name="land_general_panel">
-                        <text length="1" name="Name:" type="string">
+                        <text  name="Name:" type="string">
                                 名字:
                         </text>
-                        <text length="1" name="Description:" type="string">
+                        <text  name="Description:" type="string">
                                 描述:
                         </text>
                         <text name="LandType">
@@ -20,56 +20,56 @@
                         <text name="ContentRatingText">
                                 Adult
                         </text>
-                        <text length="1" name="Owner:" type="string">
+                        <text  name="Owner:" type="string">
                                 主人:
                         </text>
-                        <text length="1" name="OwnerText" type="string">
+                        <text  name="OwnerText" type="string">
                                 Leyla Linden
                         </text>
                         <button label="档案..." label_selected="档案..." name="Profile..."/>
-                        <text length="1" name="Group:" type="string">
+                        <text  name="Group:" type="string">
                                 社团:
                         </text>
                         <button label="更改..." label_selected="更改..." name="Set..."/>
                         <check_box label="允许转让给社团" name="check deed" tool_tip="一个社团官员可以转让这块土地至社团，使其被社团的土地配额支持。"/>
                         <button label="转让..." label_selected="转让..." name="Deed..." tool_tip="只有你是所选社团官员的时候才能转让土地。"/>
-                        <check_box label="土地拥有者通过转让土地来贡献" name="check contrib" tool_tip="当土地转让到社团，原土地拥有者将需贡献足够的土地来支持。"/>
-                        <text length="1" name="For Sale:" type="string">
+                        <check_box label="拥有者在转让同时给出贡献" name="check contrib" tool_tip="当土地被转让给社团时, 前一个主人贡献足够的土地配额以支持土地的运行。"/>
+                        <text  name="For Sale:" type="string">
                                 出售:
                         </text>
-                        <text length="1" name="Not for sale." type="string">
+                        <text  name="Not for sale." type="string">
                                 非卖状态。
                         </text>
-                        <text length="1" name="For Sale: Price L$[PRICE]." type="string">
-                                价格: L$[PRICE]（L$[PRICE_PER_SQM]/m²）。
+                        <text  name="For Sale: Price L$[PRICE]." type="string">
+                                价格: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m²)。
                         </text>
                         <button label="出售土地..." label_selected="出售土地..." name="Sell Land..."/>
-                        <text length="1" name="For sale to" type="string">
+                        <text  name="For sale to" type="string">
                                 出售给: [BUYER]
                         </text>
-                        <text length="1" name="Sell with landowners objects in parcel." type="string">
+                        <text  name="Sell with landowners objects in parcel." type="string">
                                 出售中包括物体。
                         </text>
-                        <text length="1" name="Selling with no objects in parcel." type="string">
+                        <text  name="Selling with no objects in parcel." type="string">
                                 出售中不包括物体。
                         </text>
                         <button label="取消土地出售" label_selected="取消土地出售" name="Cancel Land Sale"/>
-                        <text length="1" name="Claimed:" type="string">
+                        <text  name="Claimed:" type="string">
                                 认购时间:
                         </text>
-                        <text length="1" name="DateClaimText" type="string">
+                        <text  name="DateClaimText" type="string">
                                 星期二 八月15日 13:47:25 2006年
                         </text>
-                        <text length="1" name="PriceLabel" type="string">
+                        <text  name="PriceLabel" type="string">
                                 面积：
                         </text>
-                        <text length="1" name="PriceText" type="string">
+                        <text  name="PriceText" type="string">
                                 4048m²
                         </text>
-                        <text length="1" name="Traffic:" type="string">
+                        <text  name="Traffic:" type="string">
                                 流量:
                         </text>
-                        <text length="1" name="DwellText" type="string">
+                        <text  name="DwellText" type="string">
                                 0
                         </text>
                         <button label="购买土地..." label_selected="购买土地..." name="Buy Land..."/>
@@ -123,31 +123,31 @@
                         <text name="estate_section_lbl">
                                 地产：
                         </text>
-                        <text length="1" name="estate_name_lbl" type="string">
+                        <text  name="estate_name_lbl" type="string">
                                 名称：
                         </text>
-                        <text length="1" name="estate_name_text" type="string">
+                        <text  name="estate_name_text" type="string">
                                 大陆
                         </text>
-                        <text length="1" name="estate_owner_lbl" type="string">
+                        <text  name="estate_owner_lbl" type="string">
                                 拥有者：
                         </text>
-                        <text length="1" name="estate_owner_text" type="string">
+                        <text  name="estate_owner_text" type="string">
                                 (无)
                         </text>
-                        <text_editor length="1" name="covenant_editor" type="string">
+                        <text_editor  name="covenant_editor" type="string">
                                 这块地产没有提供任何契约合同。
                         </text_editor>
-                        <text length="1" name="covenant_timestamp_text" type="string">
+                        <text  name="covenant_timestamp_text" type="string">
                                 上次修改时间 星期三12 月3 1日 16:00:00 1969年
                         </text>
                         <text name="region_section_lbl">
                                 地区：
                         </text>
-                        <text length="1" name="region_name_lbl" type="string">
+                        <text  name="region_name_lbl" type="string">
                                 名称：
                         </text>
-                        <text length="1" name="region_name_text" type="string">
+                        <text  name="region_name_text" type="string">
                                 leyla
                         </text>
                         <text name="region_landtype_lbl">
@@ -165,13 +165,13 @@
                         <text name="resellable_lbl">
                                 转售：
                         </text>
-                        <text length="1" name="resellable_clause" type="string">
+                        <text  name="resellable_clause" type="string">
                                 此地区内购买的土地不能被重新出售。
                         </text>
                         <text name="changeable_lbl">
                                 划分：
                         </text>
-                        <text length="1" name="changeable_clause" type="string">
+                        <text  name="changeable_clause" type="string">
                                 此地区内购买的土地不能被合并或划分。
                         </text>
                         <string name="can_resell">
@@ -191,7 +191,7 @@
                         <text name="parcel_object_bonus">
                                 区域额外物体因数: [BONUS]
                         </text>
-                        <text length="1" name="Simulator primitive usage:" type="string">
+                        <text  name="Simulator primitive usage:" type="string">
                                 模拟器元件使用情况:
                         </text>
                         <text left="146" name="objects_available">
@@ -203,53 +203,53 @@
                         <string name="objects_deleted_text">
                                 [COUNT] 个, 最多 [MAX] 个 ([DELETED] 个将会被删除)
                         </string>
-                        <text length="1" name="Primitives parcel supports:" type="string">
+                        <text  name="Primitives parcel supports:" type="string">
                                 地块支持元件数:
                         </text>
-                        <text left="146" length="1" name="object_contrib_text" type="string" width="222">
+                        <text left="146"  name="object_contrib_text" type="string" width="222">
                                 [COUNT] 个
                         </text>
-                        <text length="1" name="Primitives on parcel:" type="string">
+                        <text  name="Primitives on parcel:" type="string">
                                 地块上的元件数:
                         </text>
-                        <text left="146" length="1" name="total_objects_text" type="string" width="58">
+                        <text left="146"  name="total_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
-                        <text length="1" name="Owned by parcel owner:" type="string">
+                        <text  name="Owned by parcel owner:" type="string">
                                 土地拥有者所有:
                         </text>
-                        <text left="146" length="1" name="owner_objects_text" type="string" width="58">
+                        <text left="146"  name="owner_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowOwner"/>
                         <button label="归还..." label_selected="归还..." name="ReturnOwner..." tool_tip="将物体归还其主人。"/>
-                        <text length="1" name="Set to group:" type="string">
+                        <text  name="Set to group:" type="string">
                                 设为社团的元件数:
                         </text>
-                        <text left="146" length="1" name="group_objects_text" type="string" width="58">
+                        <text left="146"  name="group_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowGroup"/>
                         <button label="归还..." label_selected="归还..." name="ReturnGroup..." tool_tip="将物体归还其主人。"/>
-                        <text length="1" name="Owned by others:" type="string">
+                        <text  name="Owned by others:" type="string">
                                 为其他人所有:
                         </text>
-                        <text left="146" length="1" name="other_objects_text" type="string" width="58">
+                        <text left="146"  name="other_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowOther"/>
                         <button label="归还..." label_selected="归还..." name="ReturnOther..." tool_tip="将物体归还其主人。"/>
-                        <text length="1" name="Selected / sat upon:" type="string">
+                        <text  name="Selected / sat upon:" type="string">
                                 被选择 / 被坐上的:
                         </text>
-                        <text left="146" length="1" name="selected_objects_text" type="string" width="58">
+                        <text left="146"  name="selected_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
-                        <text length="1" name="Autoreturn" type="string">
+                        <text  name="Autoreturn" type="string">
                                 自动归还其他居民的物体 (分钟, 0为关闭):
                         </text>
                         <line_editor name="clean other time" right="-170"/>
-                        <text length="1" name="Object Owners:" type="string">
+                        <text  name="Object Owners:" type="string">
                                 物体主人:
                         </text>
                         <button label="更新名单" label_selected="更新名单" left="78" name="Refresh List"/>
@@ -263,7 +263,7 @@
                         </name_list>
                 </panel>
                 <panel label="选项" name="land_options_panel">
-                        <text length="1" name="allow_label" type="string">
+                        <text  name="allow_label" type="string">
                                 允许其他居民:
                         </text>
                         <check_box label="编辑地形" name="edit land check" tool_tip="如果选中的话，谁都能编辑您的土地地形。最好是不要选中这项，因为您总可以编辑您自己的土地。"/>
@@ -284,7 +284,7 @@
                         </text>
                         <check_box label="所有居民" name="check other scripts"/>
                         <check_box label="社团" name="check group scripts"/>
-                        <text length="1" name="land_options_label" type="string">
+                        <text  name="land_options_label" type="string">
                                 土地选项:
                         </text>
                         <check_box label="安全 (不会受伤)" name="check safe" tool_tip="如果选中的话，土地设置为安全，禁用格斗伤害。不选中的话，启用格斗伤害。"/>
@@ -392,11 +392,11 @@
                         <string name="mature_check_adult_tooltip">
                                 您的地块信息或其内容被认为是adult内容。
                         </string>
-                        <text length="1" name="Snapshot:" type="string">
+                        <text  name="Snapshot:" type="string">
                                 快照:
                         </text>
                         <texture_picker label="" name="snapshot_ctrl" tool_tip="点击这里来选择图片"/>
-                        <text length="1" name="landing_point" type="string">
+                        <text  name="landing_point" type="string">
                                 着陆点: [LANDING]
                         </text>
                         <string name="landing_point_none">
@@ -404,17 +404,17 @@
                         </string>
                         <button label="设置" label_selected="设置" name="Set" tool_tip="设置访问者抵达时的着陆点。将会设置到您化身在该地块内的位置。"/>
                         <button label="清除" label_selected="清除" name="Clear" tool_tip="清除着陆点"/>
-                        <text length="1" name="Teleport Routing: " type="string">
+                        <text  name="Teleport Routing: " type="string">
                                 瞬间移动传送路线:
                         </text>
                         <combo_box name="landing type" tool_tip="Teleport Routing -- 选择如何应对到你的土地的瞬间移动。">
-                                <combo_item length="1" name="Blocked" type="string">
+                                <combo_item  name="Blocked" type="string">
                                         不允许
                                 </combo_item>
-                                <combo_item length="1" name="LandingPoint" type="string">
+                                <combo_item  name="LandingPoint" type="string">
                                         着陆点
                                 </combo_item>
-                                <combo_item length="1" name="Anywhere" type="string">
+                                <combo_item  name="Anywhere" type="string">
                                         任意位置
                                 </combo_item>
                         </combo_box>
@@ -434,12 +434,43 @@
                                 媒体 URL:
                         </text>
                         <button label="设置..." label_selected="设置..." name="set_media_url"/>
+                        <text
+                                 name="Current URL:">
+                                当前 URL:
+                        </text>
+
+                        <button
+                                 label="重置..."
+                                 label_selected="重置..."
+                                 name="reset_media_url"
+                                 right="-12" />
+                        <check_box label="隐藏媒体 URL" name="hide_media_url" tool_tip="选中该项将会对未被授权的查看该地块信息的人隐藏媒体 URL 。注意对 HTML 类型，此项不可用。"/>
+                        <text
+                                 font="SansSerifSmall"
+                                 name="media_reset"
+                                 right="-264"
+                                 tool_tip="地块在该时间之后，将自动返回初始 URL (0 为不返回)"
+                                 type="string"
+                                 width="185">
+                                在
+                        </text>
+                        <spinner
+                                 name="media_reset_time"
+                                 right="-195"
+                                 tool_tip="地块在该时间之后，将自动返回初始 URL (0 为不返回)" />
+                        <text
+
+                                 name="minutes"
+                                 tool_tip="地块在该时间之后，将自动返回初始 URL (0 为不返回)"
+                                 right="-90">
+                                分钟后回到初始 URL
+                        </text>
                         <text name="Description:">
                                 描述:
                         </text>
                         <line_editor name="url_description" tool_tip="在播放/加载按钮旁显示的文字"/>
-                        <text length="1" name="Media texture:" type="string">
-                                媒体 材质:
+                        <text  name="Media texture:" type="string">
+                                材质:
                         </text>
                         <texture_picker label="" name="media texture" tool_tip="点击这里来选择图片"/>
                         <text name="replace_texture_help">
@@ -447,38 +478,98 @@
 显示选择的动画或网页。)
                         </text>
                         <text name="Options:">
-                                媒体 选项:
+                                选项:
                         </text>
                         <check_box label="自动调整内容大小 " name="media_auto_scale" tool_tip="打开此项将自动缩放该地块上的内容。其速度和质量可能会稍稍降低，但不会需要任何其他的材质缩放或对齐。"/>
                         <check_box label="循环播放" name="media_loop" tool_tip="循环播放媒体。当媒体播放完毕时，它将从开始处重新播放。"/>
-                        <check_box label="隐藏媒体 URL" name="hide_media_url" tool_tip="打开该选项将对未经允许的土地信息察看者隐藏媒体 URL。请注意该选项不适用于 HTML 类型。"/>
-                        <check_box label="隐藏音乐 URL" name="hide_music_url" tool_tip="打开该选项将对未经允许的土地信息察看者隐藏音乐 URL。"/>
                         <text name="media_size" tool_tip="渲染媒体的尺寸，设为 0 使用默认值">
                                 媒体尺寸:
                         </text>
-                        <spinner name="media_size_width" tool_tip="渲染媒体的尺寸，设为 0 使用默认值"/>
-                        <spinner name="media_size_height" tool_tip="渲染媒体的尺寸，设为 0 使用默认值"/>
-                        <text name="pixels" right="-10">
+                
+        <spinner name="media_size_width" tool_tip="渲染媒体的尺寸，设为 0 使用默认值"/>
+                        <text
+                                 name="pixels">
                                 像素
                         </text>
+                        <text
+                                 name="Interaction:">
+                                交互:
+                        </text>
+                        <radio_group
+                                 name="radio_navigate_allow">
+                                <radio_item
+                                         name="Anyone"
+                                         tool_tip="任何居民都可以和媒体交互。">
+                                        任何人
+                                </radio_item>
+                                <radio_item
+                                         name="Group"
+                                         tool_tip="社团权限控制谁可以与媒体交互。">
+                                        社团
+                                </radio_item>
+                        </radio_group>
+                        <check_box
+                                 label="仅允许浏览这些域:"
+                                 name="check navigate filter" />
+                        <line_editor
+                                 name="navigate_filter_domain" />
+                        <button
+                                 label="添加..."
+                                 label_selected="添加..."
+                                 name="add_navigate_filter" />
+                        <scroll_list
+                                 name="filter_list">
+                                <column
+                                         label="域名"
+                                         name="domain" />
+                        </scroll_list>
+                        <button
+                                 label="移除"
+                                 label_selected="移除"
+                                 name="remove_navigate_filter" />
+                </panel>
+                <panel
+                         label="音频"
+                         layout="topleft"
+                         name="land_audio_panel"
+                         top_delta="1">
                         <text name="MusicURL:">
                                 音乐 URL:
                         </text>
-                        <line_editor name="music_url" right="-15"/>
+                        <check_box label="隐藏音乐 URL" name="hide_music_url" tool_tip="选中该项将会对未被授权的查看该地块信息的人隐藏媒体 URL 。"/>                      
+
                         <text name="Sound:">
                                 声音:
                         </text>
-                        <check_box label="动作和物品的声音���存在于此地块。" name="check sound local"/>
+                        <check_box label="限������作和物品的声音���此地块。" name="check_sound_local"/>
                         <button label="?" label_selected="?" name="?"/>
-                        <text name="Voice settings:">
+                        <text name="Voice:">
                                 语音:
                         </text>
+<radio_group
+         name="parcel_voice_channel">
+                                <radio_item
+                 name="Estate"
+                 tool_tip="使用地产语音频道。">
+                                        地产频道
+                                </radio_item>
+                                <radio_item
+                 name="Parcel"
+                 tool_tip="限制语音到该地块。">
+                                        地块频道
+                                </radio_item>
+                                <radio_item
+                 name="Disabled"
+                 tool_tip="在此地块上禁用语音。">
+                                        禁用
+                                </radio_item>
+                        </radio_group>
                         <check_box label="使用语音功能" name="parcel_enable_voice_channel"/>
                         <check_box label="允许使用地产声音频道（由地产所创建）" name="parcel_enable_voice_channel_is_estate_disabled"/>
                         <check_box label="限制声音于地块私有频道" name="parcel_enable_voice_channel_parcel"/>
                 </panel>
                 <panel label="访问" name="land_access_panel">
-                        <text length="1" name="Limit access to this parcel to:" type="string">
+                        <text  name="Limit access to this parcel to:" type="string">
                                 对该地块的访问
                         </text>
                         <check_box label="允许公众访问" name="public_access"/>
@@ -500,7 +591,7 @@
                                         社团
                                 </combo_item>
                         </combo_box>
-                        <spinner label="L$ 标价:" name="PriceSpin"/>
+                        <spinner label="[CURRENCY] 标价:" name="PriceSpin"/>
                         <spinner label="访问时间:" name="HoursSpin"/>
                         <text label="总是允许" name="AllowedText">
                                 被允许的居民
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/zh/floater_animation_list.xml
new file mode 100644
index 0000000..43f528a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_animation_list.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="animation list"
+         title="动画列表">
+        <scroll_list
+                 name="animation_list"
+                 tool_tip="按Shift或Ctrl来选择多个条目">
+                <!-- Icons relating to the avatar, currently: tracking, and marked -->
+                <column
+                         name="Anim Name"
+                         label="动画名称" />
+    <column
+                         name="Animation UUID"
+                         label="动画 UUID" />
+    <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
+                <column
+                         name="Source Object UUID"
+                         label="源物体 UUID" />
+    <column
+                         name="Source Owner"
+                         label="源拥有者" />
+    <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
+        </scroll_list>
+ 
+  <button
+                 label="停止选中项"
+                 name="Stop Selected"
+                 tool_tip="停止选中的动画" />
+  <button
+                 label="撤回选中项"
+                 name="Revoke Selected"
+                 tool_tip="撤回选中物体的动画许可" />
+  <button
+                 label="停止+撤回选中项"
+                 name="Stop+Revoke Selected"
+                 tool_tip="撤回选中物体的动画许可，并且停止选中的动画" />
+  <button
+                 label="打开拥有者档案"
+                 name="Open Owner Profile"
+                 tool_tip="打开选中物体拥有者的档案" />
+  <button
+                 label="归还物体"
+                 name="Return Object"
+                 tool_tip="归还选中物体，如果你有相关土地权力的话" />
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index 9e28bf6..4fa2db3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -59,7 +59,7 @@
         </text>
         <combo_box label="" name="emote_combo" tool_tip="控制在动画中的表情">
                 <combo_item name="[None]">
-                        [None]
+                        [无]
                 </combo_item>
                 <combo_item name="Aaaaah">
                         啊啊啊
@@ -147,7 +147,7 @@
 我们推荐从Poser 4软件中导出的BVH文件
         </text>
         <button label="取消" name="cancel_btn"/>
-        <button label="上传(L$[AMOUNT])" name="ok_btn"/>
+        <button label="上传 ([UPLOADFEE])" name="ok_btn"/>
         <string name="failed_to_initialize">
                 初始化动作失败。
         </string>
@@ -161,4 +161,7 @@
 
 [STATUS]
         </string>
+        <string name="in_world">
+                动画预览将在你的化身上播放。
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_ao.xml b/linden/indra/newview/skins/default/xui/zh/floater_ao.xml
new file mode 100644
index 0000000..df83b85
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_ao.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="geminifloater"
+         title="动画覆盖">
+ 
+  <text
+                 name="Give inventory"
+                 tool_tip="拖动 ZHAO II 记事卡到这里。动画必须和记事卡在同一个文件夹中。">
+    拖动 ZHAO II 记事卡到这里
+  </text>
+  <text
+                 name="ao_nc_text"
+                 tool_tip="">
+    目前设置到: ITEM
+  </text>
+ 
+  <button
+                 name="opencard"
+                 label="打开记事卡" />
+  <button
+                 name="reloadcard"
+                 label="啥信" />
+ 
+  <check_box
+                 label="启用动画覆盖"
+                 name="AOEnabled" />
+  <check_box
+                 label="启用坐姿覆盖"
+                 name="AOSitsEnabled" />
+ 
+  <text
+                 name="buttons_desc">
+    站立:
+  </text>
+  <combo_box
+                 name="stands"
+                 label="" />
+  <button
+                 name="prevstand"
+                 tool_tip="上一个站立动画"
+                 label="&lt;&lt;" />
+  <button
+                 name="nextstand"
+                 tool_tip="下一个站立动画"
+                 label="&gt;&gt;" />
+  <check_box
+                 label="站立动画顺序随机"
+                 name="AOStandRandomize" />
+  <check_box
+                 label="第一人称视角中禁用站立"
+                 name="AONoStandsInMouselook" />
+  <check_box
+                 label="显示动画覆盖工具栏"
+                 name="ao_remote_checkbox" />
+  <spinner
+                 name="standtime"
+                 label="站立切换时间:"
+                 tool_tip="切换站立动画播放的时间。" />
+ 
+  <button
+                 name="newcard"
+                 label="新建记事卡模板" />
+ 
+  <button
+                 label="展开 &gt;&gt;"
+                 name="more_btn"
+                 tool_tip="高级选项" />
+  <button
+                 label="&lt;&lt; 折叠"
+                 name="less_btn"
+                 tool_tip="高级选项" />
+ 
+  <tab_container
+                 label="默认"
+                 name="tabcontainer"
+                 tab_min_width="50">
+    <panel
+                         label="默认动画"
+                         name="tabdefaultanims">
+ 
+      <text
+                                 name="textdefaultwalk">
+        走路:
+      </text>
+      <text
+                                 name="textdefaultrun">
+        跑步:
+      </text>
+      <text
+                                 name="textdefaultjump">
+        跳跃:
+      </text>
+      <text
+                                 name="textdefaultsit">
+        坐下:
+      </text>
+      <text
+                                 name="textdefaultgsit">
+        坐在地上:
+      </text>
+      <text
+                                 name="textdefaultcrouch">
+        蹲下:
+      </text>
+      <text
+                                 name="textdefaultcrouchwalk">
+        蹲走:
+      </text>
+      <text
+                                 name="textdefaultfall">
+        下落:
+      </text>
+      <text
+                                 name="textdefaulthover">
+        浮空:
+      </text>
+      <combo_box
+                                 name="hovers"
+                                 label="" />
+      <text
+                                 name="textdefaultfly">
+        飞行:
+      </text>
+      <text
+                                 name="textdefaultflyslow">
+        慢速飞行:
+      </text>
+      <text
+                                 name="textdefaultflyup">
+        向上飞行:
+      </text>
+      <text
+                                 name="textdefaultflydown">
+        向下飞行:
+      </text>
+      <text
+                                 name="textdefaultland">
+        着陆:
+      </text>
+      <text
+                                 name="textdefaultstandup">
+        起身:
+      </text>
+      <text
+                                 name="textdefaultprejump">
+        预跳跃:
+      </text>
+  </panel>
+</tab_container>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_area_search.xml b/linden/indra/newview/skins/default/xui/zh/floater_area_search.xml
new file mode 100644
index 0000000..7a8a4d8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_area_search.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="area search"
+         title="区域物体搜索">
+        <text
+                 name="name_label">
+                名称搜索字符串:
+        </text>
+        <text
+                 name="desc_label">
+                描述搜索字符串:
+        </text>
+
+        <text
+                 name="owner_label">
+                拥有者搜索字符串:
+        </text>
+        <text
+                 name="group_label">
+                社团搜索字符串:
+        </text>
+        <scroll_list
+                 name="result_list">
+                <column
+                         name="Name"
+                         label="名称"
+                         tool_tip="双击任何项目在物体的位置显示信标" />
+          <column
+                         name="Description"
+                         label="描述"
+                         tool_tip="双击任何项目在物体的位置显示信标" />
+          <column
+                         name="Owner"
+                         label="拥有者"
+                         tool_tip="双击任何项目在物体的位置显示信标" />
+                <column
+                         name="Group"
+                         label="社团"
+                         tool_tip="双击任何项目在物体的位置显示信标" />
+        </scroll_list>
+        <button
+                 name="Refresh"
+                 label="刷新" />
+        <button
+                 name="Stop"
+                 label="停止" />
+        <text
+                 name="counter">
+                已列出/等待中/总计
+        </text>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/zh/floater_asset_browser.xml
new file mode 100644
index 0000000..32292f5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_asset_browser.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="asset browser"
+         title="材质浏览器">
+
+        <button
+                 label="下一页 &gt;&gt;"
+                 name="button next" />
+ 
+        <button
+                 label="&lt;&lt; 上一页"
+                 name="button previous" />
+ 
+        <button
+                 label="刷新"
+                 name="button refresh" />
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_autocorrect.xml b/linden/indra/newview/skins/default/xui/zh/floater_autocorrect.xml
new file mode 100644
index 0000000..f616163
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_autocorrect.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="em_ac_floater"
+         title="自动更正设置">
+  <check_box
+         font="SansSerif"
+                 label="启用自动更正"
+                 name="em_ac_enable"
+                 tool_tip="你必须选中这个框才能使用这些设置，他将会搜索你的所有可写的文本输入，并用替换项替换任何搜索条目" />
+  <button
+                 name="em_ac_loadlist"
+                 label="读取列表.."
+                 tool_tip="点击这里从文件导入之前导出的列表" />
+  <text
+                 name="em_ac_notecard">
+         
+    拖动要读取的
+    记事卡到这里。
+  </text>
+  <text  
+         font="SansSerif"
+                 name="em_ac_text1">列表名称                                                          列表项目</text>
+  <text
+         font="SansSerif"
+                 name="em_ac_text_name">列表名称</text>
+  <text
+         font="SansSerif"
+                 name="em_ac_text2">作者:</text>
+  <view_border
+                 name="em_ac_box2" />
+  <text
+         font="SansSerif"
+                 name="em_ac_text_author">作者名</text>
+  <check_box
+         font="SansSerif"
+                 label="启用，优先级:"
+                 name="em_ac_list_enabled"
+                 tool_tip="你是否希望使用该列表" />
+  <spinner
+                 label=""
+                 name="em_ac_priority"
+                 tool_tip="决定列表使用的顺序。高优先级的列表将在低优先级列表之前用来替换文字。" />
+  <check_box
+                 label="显示提示"
+                 name="em_ac_list_show"
+                 tool_tip="每当一个单词被替换时，弹出提示" />
+  <check_box
+                 label="匹配整个单词"
+                 name="em_ac_list_style"
+                 tool_tip="仅当整个单词完全匹配时才进行替换。不选中的话，将在单词内部替换文字。" />
+                 <!--Only replace when matches a whole word. If unselected, will replace inside words.-->
+  <button
+                 name="em_ac_deletelist"
+                 label="删除列表"
+                 tool_tip="这将删除整个单词和替换项列表。此动作不能撤销。" />
+  <button
+                 name="em_ac_exportlist"
+                 label="导出列表"
+                 tool_tip="这将保存你的当前列表到文件供共享或编辑。" />
+  <button
+                 name="em_ac_addentry"
+                 label="添加条目" />
+  <button
+                 name="em_ac_rementry"
+                 label="移除条目" />
+  <text
+                 name="em_ac_text3">已自动更正的词数:</text>
+  <text
+                 name="em_ac_stats">计数</text>
+ 
+ 
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index d5dcc23..c99401e 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -24,7 +24,7 @@
                 </panel>
         </tab_container>
         <button label="选择" label_selected="选择" name="Select"/>
-        <button label="���消" label_selected="���消" name="Cancel"/>
+        <button label="���闭" label_selected="���闭" name="Cancel"/>
         <string name="not_found">
                 没有找到“[TEXT]”
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
index ece9941..5727508 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -1,14 +1,84 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="网格选项">
-        <spinner label="网格单位 (米)" name="GridResolution" />
-        <spinner label="网格宽度 (米)" name="GridDrawSize" />
+<floater
+         name="build options floater"
+         title="高级建造选项">
+  <text name="text_box7">        网格选项:</text>
+  <spinner
+                 label="网格单位 (米):"
+                 name="GridResolution" />
+        <spinner
+                 label="网格范围 (米):"
+                 name="GridDrawSize" />
         <check_box
-                 
                  label="启用子单位对齐"
                  name="GridSubUnit" />
         <check_box
-                 
                  label="显示剖面"
                  name="GridCrossSection" />
-        <slider label="格子不透明度" name="GridOpacity" />
+        <slider
+                 label="网格不透明度:"
+                 name="GridOpacity"
+                 value="0.7" />
+ 
+  <text
+                 name="text_box3">        物体大小:</text>
+ 
+  <spinner
+                 label="X 尺寸:"
+                 name="X size" />
+  <spinner
+                 label="Y 尺寸:"
+                 name="Y size" />
+  <spinner
+                 label="Z 尺寸:"
+                 name="Z size" />
+ 
+  <text
+                 name="text_box6">旋转中心:</text>
+  <spinner
+                 label="X 位置:"
+                 name="X pos" />
+  <spinner
+                 label="Y 位置:"
+                 name="Y pos" />
+  <spinner
+                 label="Z 位置:"
+                 name="Z pos" />
+  <check_box
+                 label="值为百分比"
+                 tool_tip="默认设置为百分比，每个轴都设置为 50"
+                 name="PivotPercToggle" />
+ 
+  <check_box
+                 label="显示选中项轮廓"
+                 name="BuildPrefsRenderHighlight_toggle" />
+  <check_box
+                 label="限制选择距离"
+                 tooltip=""
+                 name="limit_select_dist_check" />
+  <check_box
+                 label="显示轴于根元件位置"
+                 tool_tip="默认行为是在链接组的重心位置显示轴。选中该项将在根元件位置显示轴。"
+                 name="BuildPrefsActualRoot_toggle" />
+  <check_box
+                 label="以地块社团创建物体"
+                 tooltip="创建物体时使用地块社团的身份 (如果可能)"
+                 name="grouplandrez" />
+  <spinner
+                 tool_tip="设置移动、旋转和缩放的小数精度"
+                 label="物体编辑小数位:"
+                 name="spinner_decimal" />
+ 
+  <button
+                 label="应用"
+                 name="btn_apply" />
+  <button
+                 label="取消"
+                 name="btn_cancel" />
+  <button
+                 label="确定"
+                 name="btn_ok" />
+  <button
+                 label="重置为默认值"
+                 name="btn_reset" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_busy.xml b/linden/indra/newview/skins/default/xui/zh/floater_busy.xml
new file mode 100644
index 0000000..eb5a9b2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_busy.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="busy"
+         title="IM Response Options"
+         can_tear_off="false">
+ 
+  <check_box
+                 label="自动回复收到的即时消息"
+                 name="InstantMessageResponseEnabled" />
+  <check_box
+                 label="Announce 收到的即时消息"
+                 name="InstantMessageAnnounceIncoming" />
+  <check_box
+                 label="偷走焦点 (Steal focus)/自动回复通告在顶端弹出"
+                 name="InstantMessageAnnounceStealFocus" />
+  <check_box
+                 label="自动回复非好友"
+                 name="InstantMessageResponseFriends" />
+  <check_box
+                 label="自动回复屏蔽的人"
+                 name="InstantMessageResponseMuted" />
+  <check_box
+                 label="自动回复任何人"
+                 name="InstantMessageResponseAnyone" />
+  <check_box
+                 label="对方一开始打字就自动回复"
+                 name="InstantMessageShowOnTyping" />
+  <check_box
+                 label="如果信息被自动回复就不要显示"
+                 name="InstantMessageShowResponded" />
+  <check_box
+                 label="自动回复所有信息" name="InstantMessageResponseRepeat" />
+ 
+  <text
+                 name="text_box1">
+    回复文字:
+  </text>
+  <text
+                 name="text_box_a">
+    使用‘#f’代替收件人的名
+  </text>
+  <text
+                 name="text_box_b">
+    使用‘#l’代替收件人的姓
+  </text>
+  <text
+                 name="text_box_c">
+    使用‘#t’代替当前时间
+  </text>
+ 
+  <check_box
+                 label="回复时同时送出物体"
+                 name="InstantMessageResponseItem" />
+ 
+  <text
+                 name="Give inventory"
+                 tool_tip="拖动到这里的库存条目将会被在自动回复时送出。">
+    拖动库存条目到这里
+  </text>
+ 
+  <text
+                 name="im_give_disp_rect_txt"
+                 tool_tip="">
+    目前设置到: ITEM
+  </text>
+ 
+  <button
+                 label="取消"
+                 name="btn_cancel"
+                 tool_tip=""/>
+  <button
+                 label="确定"
+                 name="btn_ok"
+                 tool_tip="" />
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 2ce722e..7f1d106 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -4,7 +4,7 @@
                 [NAME] 包括:
         </text>
         <text name="buy_text">
-                以 L$[AMOUNT] 从 [NAME] 处购买?
+                以 [CURRENCY][AMOUNT] 从 [NAME] 处购买?
         </text>
         <button label="取消" label_selected="取消" name="cancel_btn" />
         <button label="购买" label_selected="购买" name="buy_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index f4ce5b6..78fc763 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -17,19 +17,19 @@
                 正在连接 LindeX...
         </text>
         <text name="buy_action_unknown">
-                在 LindeX 货币交换所购买 L$
+                在 货币交换所购买 [CURRENCY]
         </text>
         <text name="buy_action">
-                [NAME] L$ [PRICE]
+                [NAME] [CURRENCY] [PRICE]
         </text>
         <text name="currency_action">
-                购买L$
+                购买[CURRENCY]
         </text>
         <line_editor name="currency_amt">
                 1234
         </line_editor>
         <text name="currency_est">
-                需要大概 US$ [USD]
+                需要大概 [REALCURRENCY] [USD]
         </text>
         <text name="getting_data">
                 获取数据...
@@ -38,22 +38,22 @@
                 你目前有
         </text>
         <text name="balance_amount">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text name="buying_label">
                 你正在购买
         </text>
         <text name="buying_amount">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text name="total_label">
                 你的帐户结余是
         </text>
         <text name="total_amount">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text name="purchase_warning_repurchase">
-                确认此次操作只会购买现钞。
+                确认此次操作只会购买货币。
 你需要重试该操作。
         </text>
         <text name="purchase_warning_notenough">
@@ -62,6 +62,6 @@
         <button label="取消" name="cancel_btn"/>
         <button label="购买" name="buy_btn"/>
         <string name="buy_currency">
-                以大约 US$ [USD] 购买 L$ [LINDENS]
+                以大约 [REALCURRENCY] [USD] 购买 [CURRENCY] [LINDENS]
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index 45c5832..2474ed3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -97,7 +97,7 @@
                 你有L$2,100.
         </text>
         <text name="currency_action">
-                购买额外的 L$
+                购买额外的 [CURRENCY]
         </text>
         <line_editor name="currency_amt">
                 1000
@@ -186,10 +186,10 @@
                 你拥有[BUYER]平方米的土地。
         </string>
         <string name="pay_to_for_land">
-                支付L$ [AMOUNT] 至 [SELLER] 购买这块土地
+                支付[CURRENCY] [AMOUNT] 至 [SELLER] 购买这块土地
         </string>
         <string name="buy_for_US">
-                以大约US$[AMOUNT2]购买L$[AMOUNT]，
+                以大约US$[AMOUNT2]购买[CURRENCY][AMOUNT]，
         </string>
         <string name="parcel_meters">
                 这块土地的面积为[AMOUNT]平方米。
@@ -210,30 +210,31 @@
         <string name="sold_without_objects">
                 物品不包括在其中
         </string>
+<!--Does not appear to be using [CURRENCY]-->
         <string name="info_price_string">
-                L$[PRICE]
-（L$[PRICE_PER_SQM]/m²）
+                [CURRENCY][PRICE]
+（[CURRENCY][PRICE_PER_SQM]/m²）
 [SOLD_WITH_OBJECTS]
         </string>
         <string name="insufficient_land_credits">
                 在这次购买完成之前，社团[GROUP]将需要足够的被贡献的土地所用的信用额度，来覆盖这片土地。
         </string>
         <string name="have_enough_lindens">
-                你有L$ [AMOUNT], 这些钱足够购买这块土地。
+                你有[CURRENCY] [AMOUNT], 这些钱足够购买这块土地。
         </string>
         <string name="not_enough_lindens">
-                你只有L$ [AMOUNT], 你还需要 L$ [AMOUNT2]。
+                你只有[CURRENCY] [AMOUNT], 你还需要 [CURRENCY] [AMOUNT2]。
         </string>
         <string name="balance_left">
-                此项消费后, 你还会有L$ [AMOUNT]结余.
+                此项消费后, 你还会有[CURRENCY] [AMOUNT]结余.
         </string>
         <string name="balance_needed">
-                你需要购买至少 L$ [AMOUNT]来购买这块土地。
+                你需要购买至少 [CURRENCY] [AMOUNT]来购买这块土地。
         </string>
         <string name="no_parcel_selected">
                 (没有选择地块)
         </string>
         <string name="buy_currency">
-                以大约 US$ [USD] 购买 L$ [LINDENS]
+                以大约 US$ [USD] 购买 [CURRENCY] [LINDENS]
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index b7c977c..b32286c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -4,7 +4,7 @@
                 以及它的内容：
         </text>
         <text name="buy_text">
-                以 L$[AMOUNT] 从 [NAME] 处购买?
+                以 [CURRENCY][AMOUNT] 从 [NAME] 处购买?
         </text>
         <button label="取消" label_selected="取消" name="cancel_btn" />
         <button label="购买" label_selected="购买" name="buy_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
index 7dcd40d..2fdc1bf 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
@@ -19,13 +19,13 @@
                 -- 日志结束 --
         </string>
   <string name="ScriptQuestionCautionChatGranted">
-        ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, 位于 [REGIONNAME] 地区  [REGIONPOS], 已被授予以下权利： [PERMISSIONS]。
+        ‘[OBJECTNAME]’, ‘[OWNERNAME]’ 所拥有的物体, 位于 [REGIONNAME] 地区 [REGIONPOS], 已被授予以下权利： [PERMISSIONS]。
   </string>
   <string name="ScriptQuestionCautionChatDenied">
-        ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, 位于 [REGIONNAME] 地区  [REGIONPOS], 已被拒绝以下权利： [PERMISSIONS]。
+        ‘[OBJECTNAME]’, ‘[OWNERNAME]’ 所拥有的物体, 位于 [REGIONNAME] 地区 [REGIONPOS], 已被拒绝以下权利： [PERMISSIONS]。
   </string>
   <string name="ScriptTakeMoney">
-        从您那里取走林登币(L$)
+        从您那里取走货币
   </string>
   <string name="ActOnControlInputs">
         对您的控制输入做出反应
@@ -65,6 +65,9 @@
                                 </combo_item>
                         </combo_box>
                         <check_box label="显示屏蔽的文字" name="show mutes"/>
+                        <check_box
+                                 label="翻译聊天 (由 Google 强力驱动)"
+                                 name="translate chat" />
                         <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="显示在该即时通信会话中活动的参与者。"/>
                         <panel name="chat_panel">
                                 <string name="gesture_label">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
index 6d30952..d8735d8 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="floater_chatterbox" title="交流">
+  <string name="unread_count_string_singular">
+    条未读消息
+  </string>
+  <string name="unread_count_string_plural">
+    条未读消息
+  </string>
 </multi_floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox_vertical.xml b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox_vertical.xml
new file mode 100644
index 0000000..c7a4a1e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox_vertical.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+         name="floater_chatterbox"
+         title="交流">
+  <string name="unread_count_string_singular">
+    条未读消息
+  </string>
+  <string name="unread_count_string_plural">
+    条未读消息
+  </string>
+</multi_floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index f43eddd..75d94e1 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="取消" label_selected="取消" name="Cancel" />
+  <string name="none">
+    无
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_command_line.xml b/linden/indra/newview/skins/default/xui/zh/floater_command_line.xml
new file mode 100644
index 0000000..97bb8b5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_command_line.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="busy"
+         title="聊天栏命令"
+         can_tear_off="false">
+  <text
+                 name="loltxt2">        区域内瞬间移动 (用法: 命令 x y z)</text>
+  <text
+                 name="loltxt3">        瞬间移动到地面 (用法: 命令)</text>
+  <text
+                 name="loltxt4">        瞬间移动到高度 (用法: 命令 z)</text>
+  <text
+                 name="loltxt5">        瞬间移动回家 (用法: 命令)</text>
+  <text
+                 name="loltxt6">        创建一个平台 (用法: 命令 0 - 30)</text>
+  <slider
+                 name="CmdLineChatbarPlatformSize"
+                 label="宽度"
+                 tool_tip="您想要多大的平台？" />
+  <text
+                 name="loltxt7">        瞬间移动到其他区域 (用法: 命令 区域名称)</text>
+  <check_box
+                 label="瞬间移动时保持位置"
+                 name="toggle" />
+  <text
+                 name="loltxt8">        计算表达式 (用法: 命令 SIN(2+2))</text>
+  <text
+                 name="add_autokorrect">添加自动更正词汇(命令 列表|原词|更正)</text>
+  <text
+                 name="loltxt9">        改变描绘距离 (用法: 命令 距离)</text>
+  <text
+                 name="loltxt10">        瞬间移动到摄像机位置 (用法: 命令)</text>
+  <text
+                 name="loltxt11">        获取键值相对应的化身名字 (用法: 命令 键值)</text>
+  <text
+                 name="loltxt12">        邀请化身瞬间移动 (用法: 命令 键值)</text>
+  <text
+                 name="loltxt13">        瞬间移动到化身位置 (用法: 命令 名字)</text>
+  <line_editor
+                 tool_tip="名字大小写不重要，只键入名字的一部分也可以。打开小地图的话，效果更佳。"
+                 name="CmdLineChatbarTP2" />
+  <text
+                 name="loltxt14">        打开(on)/关闭(off)动作覆盖器 (用法: 命令 on/off)</text>
+  <text
+                 name="loltxt15">        清除聊天记录 (用法: 命令)</text>
+  <line_editor
+                 tool_tip="清除聊天记录防止卡机。"
+                 name="CmdLineChatbarClearChat" />
+
+  <text
+                 name="set_media_url_text">        设置媒体 URL(用法: 命令 url 类型)</text>
+  <line_editor
+                 tool_tip="设置媒体流位置到指定的 URL 并播放"
+                 name="CmdLineChatbarMedia" />
+  <text
+                 name="set_music_url_text">        设置音乐流 URL (用法: 命令 url)</text>
+
+  <line_editor
+                 tool_tip="设置音乐流位置到指定的 URL 并播放"
+                 name="CmdLineChatbarMusic" />
+  <button
+                 label="?"
+                 name="Help_CmdLine"
+                 tool_tip="点击这里获取该页面设置的帮助。" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_customize.xml b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
index ef14187..d6d1384 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="外���">
+<floater name="floater customize" title="外���">
         <tab_container name="customize tab container">
                 <panel label="身体部位" name="body_parts_placeholder"/>
                 <panel label="体型" name="Shape">
@@ -465,8 +465,92 @@
                         <button label="另存为..." label_selected="另存为..." name="Save As"/>
                         <button label="恢复" label_selected="恢复" name="Revert"/>
                 </panel>
+                <panel label="纹身" name="Tattoo">
+                        <text length="1" name="title">
+                                [DESC]
+                        </text>
+                        <text length="1" name="title_no_modify">
+                                [DESC]: 无法修改
+                        </text>
+                        <text length="1" name="title_loading" type="string">
+                                [DESC]: 载入中...
+                        </text>
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: 没有被穿着
+                        </text>
+                        <text length="1" name="path" type="string">
+                                位于[PATH]
+                        </text>
+                        <text length="1" name="not worn instructions" type="string">
+                                要使用新的纹身，需从你的库存中拖拽一个新的纹身至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
+                        </text>
+                        <text length="1" name="no modify instructions" type="string">
+                                你没有修改这件服饰的权利。
+                        </text>
+                        <text name="Item Action Label">
+                                纹身：
+                        </text>
+                        <texture_picker label="头部纹身" name="Head Tattoo" tool_tip="点击这里来选择图片"/>
+                        <texture_picker label="上身的纹身" name="Upper Tattoo" tool_tip="点击这里来选择图片"/>
+                        <texture_picker label="下身纹身" name="Lower Tattoo" tool_tip="点击这里来选择图片"/>
+                        <color_swatch label="颜色" name="Color/Tint" tool_tip="点击这里来打开色彩选择器"/>
+                        <button label="创建新的纹身" label_selected="创建新的纹身" name="Create New"/>
+                        <button label="脱掉" label_selected="脱掉" name="Take Off"/>
+                        <button label="存储" label_selected="存储" name="Save"/>
+                        <button label="另存为..." label_selected="另存为..." name="Save As"/>
+                        <button label="恢复" label_selected="恢复" name="Revert"/>
+                </panel>
+                <panel label="透明度" name="Alpha">
+                        <text length="1" name="title">
+                                [DESC]
+                        </text>
+                        <text length="1" name="title_no_modify">
+                                [DESC]: 无法修改
+                        </text>
+                        <text length="1" name="title_loading" type="string">
+                                [DESC]: 载入中...
+                        </text>
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: 没有被穿着
+                        </text>
+                        <text length="1" name="path" type="string">
+                                位于[PATH]
+                        </text>
+                        <text length="1" name="not worn instructions" type="string">
+                                要使用新的透明度蒙板，需从你的库存中拖拽一个新的透明度蒙板至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
+                        </text>
+                        <text length="1" name="no modify instructions" type="string">
+                                你没有修改这件服饰的权利。
+                        </text>
+                        <text name="Item Action Label">
+                                透明度蒙板：
+                        </text>
+                        <texture_picker label="头部透明度" name="Head Alpha" tool_tip="点击这里来选择图片"/>
+                        <texture_picker label="上身透明度" name="Upper Alpha" tool_tip="点击这里来选择图片"/>
+                        <texture_picker label="下身透明度" name="Lower Alpha" tool_tip="点击这里来选择图片"/>
+                        <texture_picker label="头发透明度" name="Hair Alpha" tool_tip="点击这里来选择图片"/>
+                        <texture_picker label="眼睛透明度" name="Eye Alpha" tool_tip="点击这里来选择图片"/>
+                        <button label="创建新的透明度蒙板" label_selected="创建新的透明度蒙板" name="Create New"/>
+                        <button label="脱掉" label_selected="脱掉" name="Take Off"/>
+                        <button label="存储" label_selected="存储" name="Save"/>
+                        <button label="另存为..." label_selected="另存为..." name="Save As"/>
+                        <button label="恢复" label_selected="恢复" name="Revert"/>
+                </panel>
         </tab_container>
+        <text
+                 name="AvatarHeightText">
+    化身高度:
+  </text>
+  <text name="includes_shoes">
+    (包括鞋)
+  </text>
+ 
+    <button name="Import" label="导入" />
+    <button name="Export" label="导出" />
+ 
+        <button label="保存为装束" label_selected="保存为装束" name="Make Outfit" />
         <button label="取消" label_selected="取消" name="Cancel"/>
         <button label="确定" label_selected="确定" name="Ok"/>
-        <button label="Make Outfit..." label_selected="制作装束..." name="Make Outfit"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_dictionaries.xml b/linden/indra/newview/skins/default/xui/zh/floater_dictionaries.xml
new file mode 100644
index 0000000..0964d75
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_dictionaries.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="EmeraldIRC_dictionaries"
+         title="下载新词典">
+     <text
+                 name="EmDics_txt">
+以下是可以从 Imprudence 网站下载的附加词典的列表。
+
+请选择您想下载的词典，然后按下载按钮。</text>
+        <combo_box
+                 allow_text_entry="false"
+                 max_chars="255"
+                 name="Emerald_combo_dics"
+                 tool_tip="" />
+     <button
+                 label="下载"
+                 name="Emerald_dic_download" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_directory.xml b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
index 063676a..0850f58 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
@@ -1,7 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="directory" title="搜索">
         <tab_container name="Directory Tabs">
-                <panel label="All" name="find_all_panel">
+                <panel
+                         label="全部"
+                         name="find_all_old_panel">
+                        <text name="find">
+                                查找:
+                        </text>
+                        <button label="搜索" label_selected="搜索" name="Search" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>                       <button
+                                 label="后退"
+                                 name="back_btn" />
+                        <button
+                                 label="前进"
+                                 name="forward_btn" />
+                        <line_editor
+                                 label="搜索"
+                                 name="search_editor"
+                                 tool_tip="搜索第二人生" />
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
+                        <scroll_list
+                                 fg_disable_color="1, 1, 1, 1"
+                                 name="results">
+                                <column
+                                         label=""
+                                         name="icon" />
+                                <column
+                                         label="名称"
+                                         name="name" />
+                                <column
+                                         label="价格"
+                                         name="price" />
+                                <column
+                                         label="时间 (PT)"
+                                         name="date" />
+                                <column
+                                         label="时间"
+                                         name="time" />
+                                <column
+                                         label="流量"
+                                         name="dwell" />
+                                <column
+                                         label="面积"
+                                         name="area" />
+                                <column
+                                         label="[CURRENCY]/m²"
+                                         name="per_meter" />
+                                <column
+                                         label="在线"
+                                         name="online" />
+                                <column
+                                         label="团员"
+                                         name="members" />
+                        </scroll_list>
+                </panel>
+                <panel label="全部 (Web)" name="find_all_panel">
                         <string name="searching_text">
                                 查找中……
                         </string>
@@ -9,7 +69,7 @@
                                 什么也没找到。
                         </string>
                         <text name="find">
-                                寻找：
+                                ������：
                         </text>
                         <line_editor label="搜索" name="search_editor" tool_tip="搜索第二人生"/>
                         <button label="后退" name="back_btn"/>
@@ -35,9 +95,9 @@
                                         Wiki
                                 </combo_item>
                         </combo_box>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <button label="?" label_selected="?" name="?"/>
                         <string name="loading_text">
                                 加载中...
@@ -56,9 +116,9 @@
                         <text name="find">
                                 寻找:
                         </text>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         任意分类
@@ -98,8 +158,8 @@
                         <scroll_list name="results">
                                 <column label="" name="icon"/>
                                 <column label="" name="type"/>
-                                <column label="Name" name="name"/>
-                                <column label="Price" name="price"/>
+                                <column label="名称" name="name"/>
+                                <column label="价格" name="price"/>
                         </scroll_list>
                         <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;"/>
                         <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev"/>
@@ -169,9 +229,9 @@
                                         其他
                                 </combo_item>
                         </combo_box>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <button label="搜索" label_selected="搜索" name="Search" tool_tip="搜索"/>
                         <button label="删除" label_selected="删除" name="Delete"/>
                         <scroll_list name="results">
@@ -185,7 +245,7 @@
                         <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;"/>
                         <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev"/>
                 </panel>
-                <panel label="���门地��" name="showcase_panel">
+                <panel label="���色介绍" name="showcase_panel">
                         <string name="searching_text">
                                 查找中……
                         </string>
@@ -209,15 +269,15 @@
                                 什么也没找到。
                         </string>
                         <string name="land_help_text">
-                                土地可以直接用林登元购买（L$），也可以用林登元或美元拍卖。
+                                土地可以直接用世界中的货币购买，也可以用世界中的货币或真实货币拍卖。
 要直接购买, 进入该地块，然后点击菜单栏上的地点名称。
                         </string>
                         <text name="find">
                                 寻找：
                         </text>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <combo_box bottom="-64" left="224" name="type" width="168">
                                 <combo_item name="AllTypes">
                                         所有类型
@@ -234,7 +294,7 @@
                         </combo_box>
                         <check_box label="标价 &#8804; " name="pricecheck"/>
                         <text name="pricecheck_symbol">
-                                L$
+                            [CURRENCY]
                         </text>
                         <check_box label="地区 &#8805; " name="areacheck"/>
                         <text left="190" name="areacheck_symbol" width="75">
@@ -248,9 +308,9 @@
                                 <column label="" name="type"/>
                                 <column label="名称" name="name"/>
                                 <column label="类型" name="landtype"/>
-                                <column label="L$ 价格" name="price"/>
+                                <column label="[CURRENCY] 价格" name="price"/>
                                 <column label="面积" name="area"/>
-                                <column label="L$/m²" name="per_meter"/>
+                                <column label="[CURRENCY]/m²" name="per_meter"/>
                         </scroll_list>
                         <button label="下一页&gt;" label_selected="下一页&gt;" name="Next &gt;"/>
                         <button label="&lt; 之前" label_selected="&lt; 之前" name="&lt; Prev"/>
@@ -265,9 +325,9 @@
                         <text name="find">
                                 查找:
                         </text>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         任意分类
@@ -389,16 +449,41 @@
                         <line_editor label="查找" name="search_editor" tool_tip="搜索第二人生"/>
                         <button label="后退" name="back_btn"/>
                         <button label="前进" name="forward_btn"/>
-                        <button label="搜索" label_selected="搜索" name="search_btn"/>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <button label="搜索" label_selected="搜索" name="Search"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
+                                 name="incadult" />
+                        <scroll_list
+                                 name="results">
+                                <column
+                                         label=""
+                                         name="icon"
+                                         sort_ascending="false" />
+                                <column
+                                         label=""
+                                         name="type" />
+                                <column
+                                         label="名称"
+                                         name="name" />
+                                <column
+                                         label="团员"
+                                         name="members"
+                                         sort_ascending="false" />
+                                <column
+                                         label=""
+                                         name="score" />
+                        </scroll_list>
                         <string name="loading_text">
                                 加载中...
                         </string>
                         <string name="done_text">
                                 完成
                         </string>
+
                 </panel>
         </tab_container>
+        <check_box
+         name="save_results_check"
+         label="保存搜索结果">
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_display_name.xml b/linden/indra/newview/skins/default/xui/zh/floater_display_name.xml
new file mode 100644
index 0000000..142f446
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Display Name"
+         title="更改显示名称">
+        <text
+                 name="info_text1"
+                 wrap="true">
+                您给化身的名称叫做显示名称。
+        </text>
+        <text
+                 name="info_text2"
+                 wrap="true">
+                您每个星期可以更改一次。
+        </text>
+        <text
+                 name="now_ok_text">
+                如果您愿意的话，现在就可以更改它。
+        </text>
+        <text
+                 name="lockout_text"
+                 visible="false">
+                您必须等到 [TIME] 之后才能更改它。
+        </text>
+        <text
+                 name="set_name_label">
+                新的显示名称:
+        </text>
+        <line_editor
+                 name="display_name_editor" />
+        <text
+                 name="name_confirm_label">
+                再键入一次你的新名字以确认:
+        </text>
+        <line_editor
+                 name="display_name_confirm" />
+    <button
+                 name="save_btn"
+                 label="保存"
+                 tool_tip="保存您的新显示名称" />
+    <button
+                 name="reset_btn"
+                 label="重置"
+                 tool_tip="将显示名称重置为用户名" />
+    <button
+                 name="cancel_btn"
+                 label="取消" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index b5db758..bf16b7f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -38,7 +38,7 @@
                                 地产ID:
                         </text>
                         <text name="parent id">
-                                母��域ID:
+                                上���ID:
                         </text>
                         <line_editor name="parentestate" tool_tip="这是这块区域的母区域。" />
                         <text name="Grid Pos: ">
@@ -53,7 +53,7 @@
                                 帐单明细:
                         </text>
                         <text name="land cost text">
-                                L$每平方米:
+                                [CURRENCY] 每平方米:
                         </text>
                         <button label="更新" label_selected="更新" name="Refresh"
                              tool_tip="点击这里来更新以上信息." />
@@ -88,12 +88,12 @@
                              label_selected="删除目标于他人土地上有脚本的物体"
                              name="Delete Target&apos;s Scripted Objects On Others Land"
                              tool_tip="删除他人土地上目标所有有脚本的物体。(不可复制)的物体将被返还。" />
-                        <button label="删除*任何*土地上选中的脚本���东"
-                             label_selected="删除*任何*土地上选中的脚本���东"
+                        <button label="删除目标于*任何*土地上选中的脚本物���"
+                             label_selected="删除目标于*任何*土地上选中的脚本物���"
                              name="Delete Target&apos;s Scripted Objects On *Any* Land"
                              tool_tip="删除该区域中目标所有有脚本的物体。(不可复制)的物体将被返还。" />
-                        <button label="删除*所有*选中的���东"
-                             label_selected="删除*所有*选中的���东"
+                        <button label="删除*所有*选中的物���"
+                             label_selected="删除*所有*选中的物���"
                              name="Delete *ALL* Of Target&apos;s Objects"
                              tool_tip="删除该区域中目标所有的物体。(不可复制)的物体将被返还。" />
                         <button label="获取首要碰撞源" label_selected="取最首要碰撞源"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/zh/floater_grid_default_selector.xml
new file mode 100644
index 0000000..9921ad2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_grid_default_selector.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="default_grid"
+         title="选择默认网格">
+  <text
+                 name="select_label">
+        或者使用网格管理器添加新的网格
+  </text>
+  <button
+                 label="取消"
+                 name="btn_cancel" />
+  <button
+                 label="确定"
+                 name="btn_ok" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/zh/floater_grid_manager.xml
new file mode 100644
index 0000000..7342567
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_grid_manager.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="floater_login"
+         title="网格管理器">
+ 
+  <!-- Grid Selector -->
+  <text
+                 name="grid_selector_label">
+    选择网格:
+  </text>
+ 
+  <scroll_list
+                 name="grid_selector">
+    <column
+                         label="网格列表"
+                         name="grid" />
+  </scroll_list>
+ 
+  <!-- Grid Selector Buttons -->
+  <button
+                 label="添加新网格"
+                 name="btn_add" />
+  <button
+                 label="创建网格副本"
+                 name="btn_copy" />
+  <button
+                 label="删除网格"
+                 name="btn_delete" />
+ 
+  <!-- Grid Details -->
+  <text
+                 name="gridnick_text">
+    网格昵称 (唯一):
+  </text>
+  <line_editor
+        name="gridnick"
+        label="必须填写" />
+  <text
+                 name="gridname_text">
+    网格名称:
+  </text>
+  <line_editor
+                 name="gridname"
+                 label="必须填写" />
+  <text
+                 name="first_name_text">
+    名:
+  </text>
+  <text
+                 name="username_text">
+    用户名:
+  </text>
+  <text
+                 name="last_name_text">
+    姓:
+  </text>
+  <text
+                 name="avatar_password_text">
+    密码:
+  </text>
+  <text
+                 name="loginuri_text">
+    登入 URI:
+  </text>
+  <line_editor
+                 name="loginuri"
+                 label="必须填写" />
+  <button
+                 label="获取网格信息"
+                 name="btn_gridinfo" />
+  <button
+                 label="清除信息"
+                 name="btn_clear" />
+  <text
+                 name="loginpage_text">
+    网格信息 URL:
+  </text>
+  <text
+                 name="loginpage_text">
+    登入页面:
+  </text>
+  <text
+                 name="helperuri_text">
+    辅助 URI:
+  </text>
+  <text
+                 name="website_text">
+    网站:
+  </text>
+  <text
+                 name="support_text">
+    支持:
+  </text>
+   <text
+                 name="register_text">
+    账户:
+  </text>
+  <text
+                 name="password_text">
+    密码:
+  </text>
+  <text
+                 name="search_text">
+    搜索网页:
+  </text>
+  <button
+                 label="应用"
+                 label_selected="应用"
+                 name="btn_apply" />
+  <button
+                 label="取消"
+                 label_selected="取消"
+                 name="btn_cancel" />
+  <button
+                 label="确定"
+                 label_selected="确定"
+                 name="btn_ok" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_group_titles.xml b/linden/indra/newview/skins/default/xui/zh/floater_group_titles.xml
new file mode 100644
index 0000000..5c24f84
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_group_titles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="goup titles"
+         title="社团头衔">
+        <scroll_list
+                 name="titles_list">
+                <column
+                         name="title"
+                         label="头衔" />
+                <column
+                         name="group_name"
+                         label="社团" />
+                <!--隐藏字段，用于存储 UUID，请保持宽度为 0-->
+        </scroll_list>
+        <button
+                 name="activate"
+                 label="激活"
+                 tool_tip="激活选中的社团头衔" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index d3bf113..02a76a6 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -50,6 +50,10 @@
                 <check_box
                  label="使用无损压缩"
                  name="lossless_check" />
+        <check_box
+                 label="临时图像 (免费)"
+                 name="temp_check"
+                 tooltip="设置资产为临时的，这意味着它是免费的，但是作为代价，仅在一段时间内有效，之后它就消失了。" />
         <button label="取消" name="cancel_btn" />
-        <button label="上传(L$[AMOUNT])" name="ok_btn" />
+        <button label="上传 ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
index fff47d5..5288300 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -4,11 +4,19 @@
              tool_tip="从这份列表中选择一项物体来在世界中突出显示它">
                 <column label="物体名称" name="object_name" />
                 <column label="主人名字" name="owner_name" />
+                <column label="上个拥有者名字" name="last_owner_name" />
                 <column label="创建者名字" name="creator_name" />
+                <column label="面" name="face_num" width="48"/>
+                <column label="顶点" name="vertex_num" width="48" />
+                <column label="脚本" name="script_num" width="48" />
+                <column label="库存总计" name="inv_num" />
                 <column label="创建时间" name="creation_date" />
         </scroll_list>
         <button label="查看主人档案..." name="button owner"
              tool_tip="查看突出显示物体的主人的档案" />
+        <button
+                 label="查看上个拥有者档案" name="button_last_owner"
+                 tool_tip="查看突出显示物体的创建者的档案" />
         <button label="查看创建者档案..." name="button creator"
              tool_tip="查看突出显示物体的创建者的档案" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index a59000c..14af4f9 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -33,7 +33,27 @@
         <string name="add_friend_string">
                 添加为好友
         </string>
-        <flyout_button label="档案..." name="profile_callee_btn"/>
+
+
+  <string
+                 name="add_friend_string">
+    添加好友
+  </string>
+        <flyout_button label="档案..." name="profile_callee_btn" >
+    <flyout_button_item name="history_entry">
+      查看对话历史
+    </flyout_button_item>
+    <flyout_button_item name="pay_entry">
+      付款
+    </flyout_button_item>
+    <flyout_button_item name="teleport_entry">
+     邀请瞬间移动
+    </flyout_button_item>
+  </flyout_button>
+  <text
+                 name="inventory_send">
+    拖动库存条目到这里送出
+  </text>
         <button label="呼叫" name="start_call_btn"/>
         <button label="结束呼叫" name="end_call_btn" pad_right="10" visible="false"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
index 2171bd1..1c35524 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
@@ -54,6 +54,13 @@
                         <button
                                  label="社团信息"
                                  name="group_info_btn" />
+                <flyout_button
+                         label="社团信息"
+                         name="group_info_btn">
+                                <flyout_button_item name="history_entry">
+                                  查看聊天历史
+                                </flyout_button_item>
+                          </flyout_button>
                         <button
                                  image_overlay_alignment="left"
                                  label="加入通话"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
index 1f90496..65f2463 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
@@ -2,9 +2,51 @@
 <floater name="Inventory" title="库存">
         <search_editor label="在这里输入要查找的物体" name="inventory search editor"/>
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="所有物体" name="All Items"/>
-                <inventory_panel label="最近使用的物体" name="Recent Items"/>
+                <inventory_panel label="所有物品" name="All Items"/>
+                <inventory_panel label="最近使用的物品" name="Recent Items"/>
+                <inventory_panel label="穿着的物品" name="Worn Items" />
         </tab_container>
+        <text
+                 name="group_titles_textbox">
+                快速过滤:
+        </text>
+ 
+        <!-- Inventory Type Filter Labels -->
+        <string name="filter_type_all">所有类型</string>
+        <string name="filter_type_animation">动画</string>
+        <string name="filter_type_bodypart">身体部位</string>
+        <string name="filter_type_callingcard">名片</string>
+        <string name="filter_type_clothing">衣物</string>
+        <string name="filter_type_gesture">动作</string>
+        <string name="filter_type_landmark">地标</string>
+        <string name="filter_type_notecard">记事卡</string>
+        <string name="filter_type_object">物体</string>
+        <string name="filter_type_script">脚本</string>
+        <string name="filter_type_sound">声音</string>
+        <string name="filter_type_texture">材质</string>
+        <string name="filter_type_snapshot">快照</string>
+        <string name="filter_type_custom">自定义...</string>
+ 
+        <combo_box
+                 name="Quick Filter"
+                 label="快速过滤">
+ 
+                <combo_item name="filter_type_all">所有类型</combo_item>
+                <combo_item name="filter_type_animation">动画</combo_item>
+                <combo_item name="filter_type_bodypart">身体部位</combo_item>
+                <combo_item name="filter_type_callingcard">名片</combo_item>
+                <combo_item name="filter_type_clothing">衣物</combo_item>
+                <combo_item name="filter_type_gesture">动作</combo_item>
+                <combo_item name="filter_type_landmark">地标</combo_item>
+                <combo_item name="filter_type_notecard">记事卡</combo_item>
+                <combo_item name="filter_type_object">物体</combo_item>
+                <combo_item name="filter_type_script">脚本</combo_item>
+                <combo_item name="filter_type_sound">声音</combo_item>
+                <combo_item name="filter_type_texture">材质</combo_item>
+                <combo_item name="filter_type_snapshot">快照</combo_item>
+                <combo_item name="filter_type_custom">自定义...</combo_item>
+ 
+        </combo_box>
         <menu_bar name="Inventory Menu">
                 <menu label="文件 " name="File">
                         <menu_item_call label="打开" name="Open"/>
@@ -19,7 +61,7 @@
                         <menu_item_call label="新的脚本" name="New Script"/>
                         <menu_item_call label="新的记事卡" name="New Note"/>
                         <menu_item_call label="新的动作" name="New Gesture"/>
-                        <menu name="New Clothes">
+                        <menu name="New Clothes" label="新建衣物">
                                 <menu_item_call label="新建衬衫" name="New Shirt"/>
                                 <menu_item_call label="新建裤子" name="New Pants"/>
                                 <menu_item_call label="新建鞋子" name="New Shoes"/>
@@ -27,10 +69,12 @@
                                 <menu_item_call label="新建夹克" name="New Jacket"/>
                                 <menu_item_call label="新建裙子" name="New Skirt"/>
                                 <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="新建内衣" name="New Undershirt"/>
+                                <menu_item_call label="新建内裤" name="New Underpants"/>
+                                <menu_item_call label="新建纹身"     name="New Tattoo" />
+                                <menu_item_call label="新建透明度蒙板"  name="New Alpha" />
                         </menu>
-                        <menu name="New Body Parts">
+                        <menu name="New Body Parts" label="新建身体部位">
                                 <menu_item_call label="新建外形" name="New Shape"/>
                                 <menu_item_call label="新建皮肤" name="New Skin"/>
                                 <menu_item_call label="新建头发" name="New Hair"/>
@@ -43,5 +87,11 @@
                         <menu_item_check label="文件夹总是按名称排列" name="Folders Always By Name"/>
                         <menu_item_check label="系统文件夹置顶" name="System Folders To Top"/>
                 </menu>
+    <menu label="查找选项" name="Search">
+      <menu_item_check label="按名称" name="By Name" />
+      <menu_item_check label="按创建者" name="By Creator" />
+      <menu_item_check label="按描述" name="By Description" />
+      <menu_item_check label="按全部" name="By All" />
+    </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 34ccc79..b6c9a6c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -68,7 +68,7 @@
                 </radio_item>
         </radio_group>
         <text name="TextPrice">
-                价格：L$
+                价格：[CURRENCY]
         </text>
         <string name="unknown">
                 (未知)
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 95a0808..089de84 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -2,6 +2,7 @@
 <floater name="Inventory Finder" title="inventory_recent_items">
         <check_box label="动画" name="check_animation" />
         <check_box label="通话卡" name="check_calling_card" />
+        <check_box label="身体部位" name="check_bodypart" />
         <check_box label="衣物" name="check_clothing" />
         <check_box label="动作" name="check_gesture" />
         <check_box label="地标" name="check_landmark" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml b/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml
index de512aa..7db5b59 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml
@@ -1,5 +1,205 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="Joystick Configuration">
-        <button label="确定" label_selected="确定" name="ok_btn"/>
-        <button label="取消" label_selected="取消" name="cancel_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Joystick"
+         title="游戏控制器设置">
+ 
+        <check_box
+                 name="enable_joystick">启用手柄:</check_box>
+        <check_box
+                 name="auto_enable_joystick">自动启用手柄</check_box>
+        <spinner
+                 name="JoystickAxis1"
+                 label="X 轴映射" />
+        <spinner
+                 name="JoystickAxis2"
+                 label="Y 轴映射" />
+        <spinner
+                 name="JoystickAxis0"
+                 label="Z 轴映射" />
+ 
+        <spinner
+                 name="JoystickAxis4"
+                 label="俯仰映射" />
+        <spinner
+                 name="JoystickAxis5"
+                 label="偏航映射" />
+        <spinner
+                 name="JoystickAxis3"
+                 label="滚转映射" />
+ 
+        <spinner
+                 name="JoystickAxis6"
+                 label="缩放映射" />
+        <check_box
+                 label="直接缩放"
+                 name="ZoomDirect" />
+        <check_box
+                 label="三维光标"
+                 name="Cursor3D" />
+        <check_box
+                 label="自动平衡"
+                 name="AutoLeveling" />
+ 
+        <text
+                 name="Control Modes:">
+                控制模式:
+        </text>
+ 
+        <check_box
+                 name="JoystickAvatarEnabled">化身</check_box>
+        <check_box
+                 name="JoystickBuildEnabled">建造</check_box>
+        <check_box
+                 name="JoystickFlycamEnabled">浏览</check_box>
+ 
+        <text
+                 name="XScale">X Scale</text>
+        <spinner
+                 name="AvatarAxisScale1" />
+        <spinner
+                 name="BuildAxisScale1" />
+        <spinner
+                 name="FlycamAxisScale1" />
+ 
+        <text
+                 name="YScale">Y Scale</text>
+        <spinner
+                 name="AvatarAxisScale2" />
+        <spinner
+                 name="BuildAxisScale2" />
+        <spinner
+                 name="FlycamAxisScale2" />
+ 
+        <text
+                 name="ZScale">Z Scale</text>
+        <spinner
+                 name="AvatarAxisScale0" />
+        <spinner
+                 name="BuildAxisScale0" />
+        <spinner
+                 name="FlycamAxisScale0" />
+ 
+        <text
+                 name="PitchScale">Pitch Scale</text>
+        <spinner
+                 name="AvatarAxisScale4" />
+        <spinner
+                 name="BuildAxisScale4" />
+        <spinner
+                 name="FlycamAxisScale4" />
+ 
+        <text
+                 name="YawScale">Yaw Scale</text>
+        <spinner
+                 name="AvatarAxisScale5" />
+        <spinner
+                 name="BuildAxisScale5" />
+        <spinner
+                 name="FlycamAxisScale5" />
+ 
+        <text
+                 name="RollScale">Roll Scale</text>
+        <spinner
+                 name="BuildAxisScale3" />
+        <spinner
+                 name="FlycamAxisScale3" />
+ 
+ 
+        <text
+                 name="XDeadZone">X Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone1" />
+        <spinner
+                 name="BuildAxisDeadZone1" />
+        <spinner
+                 name="FlycamAxisDeadZone1" />
+ 
+        <text
+                 name="YDeadZone">Y Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone2" />
+        <spinner
+                 name="BuildAxisDeadZone2" />
+        <spinner
+                 name="FlycamAxisDeadZone2" />
+ 
+        <text
+                 name="ZDeadZone">Z Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone0" />
+        <spinner
+                 name="BuildAxisDeadZone0" />
+        <spinner
+                 name="FlycamAxisDeadZone0" />
+ 
+        <text
+                 name="PitchDeadZone">Pitch Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone4" />
+        <spinner
+                 name="BuildAxisDeadZone4" />
+        <spinner
+                 name="FlycamAxisDeadZone4" />
+ 
+        <text
+                 name="YawDeadZone">Yaw Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone5" />
+        <spinner
+                 name="BuildAxisDeadZone5" />
+        <spinner
+                 name="FlycamAxisDeadZone5" />
+ 
+        <text
+                 name="RollDeadZone">Roll Dead Zone</text>
+        <spinner
+                 name="BuildAxisDeadZone3" />
+        <spinner
+                 name="FlycamAxisDeadZone3" />
+ 
+        <text
+                 name="Feathering">Feathering</text>
+        <slider
+                 label=""
+                 name="AvatarFeathering"
+                 value="0.7" />
+        <slider
+                 label=""
+                 name="BuildFeathering"
+                 value="0.7" />
+        <slider
+                 label=""
+                 name="FlycamFeathering"
+                 value="0.7" />
+ 
+        <text
+                 name="ZoomScale2">Zoom Scale</text>
+        <spinner
+                 name="FlycamAxisScale6"
+                 label="" />
+        <text
+                 name="ZoomDeadZone">Zoom Dead Zone</text>
+        <spinner
+                 name="FlycamAxisDeadZone6"
+                 label="" />
+ 
+        <button
+                 label="SpaceNavigator 默认值"
+                 name="SpaceNavigatorDefaults" />
+ 
+        <button
+                 label="确定"
+                 label_selected="确定"
+                 name="ok_btn" />
+        <button
+                 label="取消"
+                 label_selected="取消"
+                 name="cancel_btn" />
+ 
+        <string
+                 name="JoystickMonitor">游戏控制器监视器</string>
+        <string
+                 name="Axis">轴 [NUM]</string>
+        <string
+                 name="NoDevice">没有检测到设备</string>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/zh/floater_local_asset_browse.xml
new file mode 100644
index 0000000..45f2ea1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_local_asset_browse.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Local Asset Browser: xui --><!-- floater definition start --><floater
+         name="local_bitmap_browser_floater"
+         title="本地材质属性">
+ 
+  <button
+                 name="add_btn"
+                 label="添加" />
+  <button
+                 name="del_btn"
+                 label="移除" />
+  <button
+                 name="upload_btn"
+                 label="上传图像 ([UPLOADFEE])..." />
+    <column
+                         name="bitmap_name"
+                         label="名称" />
+    <column
+                         name="bitmap_uuid"
+                         label="UUID" />
+  </scroll_list>
+  <text
+                 name="path_caption_text"
+                 visible="true">
+    本地路径:
+  </text>
+  <text
+                 name="uuid_caption_text"
+                 visible="true">
+    本地 UUID:
+  </text>
+ 
+  <texture_picker
+                 label="材质"
+                 name="texture_view"/>
+ 
+  <check_box
+                 label="保持更新"
+                 name="keep_updating_checkbox"
+                 tool_tip="启用定时检查硬盘上的位图是否已更新"/>
+ 
+  <combo_box
+                 visible="true"
+                 allow_text_entry="false"
+                 max_chars="20"
+                 name="type_combobox">
+ 
+    <combo_item
+                         name="type_texture"
+                         value="type_texture">
+      材质
+    </combo_item>
+ 
+    <combo_item
+                         name="type_sculptie"
+                         value="type_sculptie">
+      雕塑材质
+    </combo_item>
+ 
+    <combo_item
+                         name="type_layer"
+                         value="type_layer">
+      衣物
+    </combo_item>
+ 
+  </combo_box>
+ 
+  <text
+                 name="time_caption_text"
+                 visible="true">
+    时间:
+  </text>
+ 
+  <text
+                 name="time_text"
+                 visible="true">
+    (date here)
+  </text>
+ 
+  <text
+                 name="link_caption_text"
+                 visible="true">
+    链接:
+  </text>
+ 
+  <text
+                 name="link_text"
+                 visible="true">
+    (link status)
+  </text>
+ 
+  <text
+                 name="name_caption_text"
+                 visible="true">
+    名称:
+  </text>
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
index d10c3e0..1ae48ea 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -10,18 +10,33 @@
                 <layout_panel
                          name="nav_controls">
                         <button
-                                 label="后退"
                                  name="back" />
                         <button
-                                 label="前进"
                                  name="forward" />
                         <button
-                                 label="刷新"
                                  name="reload" />
                         <button
                                  label="转到"
                                  name="go" />
                 </layout_panel>
+    <layout_panel
+                         name="time_controls">
+      <button
+                                 label="快退"
+                                 name="rewind" />
+      <button
+                                 label=""
+                                 name="play" />
+      <button
+                                 label=""
+                                 name="pause" />
+      <button
+                                 label="停止"
+                                 name="stop" />
+      <button
+                                 label="快进"
+                                 name="seek" />
+    </layout_panel>
                 <layout_panel
                          name="parcel_owner_controls">
                         <button
@@ -39,8 +54,9 @@
                         <button
                                  label="关闭"
                                  name="close" />
+                        <button label="设置为主页" name="set_home"/>
                 </layout_panel>
         </layout_stack>
 </floater>
 
-<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
+<!--Translated for Second Life 1.19.1 RC3 -->
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/zh/floater_media_filter.xml
new file mode 100644
index 0000000..c4d63ab
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_media_filter.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="floatermediafilter"
+         title="媒体过滤">
+ 
+        <check_box
+                 name="enable_mediafilter"
+                 label="启用媒体过滤"
+                 tool_tip="根据域名过滤媒体 URL。" />
+ 
+        <check_box
+                 name="filter_only_remote"
+                 label="仅过滤脚本启动的媒体流 (较不安全)"
+                 tool_tip="这将防止弹出窗口询问屏蔽地块上永久设置的URL。仅脚本对媒体URL的更改以及脚本请求播放媒体流会被过滤。" />
+ 
+        <text
+                 name="info1">
+                粗体显示的域名位于持续列表中 (即列于白名单或黑名单中).
+        </text>
+        <text
+                 name="info2">
+                斜体显示的域名位于会话列表中 (即临时被允许或被禁止).
+        </text>
+ 
+        <scroll_list
+                 name="whitelist_list">
+                <column
+                         name="whitelist_col"
+                         label="允许的域名或服务器对象" />
+        </scroll_list>
+ 
+        <scroll_list
+                 name="blacklist_list">
+                <column
+                         name="blacklist_col"
+                         label="阻止的域名或服务器对象" />
+        </scroll_list>
+ 
+        <button
+                 name="add_whitelist"
+                 label="添加..."
+                 tool_tip="添加服务器到允许列表" />
+ 
+        <button
+                 name="remove_whitelist"
+                 label="移除"
+                 tool_tip="从允许列表中清除选中的服务器" />
+ 
+        <button
+                 name="clear_lists"
+                 label="清除列表"
+                 tool_tip="清除所有列表" />
+ 
+        <button
+                 name="show_ips"
+                 label="显示 IP"
+                 tool_tip="显示域名所对应的IP地址 (由于DNS查询，列表刷新时将会使客户端停止)" />
+ 
+        <button
+                 name="add_blacklist"
+                 label="添加..."
+                 tool_tip="添加服务器到" />
+ 
+        <button
+                 name="remove_blacklist"
+                 label="移除"
+                 tool_tip="从禁止列表中清除选中的服务器" />
+ 
+        <text
+                 name="add_text">
+                新域名:
+        </text>
+ 
+        <check_box
+                 name="match_ip"
+                 label="添加/删除相关的 IP"
+                 tool_tip="添加或删除域名时同时添加或删除其 IP 地址" />
+ 
+        <line_editor
+                 name="input_domain"
+                 tool_tip="键入新的URL，域名，IP 地址或脚本对象 HTTP 服务器路径" />
+ 
+        <button
+                 name="cancel_domain"
+                 label="取消" />
+        <button
+                 name="commit_domain"
+                 label="添加"
+                 tool_tip="添加到列表中" />
+</floater>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_message_builder.xml b/linden/indra/newview/skins/default/xui/zh/floater_message_builder.xml
new file mode 100644
index 0000000..efceead
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_message_builder.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Message Builder"
+         title="消息建造器">
+        <scroll_list
+                 name="net_list">
+        </scroll_list>
+        <combo_box
+                 name="untrusted_message_combo"
+                 tool_tip="不可信">
+        </combo_box>
+        <combo_box
+                 name="trusted_message_combo"
+                 tool_tip="可信">
+        </combo_box>
+        <button
+                 name="send_btn"
+                 label="发送"
+                 tool_tip="发送 (Ctrl-Enter)" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml
index 430dd05..50e89c4 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="minimap">
-        <panel label="微型地图" name="mini_mapview" tool_tip="（双击打开地图）"/>
+        <panel label="微型地图" name="mini_mapview"/>
+        <button name="toggle_radar" tool_tip="显示或隐藏雷达" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml b/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
index 55beb81..1f7fc32 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
@@ -7,5 +7,5 @@
                 描述:
         </text>
         <button label="取消" name="cancel_btn" />
-        <button label="上传 (L$[AMOUNT])" name="ok_btn" />
+        <button label="上传 ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
index 8fbbf92..2edaa33 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
@@ -16,6 +16,8 @@
         <check_box label="内衣" name="checkbox_Undershirt" />
         <check_box label="内裤" name="checkbox_Underpants" />
         <check_box label="裙子" name="checkbox_Skirt" />
+        <check_box       label="纹身" name="checkbox_Tattoo" />
+        <check_box       label="透明度" name="checkbox_Alpha" />
         <check_box label="胸部" name="checkbox_Chest" />
         <check_box label="头部" name="checkbox_Skull" />
         <check_box label="左肩" name="checkbox_Left Shoulder" />
@@ -70,6 +72,8 @@
         <text type="string" length="1" name="Items to include in outfit:">
                 装束中包括的物品:
         </text>
+  <button label="全部选中" name="Check All" />
+  <button label="全部不选" name="Uncheck All" />
         <text type="string" length="1" name="Body Parts:">
                 体形
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_notification.xml b/linden/indra/newview/skins/default/xui/zh/floater_notification.xml
new file mode 100644
index 0000000..d24a0fe
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_notification.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         title="提示控制台"
+         name="notification">
+  <combo_box
+                 label="回复"
+                 name="response">
+  </combo_box>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
index ac30075..85ce2f3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -6,9 +6,11 @@
         </text>
 
         <text name="amount text">
-                数量:
+                额度:
+        </text>
+        <text name="message text">
+          备注:
         </text>
-
         <button name="pay btn"    label="支付" />
         <button name="cancel btn" label="取消" />
 
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
index 656d75b..2e54772 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
@@ -20,12 +20,11 @@
                 在这里键入你的信息。
         </text_editor>
         <text name="fine_print">
-                如果你的收件人加入SL，你会得到一份介绍奖励。
         </text>
         <button label="取消" name="cancel_btn"/>
         <button label="发送" name="send_btn"/>
         <string name="default_subject">
-                来自���二人生���明信片
+                来自 [GRID_NAME] 的明信片
         </string>
         <string name="default_message">
                 瞧瞧这个!
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 0af9120..61267ef 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
@@ -5,5 +5,7 @@
         <button label="取消" label_selected="取消" name="Cancel" />
         <button label="应用" label_selected="应用" name="Apply" />
         <button label="帮助" label_selected="帮助" name="Help" />
-
+        <button label="支持"                      name="Support" />
+        <button label="全部重置为默认值"                         name="reset_btn"
+                tooltip="将所有选项恢复到默认值 (需要重启动)"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index af229f1..a27d210 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -28,7 +28,7 @@
                 库:
         </text>
         <text name="steps_label">
-                阶���：
+                ���骤：
         </text>
         <scroll_list name="library_list">
                 动画
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 60ef174..be9daf5 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -4,6 +4,56 @@
         <text type="string" length="1" name="desc txt">
                 描述:
         </text>
+        <menu_bar
+                 name="motecard_menu">
+    <menu
+                         name="File"
+                         label="文件">
+      <menu_item_call
+                                 label="保存"
+                                 name="Save Menu"/>
+      <menu_item_call
+                                 label="导出文字..."
+                                 name="Export Text..." />
+      <menu_item_call
+                                 label="导入文字..."
+                                 name="Import Text..." />
+    </menu>
+                <menu
+                         label="编辑"
+                        name="Edit">
+                        <menu_item_call
+                                 label="撤销"
+                                 name="Undo" />
+                        <menu_item_call
+                                 label="重做"
+                                 name="Redo" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator1" />
+                        <menu_item_call
+                                 label="剪切"
+                                 name="Cut" />
+                        <menu_item_call
+                                 label="复制"
+                                 name="Copy" />
+                        <menu_item_call
+                                 label="粘贴"
+                                 name="Paste" />
+                        <menu_item_call
+                                 label="全选"
+                                 name="Select All" />
+                        <menu_item_call
+                                 label="全不选"
+                                 name="Deselect" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator3" />
+                        <menu_item_call
+                                 label="查找 / 替换..."
+                                 name="Search / Replace..." />
+                </menu>
+        </menu_bar>
         <text_editor type="string" length="1" name="Notecard Editor">
                 请等待...
         </text_editor>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
index 3853f05..f8d2327 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
@@ -6,6 +6,56 @@
         <text type="string" length="1" name="desc txt">
                 描述:
         </text>
+        <menu_bar
+                 name="motecard_menu">
+    <menu
+                         name="File"
+                         label="文件">
+      <menu_item_call
+                                 label="保存"
+                                 name="Save Menu"/>
+      <menu_item_call
+                                 label="导出文字..."
+                                 name="Export Text..." />
+      <menu_item_call
+                                 label="导入文字..."
+                                 name="Import Text..." />
+    </menu>
+                <menu
+                         label="编辑"
+                        name="Edit">
+                        <menu_item_call
+                                 label="撤销"
+                                 name="Undo" />
+                        <menu_item_call
+                                 label="重做"
+                                 name="Redo" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator1" />
+                        <menu_item_call
+                                 label="剪切"
+                                 name="Cut" />
+                        <menu_item_call
+                                 label="复制"
+                                 name="Copy" />
+                        <menu_item_call
+                                 label="粘贴"
+                                 name="Paste" />
+                        <menu_item_call
+                                 label="全选"
+                                 name="Select All" />
+                        <menu_item_call
+                                 label="全不选"
+                                 name="Deselect" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator3" />
+                        <menu_item_call
+                                 label="查找 / 替换..."
+                                 name="Search / Replace..." />
+                </menu>
+        </menu_bar>
         <button label="保留" label_selected="保留" name="Keep" />
         <button label="放弃" label_selected="放弃" name="Discard" />
         <string
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/zh/floater_prim_import.xml
new file mode 100644
index 0000000..dfe1601
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_prim_import.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Import"
+         title="导入进度">
+  <text
+                 name="name_label"> 进度 </text>  
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_radar.xml b/linden/indra/newview/skins/default/xui/zh/floater_radar.xml
new file mode 100644
index 0000000..cdb6d0a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_radar.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="radar"
+         title="雷达">
+ 
+        <scroll_list
+                 name="avatar_list"
+                 tool_tip="点击时按住 Shift 或 Control 选择多名化身">
+                <column
+                         name="marked"
+                         label="标记"
+                         tool_tip="标记的化身" />
+                <column
+                         name="avatar_name"
+                         label="名字"
+                         tool_tip="点击时按住 Shift 或 Control 选择多名化身" />
+                <column
+                         name="distance"
+                         label="距离"
+                         tool_tip="到您的化身的距离 (红色=聊天距离内, 黄色=喊叫距离内, 绿色=描绘距离内)" />
+                <column
+                         name="position"
+                         label="位置"
+                         tool_tip="区域内的位置 (X, Y), 或区域外大致方向" />
+                <column
+                         name="altitude"
+                         label="高度"
+                         tool_tip="高度" />
+        </scroll_list>
+ 
+        <tab_container
+                 name="actions_tab_container">
+                <panel
+                         label="化身"
+                         name="actions_tab">
+                        <!-- upper row -->
+                        <button
+                                 name="profile_btn"
+                                 label="档案"
+                                 tool_tip="显示图片、社团和其他信息" />
+                        <button
+                                 name="track_btn"
+                                 label="追踪/取消"
+                                 tool_tip="切换追踪该化身的位置" />
+                        <button
+                                 name="get_key_btn"
+                                 label="获取键值"
+                                 tool_tip="复制化身的键值到剪贴板" />
+                        <!-- upper middle row -->
+                        <button
+                                 name="im_btn"
+                                 label="即时消息"
+                                 tool_tip="打开即时通信会话" />
+                        <button
+                                 name="offer_btn"
+                                 label="邀请瞬移"
+                                 tool_tip="邀请此人瞬间移动到你的位置" />
+                        <button
+                                 name="teleport_btn"
+                                 label="瞬移到"
+                                 tool_tip="瞬间移动到他人的位置" />                   
+                        <!-- lower middle row-->
+                        <button
+                                 name="mark_btn"
+                                 label="标记/取消"
+                                 tool_tip="在列表中标记或取消标记该化身" />
+                        <button
+                                 name="prev_marked_btn"
+                                 label="上个标记"
+                                 tool_tip="聚焦摄像机于上个已标记的化身" />
+                        <button
+                                 name="next_marked_btn"
+                                 label="下个标记"
+                                 tool_tip="聚焦摄像机于下个已标记的化身" />
+                        <!-- lower row-->
+                        <button
+                                 name="focus_btn"
+                                 label="聚焦"
+                                 tool_tip="聚焦摄像机于当前选中的化身" />
+                        <button
+                                 name="prev_in_list_btn"
+                                 label="上个"
+                                 tool_tip="聚焦摄像机于列表中上一个化身" />
+                        <button
+                                 name="next_in_list_btn"
+                                 label="下个"
+                                 tool_tip="聚焦摄像机于列表中下一个化身" />
+ 
+                </panel>
+ 
+                <panel
+                         label="提醒"
+                         name="alerts_tab">
+                        <check_box
+                                 label="聊天中显示提醒"
+                                 name="radar_alerts"
+                                 tool_tip="在聊天记录中显示进入和离开范围的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开区域"
+                                 name="alerts_sim"
+                                 tool_tip="报告进入或离开区域的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开描绘距离"
+                                 name="alerts_draw"
+                                 tool_tip="报告进入或离开描绘距离的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开喊叫距离"
+                                 name="alerts_shout"
+                                 tool_tip="报告进入或离开喊叫距离的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开聊天距离"
+                                 name="alerts_chat"
+                                 tool_tip="报告进入或离开聊天距离的化身" />
+                </panel>
+ 
+                <panel
+                         label="管理"
+                         name="land_tab">
+ 
+                        <!-- Upper row -->
+                        <button
+                                 name="mute_btn"
+                                 label="屏蔽/解除"
+                                 tool_tip="屏蔽或解除屏蔽该化身 (屏蔽的化身名字会在列表中以红色高亮显示)。" />
+                        <button
+                                 name="freeze_btn"
+                                 label="冻结"
+                                 tool_tip="冻结该化身，防止其移动" />
+                        <button
+                                 name="ar_btn"
+                                 label="报告"
+                                 tool_tip="报告该化身的不良行为。" />
+                        <!-- Lower row -->
+                        <button
+                                 name="eject_btn"
+                                 label="驱逐"
+                                 tool_tip="从地块中驱逐该化身。" />
+ 
+                        <button
+                                 name="estate_eject_btn"
+                                 label="从地产中驱逐"
+                                 tool_tip="从地产中驱逐该化身。" />
+                </panel>
+ 
+                <panel
+                         label="选项"
+                         name="options_tab">
+                        <check_box
+                                 label="更新"
+                                 name="update_enabled_cb"
+                                 tool_tip="选择化身列表应何时更新" />
+                        <text
+                                 name="rate">
+                                        速率:
+                        </text>
+                        <radio_group
+                                 name="update_rate"
+                                 tool_tip="雷达更新频率 (高频率将降低 FPS)">
+                                <radio_item
+                                         name="high">
+                                        高
+                                </radio_item>
+                                <radio_item
+                                         name="medium">
+                                        中
+                                </radio_item>
+                                <radio_item
+                                         name="low">
+                                        低
+                                </radio_item>
+                        </radio_group>
+                        <check_box
+                                 label="关闭时继续提醒"
+                                 name="keep_open"
+                                 tool_tip="隐藏窗口而不关闭，以继续在聊天记录中显示进入的化身" />
+                        <check_box
+                                 label="发送键值到 HUD"
+                                 name="radar_chat_keys"
+                                 tool_tip="设置是否将化身的键值发送给LSL脚本" />
+                        <button
+                                 name="send_keys_btn"
+                                 label="现在发送"
+                                 tool_tip="立即将所有键值发送到 HUD" />
+                </panel>
+        </tab_container>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_rlv_behaviour.xml b/linden/indra/newview/skins/default/xui/zh/floater_rlv_behaviour.xml
new file mode 100644
index 0000000..8aefafd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_rlv_behaviour.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="rlvBehaviours"
+         title="激活的 RLV 限制">
+  <scroll_list
+                 name="behaviour_list">
+    <column
+                         label="限制"
+                         name="behaviour" />
+    <column
+                         label="物体名称"
+                         name="name" />
+  </scroll_list>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
index 27c97aa..28d80c5 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
@@ -54,6 +54,7 @@
                         label="帮助"
                         name="Help">
                         <menu_item_call label="帮助..." name="Help..." />
+                        <menu_item_call label="打开 Autoscript"  name="Launch Autoscript..." width="112" />
                         <menu_item_call
                                  label="LSL Wiki 帮助..."
                                  name="LSL Wiki Help..." />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml b/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml
index d21b657..5a2d724 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml
@@ -4,10 +4,10 @@
         <button label="查找" label_selected="查找" name="search_btn" />
         <button label="替换" label_selected="替换" name="replace_btn" />
         <button label="全部替换" label_selected="全部替换" name="replace_all_btn" />
-        <text type="string" length="1" name="txt">
+        <text type="string" name="search_label">
                 查找
         </text>
-        <text type="string" length="1" name="txt2">
+        <text type="string" name="replace_label">
                 替换
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 7ecc330..499d4c4 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -22,10 +22,10 @@
                 为这块土地选择一个合适的价位
         </text>
         <text name="price_ld">
-                L$
+                [CURRENCY]
         </text>
         <text name="price_per_m">
-                (L$[PER_METER]每平方米)
+                ([CURRENCY][PER_METER] 每平方米)
         </text>
         <text name="sell_to_label">
                 把土地出售给:
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index e0f9a17..ed90d9c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -8,7 +8,7 @@
                         通过电子邮件发送
                 </radio_item>
                 <radio_item name="texture">
-                        保存至库存 (L$[AMOUNT])
+                        保存至库存 ([UPLOADFEE])
                 </radio_item>
                 <radio_item name="local">
                         保存至硬盘
@@ -19,7 +19,7 @@
         </text>
         <button label="刷新截图" name="new_snapshot_btn"/>
         <button label="发送" name="send_btn"/>
-        <button label="上传 (L$[AMOUNT])" name="upload_btn"/>
+        <button label="上传 ([UPLOADFEE])" name="upload_btn"/>
         <flyout_button label="保存" list_position="below" name="save_btn" tool_tip="保存图像到文件">
                 <flyout_button_item name="save_item">
                         保存
@@ -42,13 +42,13 @@
                         当前窗口
                 </combo_item>
                 <combo_item name="640x480">
-                        640x480
+                        640×480
                 </combo_item>
                 <combo_item name="800x600">
-                        800x600
+                        800×600
                 </combo_item>
                 <combo_item name="1024x768">
-                        1024x768
+                        1024×768
                 </combo_item>
                 <combo_item name="Custom">
                         自定义
@@ -59,13 +59,13 @@
                         当前窗口
                 </combo_item>
                 <combo_item name="Small(128x128)">
-                        小 (128x128)
+                        小 (128×128)
                 </combo_item>
                 <combo_item name="Medium(256x256)">
-                        中 (256x256)
+                        中 (256×256)
                 </combo_item>
                 <combo_item name="Large(512x512)">
-                        大 (512x512)
+                        大 (512×512)
                 </combo_item>
                 <combo_item name="Custom">
                         自定义
@@ -76,22 +76,22 @@
                         当前窗口
                 </combo_item>
                 <combo_item name="320x240">
-                        320x240
+                        320×240
                 </combo_item>
                 <combo_item name="640x480">
-                        640x480
+                        640×480
                 </combo_item>
                 <combo_item name="800x600">
-                        800x600
+                        800×600
                 </combo_item>
                 <combo_item name="1024x768">
-                        1024x768
+                        1024×768
                 </combo_item>
                 <combo_item name="1280x1024">
-                        1280x1024
+                        1280×1024
                 </combo_item>
                 <combo_item name="1600x1200">
-                        1600x1200
+                        1600×1200
                 </combo_item>
                 <combo_item name="Custom">
                         自定义
@@ -104,6 +104,9 @@
                 <combo_item name="JPEG">
                         JPEG
                 </combo_item>
+                <combo_item name="TGA">
+                        TGA
+                </combo_item>
                 <combo_item name="BMP">
                         BMP
                 </combo_item>
@@ -112,8 +115,9 @@
         <spinner label="高度" name="snapshot_height"/>
         <check_box label="保持画面宽高比" name="keep_aspect_check"/>
         <slider label="图像质量" name="image_quality_slider"/>
+        <check_box label="双倍解析度" name="high_res_check" />
         <text name="layer_type_label">
-                获取:
+                截取:
         </text>
         <combo_box label="画面图层" name="layer_types">
                 <combo_item name="Colors">
@@ -131,6 +135,8 @@
         <check_box label="保存后保持窗口开启" name="keep_open_check"/>
         <check_box label="冻结当前画面(全屏预览)" name="freeze_frame_check"/>
         <check_box label="自动截图" name="auto_snapshot_check"/>
+        <check_box enabled="true" label="临时图像 (免费)" 
+        tooltip="设置资产为临时的，这意味着它是免费的，但是作为代价，仅在一段时间内有效，之后它就消失了。" />
         <string name="unknown">
                 未知
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index ac9c149..40c564f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
@@ -7,5 +7,5 @@
                 描述:
         </text>
         <button label="取消" label_selected="取消" name="cancel_btn" />
-        <button label="上传 (L$[AMOUNT])" label_selected="上传 (L$[AMOUNT])" name="ok_btn" />
+        <button label="上传 ([UPLOADFEE])" label_selected="上传 ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_teleport_history.xml
new file mode 100644
index 0000000..b4dd5de
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_teleport_history.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="teleporthistory"
+         title="瞬间移动历史">
+        <tab_container
+                 name="tplisttabs">
+                <panel
+                         label="瞬间移动到"
+                         name="TP-in">
+        <scroll_list
+                                 name="places_list_in">
+                <column
+                                         label="区域"
+                                         name="region" />
+                <column
+                                         label="位置"
+                                         name="position" />
+                <column
+                                         label="访问时间"
+                                         name="visited" />
+                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                <column
+                                         label="SLURL"
+                                         name="slurl" />
+                <column
+                                         label="Sim String"
+                                         name="simstring" />
+        </scroll_list>
+                </panel>
+                <panel
+                         label="瞬间移动从"
+                         name="TP-out">
+                        <scroll_list
+                                 name="places_list_out">
+                                <column
+                                         label="区域"
+                                         name="region" />
+                                <column
+                                         label="位置"
+                                         name="position" />
+                                <column
+                                         label="访问时间"
+                                         name="visited" />
+                                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                                <column
+                                         label="SLURL"
+                                         name="slurl" />
+                                <column
+                                         label="Sim String"
+                                         name="simstring" />
+                        </scroll_list>
+                </panel>
+        </tab_container>
+        <button
+                 label="瞬间移动"
+                 label_selected="瞬间移动"
+                 name="teleport"
+                 tool_tip="瞬间移动到所选位置" />
+        <button
+                 label="在地图上显示"
+                 label_selected="在地图上显示"
+                 name="show_on_map"
+                 tool_tip="居中显示该地点" />
+        <button
+                 label="清除历史"
+                 name="clear_history"
+                 tool_tip="清除保存的历史" />
+        <button
+                 label="复制 SLURL 到剪贴板"
+                 name="copy_slurl"
+                 tool_tip="复制当前位置为 SLURL 供分享。" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index bbca686..7e41a58 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -15,6 +15,7 @@
         <button label="默认" label_selected="默认" name="Default" />
         <button label="无材质" label_selected="无材质" name="None" />
         <button label="空白" label_selected="空白" name="Blank" />
+        <button label="透明" label_selected="透明" name="Invisible" />
         <check_box label="显示文件夹" name="show_folders_check" />
         <check_box label="立即应用" name="apply_immediate_check" />
         <button label="" label_selected="" name="Pipette" />
@@ -23,4 +24,38 @@
         <string name="pick title">
                 选择:
         </string>
+ 
+        <tab_container name="actions_tab_container">
+    <panel       label="库存" name="server_tab">
+        <search_editor
+                                 label="在这里键入要查找的材质"
+                                 name="inventory search editor" />
+    </panel>
+    <panel
+                         label="我的电脑"
+                         name="local_tab">
+  <!-- tag: vaa emerald local_asset_browser [begin] -->
+      <text
+                                 name="select_local">
+                 选择你的电脑上的材质在世界内预览
+        Select texture on your computer to preview inworld
+      </text>
+      <button
+                                 label="添加"
+                                 name="Add" />
+      <button
+                                 label="移除"
+                                 name="Remove" />
+      <button
+                                 label="属性..."
+                                 name="Browser" />
+      <scroll_list
+                                 name="local_name_list">
+              <column
+                                         name="unit_name"
+                                         label="名称" />
+            </scroll_list>
+          <!-- tag: vaa emerald local_asset_browser [end] -->
+    </panel>
+  </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
index 4f7bcf1..f608b78 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -14,7 +14,12 @@
         <check_box label="位置" name="radio position"/>
         <check_box label="旋转(Ctrl)" name="radio rotate"/>
         <check_box label="拉伸(Ctrl-Shift)" name="radio stretch"/>
-        <check_box label="选择材质" name="radio select face"/>
+        <check_box label="选择表面添加材质" name="radio select face"/>
+        <check_box label="对齐 (按 Shift 堆砌)"
+             name="radio align"
+       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
+  <button label="链接" label_selected="链接" name="link_btn" />
+  <button label="解除链接" label_selected="解除链接" name="unlink_btn"/>
         <check_box label="编辑连接部件" name="checkbox edit linked parts"/>
         <text name="text ruler mode">
                 标尺：
@@ -33,7 +38,7 @@
         <check_box label="同时拉伸两边" name="checkbox uniform"/>
         <check_box label="拉伸材质" name="checkbox stretch textures"/>
         <check_box label="使用网格" name="checkbox snap to grid"/>
-        <button label="选项..." label_selected="选项..." name="Options..."/>
+        <button label="建����项..." label_selected="建����项..." name="Options..."/>
         <text name="text status">
                 拖动来移动物体, 按住 Shift 拖动来复制
         </text>
@@ -74,11 +79,14 @@
                 强度
         </text>
         <text name="obj_count">
-                选择物���：[COUNT]
+                选择物��数：[COUNT]
         </text>
         <text name="prim_count">
-                元件：[COUNT]
+                元件数：[COUNT]
         </text>
+        <text name="link_num">
+        链接编号: [NUMBER]
+        </text>
         <tab_container name="Object Info Tabs">
                 <panel label="一般" name="General">
                         <text name="Name:">
@@ -98,7 +106,7 @@
                                 主人:
                         </text>
                         <text name="Owner Name">
-                                斯雷萨斯·林登
+                                Kakurady Drakenar
                         </text>
                         <button label="档案..." label_selected="档案..." name="button owner profile"/>
                         <text name="Group:">
@@ -126,7 +134,7 @@
                         <check_box label="在搜索中显示" name="search_check" tool_tip="让别人可以在搜索结果中看到这件物体。"/>
                         <check_box label="出售" name="checkbox for sale"/>
                         <text name="Cost">
-                                价格:   L$
+                                价格:   [CURRENCY]
                         </text>
                         <radio_group name="sale type">
                                 <radio_item name="Original">
@@ -139,6 +147,21 @@
                                         内容
                                 </radio_item>
                         </radio_group>
+      <button
+                                 label="复制键值"
+                                 label_selected="复制键值"
+                                 name="button copy key"
+                                 tool_tip="复制物体的键值到剪贴板。" />
+      <text
+                                 name="Anyone can:">
+        任何人都可以:
+      </text>
+      <check_box
+                                 label="移动"
+                                 name="checkbox allow everyone move" />
+      <check_box
+                                 label="复制"
+                                 name="checkbox allow everyone copy" />
                         <text name="Next owner can:">
                                 下个拥有者可以:
                         </text>
@@ -205,24 +228,24 @@
                                 必须选择一个完整的物体来设置许可。
                         </string>
                         <string name="Cost Default">
-                                价格:      L$
+                                价格:      [CURRENCY]
                         </string>
                         <string name="Cost Total">
-                                总价格:     L$
+                                总价格:     [CURRENCY]
                         </string>
                         <string name="Cost Per Unit">
-                                每���的���格:  L$
+                                单价:      [CURRENCY]
                         </string>
                         <string name="Cost Mixed">
-                                混合价格
+                                价格不相同
                         </string>
                         <string name="Sale Mixed">
-                                混���销售
+                                部��不������
                         </string>
                 </panel>
                 <panel label="物体" name="Object">
                         <text name="select_single">
-                                ��次只能编辑����元件的参数。请选择单个元件。
+                                ��能同时编辑多个元件的参数。请选择单个元件。
                         </text>
                         <text name="edit_object">
                                 编辑物体参数:
@@ -237,15 +260,50 @@
                         <spinner label="X" name="Pos X"/>
                         <spinner label="Y" name="Pos Y"/>
                         <spinner label="Z" name="Pos Z"/>
+      <button
+                                 name="copypos"
+                                 tool_tip="复制位置" />
+      <button
+                                 name="pastepos"
+                                 tool_tip="粘贴位置" />
+      <button
+                                 label="p"
+                                 name="pasteposclip"
+                                 tool_tip="从剪贴板粘贴位置" />
                         <text name="label size">
                                 尺寸 (米)
                         </text>
                         <spinner label="X" name="Scale X"/>
                         <spinner label="Y" name="Scale Y"/>
                         <spinner label="Z" name="Scale Z"/>
+      <button
+                                 label="C"
+                                 name="copysize"
+                                 tool_tip="复制尺寸" />
+      <button
+                                 label="P"
+                                 name="pastesize"
+                                 tool_tip="粘贴尺寸" />
+      <button
+                                 label="p"
+                                 name="pastesizeclip"
+                                 tool_tip="从剪贴板粘贴尺寸" />
                         <text name="label rotation">
                                 旋转 (角度)
                         </text>
+      <button
+                                 label="C"
+                                 name="copyrot"
+                                 tool_tip="复制方向" />
+      <button
+                                 label="P"
+                                 name="pasterot"
+                                 tool_tip="粘贴方向" />
+      <button
+                                 label="p"
+                                 name="pasterotclip"
+                                 tool_tip="从剪贴板粘贴方向" />
+ 
                         <spinner label="X" name="Rot X"/>
                         <spinner label="Y" name="Rot Y"/>
                         <spinner label="Z" name="Rot Z"/>
@@ -518,6 +576,10 @@
                                         编织
                                 </combo_item>
                         </combo_box>
+                        <check_box
+                                 label="对齐平面材质"
+                                 name="checkbox planar align"
+                                 tool_tip="所有选中面的材质与最后选中面的材质对齐。需要选择平面材质映射。" />
                         <text name="tex scale">
                                 每面重复次数
                         </text>
@@ -556,10 +618,10 @@
         </tab_container>
         <panel name="land info panel">
                 <text name="label_parcel_info">
-                        土地信息
+                        土地信息:
                 </text>
                 <text name="label_area_price">
-                        价格: L$[PRICE] 每 [AREA]平方米.
+                        价格: [CURRENCY][PRICE] 每 [AREA]平方米.
                 </text>
                 <text name="label_area">
                         面积: [AREA] 平方米.
@@ -594,8 +656,11 @@
                 点击并拖动来更改视角
         </string>
         <string name="status_grab">
-                拖动以移动，按住Ctrl抬起，Ctrl+Shift旋转
+                拖动以移动，按住 Ctrl 抬起，Ctrl+Shift 旋转
         </string>
+  <string name="status_align">
+    CTRL-A 以对齐到轴, CTRL-Shift-A 堆砌
+  </string>
         <string name="status_place">
                 在世界中点击以创建
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tos.xml b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
index ed16075..29f7341 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -9,8 +9,7 @@
                 服务条款协议
         </text>
         <text name="tos_heading">
-                登陆第二人生前请仔细阅读下列服务条款。要继续登录到第二人生，
-您必须接受该协议。
+                登陆前请仔细阅读下列服务条款。要继续登录，您必须接受该协议。
         </text>
         <web_browser name="tos_html"/>
 
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_voice_license.xml b/linden/indra/newview/skins/default/xui/zh/floater_voice_license.xml
new file mode 100644
index 0000000..06fc9c1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_voice_license.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="modal container"
+         title="">
+  <button
+                 label="继续"
+                 label_selected="继续"
+                 name="Continue" />
+  <button
+                 label="取消"
+                 label_selected="取消"
+                 name="Cancel" />
+  <check_box
+                 label="我接受Vivox使用条例。"
+                 name="agree_chk" />
+  <text
+                 name="license_heading">
+请仔细阅读以下的条例文本。
+要使用Vivox语音聊天，您必须接受条例款项。
+  </text>
+  <!-- Loading text says: "Loading Vivox Acceptable Use Policy..." URL encoded -->
+  <web_browser
+                 name="license_html"
+                 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_water.xml b/linden/indra/newview/skins/default/xui/zh/floater_water.xml
index bc4091a..0defeb3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -5,7 +5,22 @@
         </text>
         <combo_box allow_text_entry="false" max_chars="20" name="WaterPresetsCombo"/>
         <button label="新建" label_selected="新建" name="WaterNewPreset"/>
-        <button label="保存" label_selected="保存" name="WaterSavePreset"/>
+        <flyout_button
+                label="保存到硬盘"
+                name="WaterSavePreset">
+                <flyout_button_item
+                        name="save_inventory_item">
+                        保存到库存
+                </flyout_button_item>
+                <flyout_button_item
+                        name="save_disk_item">
+                        保存到硬盘
+                </flyout_button_item>
+                <flyout_button_item
+                        name="send_to_server_item">
+                        发送到服务器
+                </flyout_button_item>
+        </flyout_button>
         <button label="删除" label_selected="Delete" name="WaterDeletePreset"/>
         <tab_container name="Water Tabs" tab_position="top">
                 <panel label="设置" name="Settings">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_windlight_manager.xml b/linden/indra/newview/skins/default/xui/zh/floater_windlight_manager.xml
new file mode 100644
index 0000000..f69e94d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_windlight_manager.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="WindLight send to server floater"
+         title="WindLight 管理器">
+  <button
+                 label="当前地块"
+                 label_selected="当前地块"
+                 name="this_parcel" />
+  <button
+                 label="所有地块"
+                 label_selected="所有地块"
+                 name="all_parcels" />
+  <button
+                 label="当前区域"
+                 label_selected="当前区域"
+                 name="this_region" />
+  <text
+                 name="KeyFramePresetsText">
+    预设:
+  </text>
+  <button
+                 label="显示"
+                 label_selected="显示"
+                 name="show" />
+  <button
+                 label="设置为当前预设"
+                 label_selected="设置为当前预设"
+                 name="set_to_current" />
+  <button
+                 label="移除"
+                 label_selected="移除"
+                 name="remove" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
index e9c260d..bbce687 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -4,7 +4,22 @@
                 天空预设:
         </text>
         <button label="新建" label_selected="新建" name="WLNewPreset"/>
-        <button label="保存" label_selected="保存" name="WLSavePreset"/>
+        <flyout_button
+                label="保存到硬盘"
+                name="WLSavePreset">
+                <flyout_button_item
+                        name="save_inventory_item">
+                        保存到库存
+                </flyout_button_item>
+                <flyout_button_item
+                        name="save_disk_item">
+                        保存到硬盘
+                </flyout_button_item>
+                <flyout_button_item
+                        name="send_to_server_item">
+                        发送到服务器
+                </flyout_button_item>
+        </flyout_button>
         <button label="删除" label_selected="删除" name="WLDeletePreset"/>
         <button label="日夜循环编辑器" label_selected="日夜循环编辑器" name="WLDayCycleMenuButton"/>
         <tab_container name="WindLight Tabs" tab_position="top">
@@ -64,6 +79,10 @@
                         </text>
                         <button label="?" name="WLMaxAltitudeHelp"/>
                         <slider label="" name="WLMaxAltitude" />
+                        <button 
+                                label="日夜周期编辑器" 
+                                label_selected="日夜周期编辑器" 
+                                name="WLDayCycleMenuButton" />
                 </panel>
                 <panel label="光照" name="Lighting">
                         <text name="SLCText">
@@ -181,6 +200,14 @@
                         <check_box label="Lock" name="WLCloudLockY"/>
                         <check_box label="渲染旧云层" name="DrawClassicClouds"/>
                         <button label="?" name="WLClassicCloudsHelp"/>
+                        <text
+                                         name="WLCloudHeightText">
+                        旧云层高度
+                        </text>
+                        <text
+                                         name="WLCloudClassicRangeText">
+                        旧云层范围
+                        </text>
                 </panel>
         </tab_container>
         <string name="WLDefaultSkyNames">
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_attachment.xml
new file mode 100644
index 0000000..a6204ea
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_attachment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<pie_menu name="Attachment Pie">

+        <menu_item_call label="丢下" name="Drop" />

+        <menu_item_call label="审查" name="Object Inspect" />

+        <menu_item_call label="卸下" name="Detach" />

+        <menu_item_call label="编辑..." name="Edit" />

+</pie_menu>

diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_avatar.xml
new file mode 100644
index 0000000..f23c2f4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_avatar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Avatar Pie">
+        <menu_item_call label="档案..." name="Profile..." />
+        <menu_item_call label="屏蔽" name="Avatar Mute" />
+        <!--TODO-->
+        <menu_item_call label="前往" name="Go To" />
+        <menu_item_call label="报告..." name="abuse"/>
+
+
+        <menu_item_call label="添加好友..." name="Add Friend" />
+        <menu_item_call label="付款..." name="Pay..." />
+        <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="冻结..." name="Freeze..." />
+                <menu_item_call label="赠与名片" name="Give Card" />
+                <menu_item_call label="社团邀请..." name="Invite..." />
+                <menu_item_call label="驱逐..." name="Eject..." />
+                <menu_item_call label="调试..." name="Debug..." />
+                <menu_item_call label="审查" name="Avatar Inspect"/>
+                <menu_item_call label="隐藏" name="Derender" />
+        </pie_menu>
+        <menu_item_call label="发送消息..." name="Send IM..." />
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_land.xml
new file mode 100644
index 0000000..97241fd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_land.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Land Pie">
+        <menu_item_call label="关于土地..." name="About Land..." />
+        <menu_item_call label="建造" name="Create" />
+        <menu_item_call label="前往" name="Go Here" />
+        <menu_item_call label="坐在这里" name="Sit Here" />
+        <menu_item_call label="购买通行证" name="Land Buy Pass" />
+        <menu_item_call label="编辑地形" name="Edit Terrain" />
+        <menu_item_call label="购买土地..." name="Land Buy" />
+        <menu_item_call label="添加地标" name="Add Landmark">
+</pie_menu>
+<!-- Translated for Second Life 1.19.0 (80267) -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_object.xml
new file mode 100644
index 0000000..bb9e8b1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_object.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<pie_menu name="Object Pie">
+        <menu_item_call label="打开" name="Open"/>
+        <menu_item_call label="触摸" name="Object Touch" />
+        <menu_item_call label="坐在这里" name="Object Sit" />
+        <menu_item_call label="拿走" name="Pie Object Take" />
+        <menu_item_call label="付款..." name="Pay..."/>
+        <menu_item_call label="创造" name="Create"/>
+        <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="删除" name="Delete"/>
+                <menu_item_call label="穿上" name="Wear"/>
+                <menu_item_call label="拿走副本" name="Take Copy"/>
+                <pie_menu label="装上到HUD &gt;" name="Object Attach HUD"/>
+                <pie_menu label="装备到&gt;" name="Object Attach"/>
+                <menu_item_call label="归还..." name="Return..."/>
+                <pie_menu label="更多 &gt;" name="Rate Menu">
+                        <menu_item_call label="导出" name="Export" />
+                        <menu_item_call label="屏蔽" name="Object Mute" />
+                        <menu_item_call label="报告..." name="Report Abuse..." />
+                        <menu_item_call label="前往" name="Go To" />
+                        <menu_item_call label="屏蔽" name="Object Mute"/>
+                        <menu_item_call label="审查" name="Object Inspect"/>
+                        <menu_item_call label="隐藏" name="Derender" />
+                        <menu_item_call name="链接" label="Link" />
+                        <menu_item_call name="解除链接" label="Unlink" />
+                </pie_menu>
+                <menu_item_call label="购买..." name="Buy..."/>       
+        </pie_menu>
+        <menu_item_call label="编辑..." name="Edit..."/>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_self.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_self.xml
new file mode 100644
index 0000000..2b79bf2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_self.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Self Pie">
+        <menu_item_call label="档案..." name="Profile..." />
+        <menu_item_call label="社团..." name="Groups..." />
+        <menu_item_call label="去往..." name="Go..." />
+        <menu_item_call label="起身" name="Stand Up" />
+        <menu_item_call label="朋友..." name="Friends..." />
+        <menu_item_call label="动作..." name="Gestures..." />
+        <pie_menu label="脱下 &gt;" name="Take Off &gt;">
+                <pie_menu label="服饰 &gt;" name="Clothes &gt;">
+                        <menu_item_call label="衬衣" name="Shirt" />
+                        <menu_item_call label="裤子" name="Pants" />
+                        <menu_item_call label="鞋子" name="Shoes" />
+                        <menu_item_call label="袜子" name="Socks" />
+                        <menu_item_call label="夹克" name="Jacket" />
+                        <menu_item_call label="手套" name="Gloves" />
+                        <pie_menu label="更多 &gt;" name="More &gt;">
+                                <menu_item_call label="内衣" name="Self Undershirt" />
+                                <menu_item_call label="所有服饰" name="All Clothes" />
+                                <menu_item_call label="内裤" name="Self Underpants" />
+                        </pie_menu>
+                        <menu_item_call label="裙子" name="Skirt" />
+                </pie_menu>
+                <pie_menu label="HUD &gt;" name="Object Detach HUD" />
+                <pie_menu label="卸下 &gt;" name="Object Detach" />
+                <menu_item_call label="分开全部" name="Detach All" />
+        </pie_menu>
+        <menu_item_call label="外观..." name="Appearance..." />
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
index fee52b9..4a1547e 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -22,6 +22,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="新建纹身"     name="New Tattoo" />
+                <menu_item_call label="新建透明度蒙板"  name="New Alpha" />
         </menu>
         <menu name="New Body Parts">
                 <menu_item_call label="新建体型" name="New Shape"/>
@@ -38,6 +40,7 @@
         <menu_item_call label="属性" name="Properties"/>
         <menu_item_call label="重命名" name="Rename"/>
         <menu_item_call label="复制资产UUID" name="Copy Asset UUID"/>
+        <menu_item_call label="剪切" name="Cut" />
         <menu_item_call label="复制" name="Copy"/>
         <menu_item_call label="粘贴" name="Paste"/>
         <menu_item_call label="删除" name="Delete"/>
@@ -55,12 +58,15 @@
         <menu_item_call label="激活" name="Activate"/>
         <menu_item_call label="解除激活" name="Deactivate"/>
         <menu_item_call label="从自己身上卸下" name="Detach From Yourself"/>
-        <menu_item_call label="恢复至上��位置" name="Restore to Last Position"/>
+        <menu_item_call label="恢复至��后位置" name="Restore to Last Position"/>
         <menu_item_call label="穿上" name="Object Wear"/>
         <menu label="装备至" name="Attach To"/>
         <menu label="装备到HUD" name="Attach To HUD"/>
         <menu_item_call label="编辑" name="Wearable Edit"/>
         <menu_item_call label="穿上" name="Wearable Wear"/>
         <menu_item_call label="脱掉" name="Take Off"/>
+        <menu_item_call label="使用 WindLight 设置" name="Use WindLight Settings" />
+        <menu_item_call label="使用水面设置" name="Use WaterLight Settings" />
+        <menu_item_call label="编辑 WindLight 设置" name="Edit WindLight Settings" />
         <menu_item_call label="--无可用选项--" name="--no options--"/>
 </menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_login.xml b/linden/indra/newview/skins/default/xui/zh/menu_login.xml
index a00ae90..8c70de2 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -32,5 +32,25 @@
                          name="About Second Life...">
                         <on_click />
                 </menu_item_call>
+                <menu_item_call
+                         label="Grid Help"
+                         name="Grid Help" />
+                <menu_item_call
+                         label="Imprudence 网络日志"
+                         name="Imprudence Blog" />
+                <menu_item_call
+                         label="Imprudence 论坛"
+                         name="Imprudence Forums" />
+                <menu_item_call
+                         label="关于 Imprudence"
+                         name="About Imprudence" />
+        </menu>
+        <menu
+                 label="高级"
+                 name="Advanced">
+                <menu_item_call
+                         name="Debug Settings"
+                         label="调试设置" />
         </menu>
-</menu_bar>
\ No newline at end of file
+</menu_bar>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
index 7891fd1..321a652 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Attachment Pie">
         <menu_item_call label="档案..." name="Profile..."/>
-        <menu_item_call label="丢下" name="Drop" />
-        <menu_item_call label="社团..." name="Groups..."/>
-        <menu_item_call label="触摸" name="Attachment Object Touch">
-                <on_enable userdata="触摸" name="EnableTouch"/>
-        </menu_item_call>
+        <menu_item_call label="社团..." name="Groups"/>
+        <menu_item_call label="触摸" name="Attachment Touch"/>
+
         <menu_item_call label="起身" name="Stand Up"/>
-        <menu_item_call label="卸下" name="Detach" />
-        <menu_item_call label="好友..." name="Friends..."/>
+
+        <menu_item_call label="好友..." name="Friends"/>
         <menu_item_call label="动作..." name="Gestures..."/>
         <menu_item_call label="外观..." name="Appearance..."/>
         <menu_item_call label="编辑..." name="Edit..."/>
+        <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="丢下" name="Drop" />
+                <menu_item_call label="卸下" name="Detach" />
+                <menu_item_call label="审查" name="Object Inspect" />
+        </pie_menu>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
index 684e9a3..8f983d6 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Avatar Pie">
-        <menu_item_call label="档案..." name="Profile..." />
+        <menu_item_call label="档案" name="Profile" />
         <menu_item_call label="屏蔽" name="Avatar Mute" />
         <!--TODO-->
-        <menu_item_call label="去往" name="Go To" />
-        <menu_item_call label="报告..." name="abuse"/>
+        <menu_item_call label="前往" name="Go To" />
+        <menu_item_call label="社团邀请..." name="Invite..." />
+
         <menu_item_call label="添加好友..." name="Add Friend" />
         <menu_item_call label="付款..." name="Pay..." />
         <pie_menu label="更多 &gt;" name="More &gt;">
-                <menu_item_call label="冻结..." name="Freeze..." />
+                <menu_item_call label="冻结..." name="Freeze" />
                 <menu_item_call label="赠与名片" name="Give Card" />
-                <menu_item_call label="社���邀请..." name="Invite..." />
-                <menu_item_call label="驱逐..." name="Eject..." />
+                <menu_item_call label="报���..." name="abuse"/>
+                <menu_item_call label="驱逐..." name="Eject" />
                 <menu_item_call label="调试..." name="Debug..." />
-                <menu_item_call label="审查" name="Object Inspect"/>
+                <menu_item_call label="审查" name="Avatar Inspect"/>
+                <menu_item_call label="隐藏" name="Derender" />
         </pie_menu>
         <menu_item_call label="发送消息..." name="Send IM..." />
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_hud.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_hud.xml
new file mode 100644
index 0000000..773c5bd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_hud.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="HUD Pie">
+  <menu_item_call        label="丢下" name="Drop" />
+  <menu_item_call        label="触摸" name="Attachment Touch" />
+  <menu_item_call label="审查" name="Object Inspect" />
+  <menu_item_call label="卸下" name="Detach" />
+  <menu_item_call label="编辑..." name="Edit..." />
+</pie_menu>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
index fb420b8..97241fd 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Land Pie">
         <menu_item_call label="关于土地..." name="About Land..." />
-        <menu_item_call label="������" name="Create" />
-        <menu_item_call label="���这里" name="Go Here" />
+        <menu_item_call label="建造" name="Create" />
+        <menu_item_call label="���往" name="Go Here" />
         <menu_item_call label="坐在这里" name="Sit Here" />
         <menu_item_call label="购买通行证" name="Land Buy Pass" />
         <menu_item_call label="编辑地形" name="Edit Terrain" />
         <menu_item_call label="购买土地..." name="Land Buy" />
+        <menu_item_call label="添加地标" name="Add Landmark">
 </pie_menu>
 <!-- Translated for Second Life 1.19.0 (80267) -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index 0a43667..5d28932 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <pie_menu name="Object Pie">
         <menu_item_call label="打开" name="Open"/>
-        <menu_item_call label="创造" name="Create"/>
-        <menu_item_call label="触摸" name="Object Touch">
-                <on_enable userdata="触摸" name="EnableTouch"/>
-        </menu_item_call>
-        <menu_item_call label="坐在这里" name="Object Sit">
-                <on_enable userdata="坐在这里,起身" name="EnableSitOrStand"/>
-        </menu_item_call>
-        <menu_item_call label="拿走" name="Pie Object Take">
-                <on_enable userdata="购买,拿走" name="EnableBuyOrTake"/>
-        </menu_item_call>
+        <menu_item_call label="购买..." name="Buy..."/>
+        <menu_item_call label="触摸" name="Object Touch" />
+        <menu_item_call label="坐在这里" name="Object Sit" />
+        <menu_item_call label="拿走" name="Pie Object Take" />
         <menu_item_call label="付款..." name="Pay..."/>
         <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="建造" name="Create"/>
                 <menu_item_call label="删除" name="Delete"/>
                 <menu_item_call label="穿上" name="Wear"/>
                 <menu_item_call label="拿走副本" name="Take Copy"/>
@@ -20,11 +15,16 @@
                 <pie_menu label="装备到&gt;" name="Object Attach"/>
                 <menu_item_call label="归还..." name="Return..."/>
                 <pie_menu label="更多 &gt;" name="Rate Menu">
-                        <menu_item_call label="报告..." name="Report Abuse..."/>
+                        <menu_item_call label="导出" name="Export" />
+                        <menu_item_call label="屏蔽" name="Object Mute" />
+                        <menu_item_call label="报告..." name="Report Abuse..." />
+                        <menu_item_call label="前往" name="Go To" />
                         <menu_item_call label="屏蔽" name="Object Mute"/>
                         <menu_item_call label="审查" name="Object Inspect"/>
+                        <menu_item_call label="隐藏" name="Derender" />
+                        <menu_item_call name="链接" label="Link" />
+                        <menu_item_call name="解除链接" label="Unlink" />
                 </pie_menu>
-                <menu_item_call label="购买..." name="Buy..."/>
         </pie_menu>
         <menu_item_call label="编辑..." name="Edit..."/>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
index 2b79bf2..75bb349 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Self Pie">
         <menu_item_call label="档案..." name="Profile..." />
-        <menu_item_call label="社团..." name="Groups..." />
-        <menu_item_call label="���往..." name="Go..." />
+        <menu_item_call label="社团" name="Groups" />
+        <menu_item_call label="���往..." name="Go..." />
         <menu_item_call label="起身" name="Stand Up" />
-        <menu_item_call label="朋友..." name="Friends..." />
+        <menu_item_call label="������" name="Friends" />
         <menu_item_call label="动作..." name="Gestures..." />
         <pie_menu label="脱下 &gt;" name="Take Off &gt;">
                 <pie_menu label="服饰 &gt;" name="Clothes &gt;">
@@ -16,7 +16,9 @@
                         <menu_item_call label="手套" name="Gloves" />
                         <pie_menu label="更多 &gt;" name="More &gt;">
                                 <menu_item_call label="内衣" name="Self Undershirt" />
+                                <menu_item_call label="透明度蒙板" name="Self Alpha" />
                                 <menu_item_call label="所有服饰" name="All Clothes" />
+                                <menu_item_call label="纹身" name="Self Tattoo" />
                                 <menu_item_call label="内裤" name="Self Underpants" />
                         </pie_menu>
                         <menu_item_call label="裙子" name="Skirt" />
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
index 36fa667..7282c5e 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
@@ -1,116 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<menu drop_shadow="true"
-     mouse_opaque="false" name="Text Edit Menu" opaque="true">
-        <menu_item_call label="Cut" mouse_opaque="true"
-             name="Cut Text">
-                <on_click function="textfield_cut" userdata="about" />
-                <on_enable function="textfield_cut_enable" />
-        </menu_item_call>
-        <menu_item_call label="Copy" mouse_opaque="true"
-                        name="Copy Text" >
-                <on_click function="textfield_copy" userdata="" />
-                <on_enable function="textfield_copy_enable"  />
-        </menu_item_call>
-        <menu_item_call label="Paste" mouse_opaque="true"
-                        name="Paste Text" >
-                <on_click function="textfield_paste" userdata="" />
-                <on_enable function="textfield_paste_enable" />
-        </menu_item_call>
-        <menu_item_call label="Delete" mouse_opaque="true"
-                        name="Delete Text" >
-                <on_click function="textfield_delete" userdata="" />
-                <on_enable function="textfield_delete_enable" />
-        </menu_item_call>
-                <menu_item_separator />
-        <menu_item_call label="Select All" mouse_opaque="true"
-                        name="Select All Text" >
-                <on_click function="textfield_selectall" userdata="" />
-                <on_enable function="textfield_selectall_enable" />
-        </menu_item_call>
-        <menu_item_separator name="Translate" />
-        <menu drop_shadow="true"
-              mouse_opaque="false" name="Translation Options"
-              bottom_delta="0" label="Translate To..." opaque="true" >
-          <menu_item_call label="English" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="en" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Danish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="da" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="de" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Spanish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="es" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="French" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="fr" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Italian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="it" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Hungarian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="hu" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Dutch" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="nl" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Polish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="pl" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Portugese" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="pt" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Russian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="ru" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Turkish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="tr" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Ukrainian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="uk" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Chinese" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="zh" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Japanese" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="ja" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Korean" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="ko" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-        </menu>
+<menu name="Text Edit Menu">
+  <menu_item_call label="剪切" name="Cut Text" />
+  <menu_item_call label="复制" name="Copy Text" />
+  <menu_item_call label="粘贴" name="Paste Text" />
+  <menu_item_call label="删除" name="Delete Text" />
+  <menu_item_call label="全选" name="Select All Text" />
+  <menu name="Translation Options" label="翻译为...">
+  <!--
+    <menu_item_call label="英语" name="Translate Text" />
+    <menu_item_call label="丹麦语" name="Translate Text" />
+    <menu_item_call label="德语"  name="Translate Text" />
+    <menu_item_call label="西班牙语" name="Translate Text" />
+    <menu_item_call label="法语" name="Translate Text" /> 
+    <menu_item_call label="意大利语" name="Translate Text" />
+    <menu_item_call label="匈牙利语 " name="Translate Text" />
+    <menu_item_call label="荷兰语" name="Translate Text" />
+    <menu_item_call label="波兰语" name="Translate Text" />
+    <menu_item_call label="葡萄牙语" name="Translate Text" />
+    <menu_item_call label="俄语" name="Translate Text" />
+    <menu_item_call label="土耳其语" name="Translate Text" />
+    <menu_item_call label="乌克兰语" name="Translate Text" />
+    <menu_item_call label="中文" name="Translate Text" />
+    <menu_item_call label="日语" name="Translate Text" />
+    <menu_item_call label="韩语/朝鲜语" name="Translate Text" />
+  -->
+  </menu>
 </menu>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 0a2ea1b..b18bbde 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -2,15 +2,19 @@
 <menu_bar name="Main Menu">
         <menu label="文件" name="File">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-                <menu label="上传" name="upload">
-                        <menu_item_call label="图像（L$[COST]）..." name="Upload Image"/>
-                        <menu_item_call label="声音（L$[COST]）..." name="Upload Sound"/>
-                        <menu_item_call label="动画（L$[COST]）..." name="Upload Animation"/>
-                        <menu_item_call label="大宗（每份需付L$[COST]）..." name="Bulk Upload"/>
-                        <menu_item_separator label="-----------" name="separator"/>
+                <menu label="上传" name="Upload">
+                        <menu_item_call label="上传图像 ([UPLOADFEE])..." name="Upload Image"/>
+                        <menu_item_call label="上传声音 ([UPLOADFEE])..." name="Upload Sound"/>
+                        <menu_item_call label="上传动画 ([UPLOADFEE])..." name="Upload Animation"/>
+                        <menu_item_call label="批量上传 (每个文件需 [UPLOADFEE])..." name="Bulk Upload"/>
                         <menu_item_call label="设置默认权限..." name="perm prefs"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="导入物体..." name="Import" />
+                <menu_item_call label="导入并上传... (每个材质 [UPLOADFEE])" name="ImportUpload" />
+                <menu_item_call label="导出所选物体..." name="Export" />
+                <menu_item_call
+                 name="Minimize All Windows"
+                 label="最小化所有窗口" />       
                 <menu_item_call label="关闭窗口" name="Close Window"/>
                 <menu_item_call label="关闭所有窗口" name="Close All Windows"/>
                 <menu_item_separator label="-----------" name="separator2"/>
@@ -49,15 +53,20 @@
                         <menu_item_call label="内衣" name="Menu Undershirt"/>
                         <menu_item_call label="内裤" name="Menu Underpants"/>
                         <menu_item_call label="裙子" name="Skirt"/>
+                        <menu_item_call label="纹身" name="Tattoo" />
+                        <menu_item_call label="透明度蒙板" name="Alpha" />
                         <menu_item_call label="所有服饰" name="All Clothes"/>
                 </menu>
                 <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="动作..." name="Gestures..."/>
+                <menu_item_call label="动作..." name="Gestures"/>
                 <menu_item_call label="档案..." name="Profile..."/>
                 <menu_item_call label="外观..." name="Appearance..."/>
-                <menu_item_separator label="-----------" name="separator7"/>
-                <menu_item_check label="朋友..." name="Friends..."/>
-                <menu_item_call label="社团..." name="Groups..."/>
+                <menu_item_call label="显示名称..." name="Display Name..." />
+                <menu_item_call label="刷新外观" name="Refresh Appearance" />
+                <menu_item_separator label="-----------" name="separator7" />
+                <menu_item_check label="好友..." name="Friends"/>
+                <menu_item_call label="社团..." name="Groups"/>
+                <menu_item_check label="媒体过滤" name="Media Filter" />
                 <menu_item_separator label="-----------" name="separator8"/>
                 <menu_item_call label="参数设置..." name="Preferences..."/>
         </menu>
@@ -69,17 +78,20 @@
                 <menu_item_call label="重新设置视角" name="Reset View"/>
                 <menu_item_call label="查看最后一次聊天者" name="Look at Last Chatter"/>
                 <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="网络浏览器" name="Web Browser" />
                 <menu_item_check label="工具栏" name="Toolbar"/>
                 <menu_item_check label="聊天记录" name="Chat History"/>
                 <menu_item_check label="即时消息" name="Instant Message"/>
                 <menu_item_check label="库存" name="Inventory"/>
                 <menu_item_check label="活跃的说话人" name="Active Speakers"/>
                 <menu_item_check label="屏蔽名单" name="Mute List"/>
+                <menu_item_check label="瞬间移动历史" name="Teleport History" />
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_check label="摄像头控制" name="Camera Controls"/>
                 <menu_item_check label="移动控制" name="Movement Controls"/>
                 <menu_item_check label="世界地图" name="World Map"/>
                 <menu_item_check label="迷你地图" name="Mini-Map"/>
+                <menu_item_check label="动画覆盖" name="AO" />
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_check label="统计条" name="Statistics Bar"/>
                 <menu_item_check label="地块边线" name="Property Lines"/>
@@ -97,11 +109,14 @@
                 <menu_item_check label="隐藏粒子" name="Hide Particles"/>
                 <menu_item_check label="显示界面附件" name="Show HUD Attachments"/>
                 <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="缩小" name="Zoom In"/>
-                <menu_item_call label="默认缩放" name="Zoom Default"/>
-                <menu_item_call label="放大" name="Zoom Out"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu_item_call label="切换全屏状态" name="Toggle Fullscreen"/>
+                <menu label="缩放" name="Zoom Level">
+                        <menu_item_call label="缩小" name="Zoom In"/>
+                        <menu_item_call label="默认缩放" name="Zoom Default"/>
+                        <menu_item_call label="放大" name="Zoom Out"/>
+                </menu>
+                <menu_item_check name="Toggle Advanced Menu" label="高级菜单"/>
                 <menu_item_call label="设置用户界面尺寸为默认值" name="Set UI Size to Default"/>
         </menu>
         <menu label="世界" name="World">
@@ -115,18 +130,19 @@
                 <menu_item_call label="瞬间移动回家" name="Teleport Home"/>
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_call label="设成离开状态" name="Set Away"/>
-                <menu_item_call label="设成繁忙状态" name="Set Busy"/>
+                <menu_item_call label="设成忙碌状态" name="Set Busy"/>
+                <menu_item_check label="自动回复即时消息" name="Auto-Respond to IMs" />
                 <menu_item_call label="停止化身动画" name="Stop Animating My Avatar"/>
                 <menu_item_call label="释放按键" name="Release Keys"/>
                 <menu_item_separator label="-----------" name="separator4"/>
                 <menu_item_call label="帐户历史纪录..." name="Account History..."/>
                 <menu_item_call label="管理我的帐户..." name="Manage My Account..."/>
-                <menu_item_call label="购买 L$..." name="Buy and Sell L$..."/>
+                <menu_item_call label="购买 [CURRENCY]..." name="Buy and Sell L$..."/>
                 <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="我的土地..." name="My Land..."/>
-                <menu_item_call label="关于土地..." name="About Land..."/>
+                <menu_item_call label="我的土地..." name="My Land"/>
+                <menu_item_call label="关于土地..." name="About Land"/>
                 <menu_item_call label="购买土地..." name="Buy Land..."/>
-                <menu_item_call label="地区/地产..." name="Region/Estate..."/>
+                <menu_item_call label="地区/地产..." name="Region/Estate"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu label="环境设置" name="Environment Settings">
                         <menu_item_call label="日出" name="Sunrise"/>
@@ -146,28 +162,34 @@
                         <menu_item_call label="土地" name="Land"/>
                 </menu>
                 <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_check label="只选择我的物体" name="Select Only My Objects"/>
-                <menu_item_check label="只选择可移动的物体" name="Select Only Movable Objects"/>
-                <menu_item_check label="选中包围区域" name="Select By Surrounding"/>
-                <menu_item_check label="显示隐藏的选中项" name="Show Hidden Selection"/>
-                <menu_item_check label="显示选择项的光照半径" name="Show Light Radius for Selection"/>
-                <menu_item_check label="显示选择导引" name="Show Selection Beam"/>
+                <menu label="选择选项" name="Selection Options">
+                        <menu_item_check label="只选择我的物体" name="Select Only My Objects"/>
+                        <menu_item_check label="只选择可移动的物体" name="Select Only Movable Objects"/>
+                        <menu_item_check label="只选择可复制的物体" name="Select Only Copyable Objects" />
+                        <menu_item_check label="包围选择" name="Select By Surrounding" />
+                        <menu_item_check label="显示隐藏的选中项" name="Show Hidden Selection"/>
+                        <menu_item_check label="显示选中项轮廓" name="Show Selection Outlines" />
+                        <menu_item_check label="显示选中项的光照半径" name="Show Light Radius for Selection"/>
+                        <menu_item_check label="显示选择导引" name="Show Selection Beam"/>
+                </menu>
+
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_check label="对齐到网格" name="Snap to Grid"/>
                 <menu_item_call label="在 XY 面上对齐网格" name="Snap Object XY to Grid"/>
                 <menu_item_call label="以选项作为网格" name="Use Selection for Grid"/>
-                <menu_item_call label="������选项..." name="Grid Options..."/>
+                <menu_item_call label="高���建��选项..." name="Advanced Build Options..."/>
                 <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_check label="编辑链接部件" name="Edit Linked Parts" shortcut=""/>
+                <menu_item_check label="编辑链接部件" name="Edit Linked Parts" />
+                <menu_item_check label="选择链接部件" name="Select Linked Parts" />
                 <menu_item_call label="链接" name="Link"/>
                 <menu_item_call label="解除链接" name="Unlink"/>
                 <menu_item_separator label="-----------" name="separator4"/>
                 <menu_item_call label="聚焦于所选物体" name="Focus on Selection"/>
                 <menu_item_call label="缩放到所选物体" name="Zoom to Selection"/>
-                <menu_item_call label="购买物体" name="Menu Object Take">
-                        <on_enable userdata="购买,拿走" name="EnableBuyOrTake"/>
-                </menu_item_call>
+                <menu_item_call label="创建副本" name="Duplicate" />
+                <menu_item_call label="购买物体" name="Menu Object Take" />
                 <menu_item_call label="拿走副本" name="Take Copy"/>
+                <menu_item_call label="归还物体" name="Return..." />
                 <menu_item_call label="将物体存回至物体内容" name="Save Object Back to Object Contents"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu_item_call label="显示脚本警告/错误窗口" name="Show Script Warning/Error Window"/>
@@ -178,17 +200,30 @@
                 <menu_item_call label="重置所选项中脚本" name="Reset Scripts in Selection"/>
                 <menu_item_call label="设置所选项中脚本运行" name="Set Scripts to Running in Selection"/>
                 <menu_item_call label="设置所选项中脚本不运行" name="Set Scripts to Not Running in Selection"/>
+                <menu_item_call
+                         name="Set permissions on selected task inventory"
+                         label="批量设置权限"/>
         </menu>
         <menu label="帮助" name="Help">
                 <menu_item_call label="第二人生帮助" name="Second Life Help"/>
                 <menu_item_call label="教程" name="Tutorial"/>
                 <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="官方林登博客..." name="Official Linden Blog..."/>
+                <menu_item_call label="Imprudence 网络日志" name="Imprudence Blog" />
+                <menu_item_call label="Imprudence 论坛" name="Imprudence Forums" />
+                <menu_item_call label="脚本参考首页" name="Scripting Portal">
+                        <!--
+                        <on_click 
+                                function="PromptShowURL" 
+                                name="ScriptingPortal_url"
+                                userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/zh-Hans" />
+                        -->
+                </menu_item_call>
+
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_call label="脚本 Wiki 门户..." name="Scripting Portal..."/>
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_call label="报告不良行为..." name="Report Abuse..."/>
-                <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp; Hits"/>
                 <menu_item_call label="延迟计量器" name="Lag Meter"/>
                 <menu create_jump_keys="true" drop_shadow="true" label="错误汇报" name="Bug Reporting" opaque="true" tear_off="true">
                         <menu_item_call label="公开 Issue Tracker..." name="Public Issue Tracker..."/>
@@ -199,6 +234,324 @@
                         <menu_item_call label="质量保证 Wiki..." name="QA Wiki..."/>
                         <menu_item_call label="汇报错误..." name="Report Bug..."/>
                 </menu>
-                <menu_item_call label="关于第二人生 meta-impy..." name="About meta-impy..."/>
         </menu>
+        
+        <menu label="高级" name="Advanced">
+                <!-- CONSOLES -->
+                <menu name="Consoles" label="控制台">
+                        <menu_item_check name="Frame Console" label="帧控制台" />
+                        <menu_item_check name="Texture Console" label="材质控制台" />
+                        <menu_item_check name="Debug Console" label="调试信息" />
+                        <menu_item_check name="Fast Timers" label="快速计时器" />
+                        <!-- Requires compiled-in support, I think?
+        <menu_item_check name="Memory" label="Memory"
+                                         shortcut="control|shift|0">
+                <on_click function="Advanced.ToggleConsole"
+                                userdata="memory" />
+                <on_check function="Advanced.CheckConsole"
+                                userdata="memory" />
+        </menu_item_check>
+        -->
+                        <menu_item_call name="Notifications Console" label="提示控制台" />
+                        <menu_item_call name="Message Log" label="消息日志" />
+                        <menu_item_call name="Message Builder" label="消息建筑器" />
+                        <menu_item_call name="Region Info to Debug Console" label="区域信息到调试控制台" />
+                        <menu_item_call name="Group Info to Debug Console" label="社团信息到调试控制台" />
+                        <menu_item_call name="Capabilities Info to Debug Console" label="Capabilities 信息到调试控制台" />
+                </menu>
+                <menu_item_call name="Reload personal setting overrides" label="重新载入个人设置" />
+                <!-- HUD INFO -->
+                <menu name="HUD Info" label="HUD 信息">
+                        <menu_item_check name="Velocity" label="速度" />
+                        <menu_item_check name="Camera" label="摄像机" />
+                        <menu_item_check name="Wind" label="风" />
+                        <!--Field of View-->
+                        <menu_item_check name="FOV" label="FOV" />
+                </menu>
+                <menu_item_call label="坐在地上" name="Ground Sit" />
+                <menu_item_call name="Teleport to Ground" label="瞬间移动到地面" />
+                <menu_item_check label="幻影化身" name="Phantom" />
+                <menu_item_check label="动画列表" name="Animation List" />
+                <menu_item_check label="全功能雷达" name="Full Radar" />
+                <menu_item_check label="区域物体搜索" name="Area Object Search" />
+                <menu_item_check label="资产浏览器" name="asset browser" />
+                <!-- RENDERING -->
+                <menu name="Rendering" label="渲染">
+                        <!-- TYPES -->
+                        <menu name="Types" label="类型">
+                                <menu_item_check name="Simple" label="简单" />
+                                <menu_item_check name="Alpha" label="透明度" />
+                                <menu_item_check name="Tree" label="树木" />
+                                <menu_item_check name="Character" label="人物" />
+                                <menu_item_check name="SurfacePatch" label="SurfacePatch" />
+                                <menu_item_check name="Sky" label="天空" />
+                                <menu_item_check name="Water" label="水面" />
+                                <menu_item_check name="Ground" label="地面" />
+                                <menu_item_check name="Volume" label="体积" />
+                                <menu_item_check name="Grass" label="草木" />
+                                <menu_item_check name="Clouds" label="云层" />
+                                <menu_item_check name="Particles" label="粒子" />
+                                <menu_item_check name="Bump" label="凹凸贴图" />
+                        </menu>
+                        <!-- FEATURES -->
+                        <menu name="Features" label="特征">
+                                <menu_item_check name="UI" label="界面" />
+                                <menu_item_check name="Selected" label="选中项" />
+                                <menu_item_check name="Highlighted" label="高亮" />
+                                <menu_item_check name="Dynamic Textures" label="动态材质" />
+                                <menu_item_check name="Foot Shadows" label="脚阴影" />
+                                <menu_item_check name="Fog" label="雾" />
+                                <menu_item_check name="Test FRInfo" label="测试 FRInfo" />
+                                <menu_item_check name="Flexible Objects" label="活动物体" />
+                        </menu>
+                        <!-- INFO DISPLAYS -->
+                        <menu name="Info Displays" label="信息显示">
+                                <menu_item_check name="Verify" label="验证" />
+                                <menu_item_check name="BBoxes" label="包围盒" />
+                                <menu_item_check name="Points" label="点" />
+                                <menu_item_check name="Octree" label="八叉树" />
+                                <menu_item_check name="Occlusion" label="遮蔽" />
+                                <menu_item_check name="Render Batches" label="渲染批次" />
+                                <menu_item_check name="Animated Textures" label="材质动画" />
+                                <menu_item_check name="Texture Priority" label="材质优先级" />
+                                <menu_item_check name="Avatar Rendering Cost" label="化身渲染开销" />
+                                <menu_item_check name="Texture Area (sqrt(A))" label="材质面积 (sqrt(A))" />
+                                <menu_item_check name="Face Area (sqrt(A))" label="表面面积 (sqrt(A))" />
+                                <menu_item_check name="Pick Render" label="选取渲染" />
+                                <menu_item_check name="Lights" label="光源" />
+                                <menu_item_check name="Particles" label="粒子" />
+                                <menu_item_check name="Composition" label="Composition" />
+                                <menu_item_check name="Glow" label="发光" />
+                                <menu_item_check name="Raycasting" label="光线投射" />
+                                <menu_item_check name="Sculpt" label="雕塑元件" />
+                                <menu_item_check name="Vectorize Perf Test" label="向量化性能测试" />
+                        </menu>
+                        <!-- RENDER TESTS -->
+                        <menu name="Render Tests" label="渲染测试">
+                                <menu_item_check name="Camera Offset" label="摄像机偏移" />
+                                <menu_item_check name="Randomize Framerate" label="随机化帧率" />
+                                <menu_item_check name="Periodic Slow Frame" label="周期性减慢帧" />
+                                <menu_item_check name="Frame Test" label="帧测试" />
+                        </menu>
+                        <menu_item_check name="Axes" label="轴" />
+                        <menu_item_check name="Hide Selected" label="隐藏选中项" />
+                        <menu_item_check name="Tangent Basis" label="切向基础" />
+                        <menu_item_call name="Selected Texture Info" label="选中的材质信息" />
+                        <menu_item_check name="Wireframe" label="线框" />
+                        <menu_item_check name="Object-Object Occlusion" label="对象对对象遮蔽" />
+                        <menu_item_check name="Debug GL" label="调试 GL" />
+                        <menu_item_check name="Debug Pipeline" label="调试流水线" />
+                        <menu_item_check name="Fast Alpha" label="快速透明度" />
+                        <menu_item_check name="Animate Trees" label="树木动画" />
+                        <menu_item_check name="Animate Textures" label="材质动画" />
+                        <menu_item_check name="Disable Textures" label="禁用材质" />
+                        <!-- Disabled because it doesn't seem to be used anymore.
+        <menu_item_check name="HTTP Get Textures"
+                                         label="HTTP Get Textures">
+                <on_click function="ToggleControl"
+                                userdata="ImagePipelineUseHTTP" />
+                <on_check control="ImagePipelineUseHTTP" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Run Multiple Threads" label="运行多个线程" />
+                        <!-- Disabled because it doesn't work very well?
+        <menu_item_check name="Dynamic Reflections"
+                                         label="Dynamic Reflections">
+                <on_click function="ToggleControl"
+                                userdata="RenderDynamicReflections" />
+                <on_check control="RenderDynamicReflections" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Cheesy Beacon" label="给力的信标" />
+                        <menu_item_check name="Attached Lights" label="装备的光源" />
+                        <menu_item_check name="Attached Particles" label="装备的粒子源" />
+                </menu>
+                <!-- WORLD -->
+                <menu name="World" label="世界">
+                        <!-- Disabled because you can't do this in Windlight.
+        <menu_item_check name="Mouse Moves Sun"
+                                         label="Mouse Moves Sun"
+                                         shortcut="control|alt|M">
+                <on_click function="ToggleControl" userdata="MouseSun" />
+                <on_check control="MouseSun" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Sim Sun Override" label="模拟器太阳覆盖" />
+                        <menu_item_call name="Dump Scripted Camera" label="脚本摄像机控制转储" />
+                        <menu_item_check name="Fixed Weather" label="固定天气" />
+                        <menu_item_call name="Dump Region Object Cache" label="转储区域物体缓存" />
+                </menu>
+                <!-- RLVa -->
+                <menu name="RLVa">
+                        <menu name="Debug" label="调试">
+                                <menu_item_check name="Show Debug Messages" label="显示调试信息" />
+                                <menu_item_check name="Enable Legacy Naming" label="启用旧式命名" />
+                        </menu>
+                        <menu_item_check name="Enable Wear" label="启用穿着" />
+                        <menu_item_check name="Hide locked layers" label="隐藏锁定的衣物层次" />
+                        <menu_item_check name="Hide locked attachments" label="隐藏锁定的附件" />
+                        <!--
+        <menu_item_check name="Hide locked inventory"
+                                         label="Hide locked inventory">
+                <on_click function="ToggleControl"
+                                userdata="RLVaHideLockedInventory" />
+                <on_check control="RLVaHideLockedInventory" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Forbid Give to #RLV" label="禁止给与到 #RLV" />
+                        <menu_item_check name="Show Name Tags" label="显示姓名标签" />
+                        <menu_item_call name="Restrictions..." label="限制..." />
+                </menu>
+                <!-- UI -->
+                <menu name="UI" label="界面">
+                        <menu_item_check name="Use default system color picker" label="使用系统默认颜色选择器" />
+                        <menu_item_check name="Show search panel in overlay bar" label="覆盖栏中显示搜索面板" />
+                        <menu_item_call name="Reload Balance" label="重新载入 [CURRENCY] 余额" />
+                        <menu_item_call name="Web Browser Test" label="网络浏览器测试" />
+                        <!--
+                 *TODO: Make this a proper toggle item with the "X" indicator.
+                 1. Add a "Advanced.CheckEditableUI" function in llviewermenu.cpp.
+                 2. Change this surrounding menu_item_call to a menu_item_check.
+                 3. Uncomment the "on_check" line below.
+                -->
+                        <menu_item_call name="Editable UI" label="可编辑的用户界面">
+                                <!--
+                <on_check function="Advanced.CheckEditableUI" userdata="" />
+                -->
+                        </menu_item_call>
+                        <menu_item_call name="Dump SelectMgr" label="转储 SelectMgr" />
+                        <menu_item_call name="Dump Inventory" label="转储库存" />
+                        <menu_item_call name="Dump Focus Holder" label="转储焦点持有者" />
+                        <menu_item_call name="Print Selected Object Info" label="打印选中物体信息" />
+                        <menu_item_call name="Print Agent Info" label="打印 Agent 信息" />
+                        <menu_item_call name="Memory Stats" label="内存状态" />
+                        <menu_item_call name="Clear Cached Group Info" label="清除缓存的社团信息" />
+                        <menu_item_check name="Debug SelectMgr" label="调试 SelectMgr" />
+                        <menu_item_check name="Debug Clicks" label="调试点击" />
+                        <menu_item_check name="Debug Views" label="调试视图" />
+                        <menu_item_check name="Show Name Tooltips" label="显示名称提示" />
+                        <menu_item_check name="Debug Mouse Events" label="调试鼠标事件" />
+                        <menu_item_check name="Debug Keys" label="调试键盘" />
+                        <menu_item_check name="Debug WindowProc" label="调试 WindowProc" />
+                        <menu_item_check name="Debug Text Editor Tips" label="调试文本编辑器提示" />
+                        <menu_item_check name="Show Time" label="显示时间" />
+                        <menu_item_check name="Show Render Info" label="显示渲染信息" />
+                        <menu_item_check name="Show Matrices" label="显示矩阵" />
+                        <menu_item_check name="Show Color Under Cursor" label="显示指针之下的颜色" />
+                </menu>
+                <!-- XUI -->
+                <menu name="XUI">
+                        <menu_item_call name="Floater Test" label="浮动框测试" />
+                        <menu_item_call name="Font Test" label="字体测试" />
+                        <menu_item_call name="Export Menus to XML..." label="导出菜单到 XML..." />
+                        <menu_item_call name="Edit UI..." label="编辑界面..." />
+                        <menu_item_call name="Load from XML..." label="从 XML 读取..." />
+                        <menu_item_call name="Save to XML..." label="保存到 XML..." />
+                        <menu_item_check name="Show XUI Names" label="显示 XUI 名称" />
+                </menu>
+                <!-- CHARACTER -->
+                <menu name="Character" label="人物">
+                        <menu name="Grab Baked Texture" label="获取烘烤材质">
+                                <menu_item_call name="Iris" label="瞳孔" />
+                                <menu_item_call name="Head" label="头部" />
+                                <menu_item_call name="Upper Body" label="上身" />
+                                <menu_item_call name="Lower Body" label="下身" />
+                                <menu_item_call name="Skirt" label="裙子" />
+                        </menu>
+                        <!-- CHARACTER TESTS -->
+                        <menu name="Character Tests" label="人物测试">
+                                <menu_item_call name="Appearance To XML" label="外观到 XML" />
+                                <menu_item_call name="Toggle Character Geometry" label="切换角色几何" />
+                                <menu_item_call name="Test Male" label="测试男性" />
+                                <menu_item_call name="Test Female" label="测试女性" />
+                                <menu_item_call name="Toggle PG" label="测试未成年模式" />
+                                <menu_item_check name="Allow Select Avatar" label="允许选择化身" />
+                        </menu>
+                        <menu_item_check name="Enable Lip Sync (Beta)" label="启用口型同步 (测试)" />
+                        <menu_item_check name="Tap-Tap-Hold To Run" label="双敲并按住跑步" />
+                        <menu_item_call name="Force Params to Default" label="强制参数到默认值" />
+                        <menu_item_call name="Reload Vertex Shader" label="重新载入顶点着色器" />
+                        <menu_item_check label="Animation Info" name="动画信息" />
+                        <!--
+                 *TODO: Make this a proper toggle item with the "X" indicator.
+                 1. Add a "Advanced.CheckSlowmotionAnimation" function in
+                 llviewermenu.cpp.
+                 2. Change this surrounding menu_item_call to a menu_item_check.
+                 3. Uncomment the "on_check" line below.
+        -->
+                        <menu_item_call name="Slow Motion Animations" label="慢动作动画" />
+                        <menu_item_check name="Show Look At" label="显示视线目标" />
+                        <menu_item_check name="Show Point At" label="显示指向目标" />
+                        <menu_item_check name="Private Look At" label="对他人隐藏视线目标" />
+                        <menu_item_check name="Private Point At" label="对他人隐藏指向目标" />
+                        <menu_item_check name="Debug Joint Updates" label="调试关节更新" />
+                        <menu_item_check name="Disable LOD" label="禁用 LOD" />
+                        <menu_item_check name="Debug Character Vis" label="调试人物可见性" />
+                        <!--  Disabled. See DEV-14477
+        <menu_item_check name="Show Collision Plane"
+                                         label="Show Collision Plane">
+                <on_click function="Advanced.ToggleShowCollisionPlane"
+                                userdata="" />
+                <on_check function="Advanced.CheckShowCollisionPlane"
+                                userdata="" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Show Collision Skeleton" label="显示碰撞骨骼" />
+                        <menu_item_check name="Display Agent Target" label="显示 Agent 目标" />
+                        <menu_item_check name="Debug Rotation" label="调试旋转" />
+                        <menu_item_call name="Dump Attachments" label="打印附件" />
+                        <menu_item_call label="Reload Avatar Cloud Particle" name="重新加载化身云粒子" />
+                </menu>
+                <!-- CRASH -->
+                <menu name="Crash" label="崩溃">
+                        <menu_item_call name="Force Bad Memory Access" label="强制无效内存访问" />
+                        <menu_item_call name="Force LLError And Crash" label="强制 LLError 并崩溃" />
+                        <menu_item_call name="Force Infinite Loop" label="强制无限循环" />
+                        <menu_item_call name="Force Driver Crash" label="强制驱动程序崩溃" />
+                        <menu_item_call name="Force Disconnect Viewer" label="强制断开连接" />
+                        <menu_item_check name="Output Debug Minidump" label="输出调试小转储" />
+                </menu>
+                <!-- NETWORK -->
+                <menu name="Network" label="网络">
+                        <menu_item_call name="Enable Message Log" label="启用消息日志" />
+                        <menu_item_call name="Disable Message Log" label="禁用消息日志" />
+                        <menu_item_check name="Velocity Interpolate Objects" label="物体速度插值" />
+                        <menu_item_check name="Ping Interpolate Object Positions" label="Ping Interpolate Object Positions" />
+                        <menu_item_call name="Drop a Packet" label="丢弃一个封包" />
+                </menu>
+                <!-- RECORDER -->
+                <menu name="Recorder" label="记录器">
+                        <menu_item_check name="Full Session Logging" label="录制整个会话" />
+                        <menu_item_call name="Start Logging" label="开始记录" />
+                        <menu_item_call name="Stop Logging" label="停止记录" />
+                        <menu_item_call name="Log 10 Seconds" label="记录 10 秒" />
+                        <menu_item_call name="Log 30 Seconds" label="记录 30 秒" />
+                        <menu_item_call name="Log 60 Seconds" label="记录 60 秒" />
+                        <menu_item_call name="Start Playback" label="开始播放" />
+                        <menu_item_call name="Stop Playback" label="停止播放" />
+                        <menu_item_check name="Loop Playback" label="循环播放" />
+                        <menu_item_call name="Start Record" label="开始录制" />
+                        <menu_item_call name="Stop Record" label="停止录制" />
+                </menu>
+                <!-- ADMIN OPTIONS -->
+                <menu name="Admin Options" label="管理员选项">
+                        <menu_item_check name="View Admin Options" label="显示管理员选项" />
+                        <menu_item_call name="Request Admin Status" label="请求管理员状态" />
+                        <menu_item_call name="Leave Admin Status" label="离开管理员状态" />
+                </menu>
+                <menu_item_check name="Show Updates" label="显示更新" />
+                <menu_item_check name="Quiet Snapshots to Disk" label="无声快照到磁盘" />
+                <menu_item_call name="Compress Image..." label="压缩图像..." />
+                <menu_item_check name="Disable Max Build Constraints" label="禁用建造尺寸最大限制" />
+                <menu_item_check name="Debug Permissions" label="调试权限" />
+                <menu_item_check name="Mouse Smoothing" label="鼠标平滑" />
+                <menu_item_check name="Show Mouselook Crosshairs" label="显示第一人称视角准星" />
+                <menu_item_check name="Console Window" label="控制台窗口" />
+                <menu_item_check name="Restrained Love Support" label="Restrained Love 支持" />
+                <menu_item_check name="Allow Multiple Instances" label="允许多个实例" />
+                <menu_item_call name="Logout" label="登出 (不稳定)" />
+                <menu_item_call name="Debug Settings" label="调试设置" />
+        </menu>
+        
+        
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/zh/mime_types_linux.xml
new file mode 100644
index 0000000..3fedf28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <widgetset name="web">
+                <label name="web_label">
+                        网页内容
+                </label>
+                <tooltip name="web_tooltip">
+                        该区域有网页内容
+                </tooltip>
+                <playtip name="web_playtip">
+                        显示网页内容
+                </playtip>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        影片
+                </label>
+                <tooltip name="movie_tooltip">
+                        这里可以播放影片
+                </tooltip>
+                <playtip name="movie_playtip">
+                        播放影片
+                </playtip>
+        </widgetset>
+        <widgetset name="none">
+                <label name="none_label">
+                        无内容
+                </label>
+                <tooltip name="none_tooltip">
+                        这里没有媒体
+                </tooltip>
+                <playtip name="none_playtip" />
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        图像
+                </label>
+                <tooltip name="image_tooltip">
+                        这里有图像
+                </tooltip>
+                <playtip name="image_playtip">
+                        显示该位置的图像
+                </playtip>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        音频
+                </label>
+                <tooltip name="audio_tooltip">
+                        这里可以播放音频
+                </tooltip>
+                <playtip name="audio_playtip">
+                        播放该位置的音频
+                </playtip>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        实时流媒体 (RTSP)
+                </label>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - 无 -
+                </label>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - 无 -
+                </label>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        音频
+                </label>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        视频
+                </label>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        图像
+                </label>
+        </mimetype>
+        <mimetype name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg 音频/视频
+                </label>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        带格式化的文本 (RTF)
+                </label>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    同步多媒体集成语言 (SMIL)
+                </label>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        网页 (XHTML)
+                </label>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+        </mimetype>
+        <mimetype name="application/x-shockwave-flash">
+                <label name="application/x-shockwave-flash_label">
+                        Flash
+                </label>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        音频 (MIDI)
+                </label>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        音频 (MP3)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        音频 (AIFF)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        音频 (WAV)
+                </label>
+        </mimetype>
+        <mimetype name="image/bmp">
+                <label name="image/bmp_label">
+                        图像 (BMP)
+                </label>
+        </mimetype>
+        <mimetype name="image/gif">
+                <label name="image/gif_label">
+                        图像 (GIF)
+                </label>
+        </mimetype>
+        <mimetype name="image/jpeg">
+                <label name="image/jpeg_label">
+                        图像 (JPEG)
+                </label>
+        </mimetype>
+        <mimetype name="image/png">
+                <label name="image/png_label">
+                        图像 (PNG)
+                </label>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        图像 (SVG)
+                </label>
+        </mimetype>
+        <mimetype name="image/tiff">
+                <label name="image/tiff_label">
+                        图像 (TIFF)
+                </label>
+        </mimetype>
+        <mimetype name="text/html">
+                <label name="text/html_label">
+                        网页
+                </label>
+        </mimetype>
+        <mimetype name="text/plain">
+                <label name="text/plain_label">
+                        文本
+                </label>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+        </mimetype>
+        <mimetype name="video/mpeg">
+                <label name="video/mpeg_label">
+                        影片 (MPEG)
+                </label>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        影片 (MP4)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        影片 (M4V)
+                </label>
+        </mimetype>
+        <mimetype name="video/quicktime">
+                <label name="video/quicktime_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        影片 (Windows Media ASF)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        影片 (Windows Media WMV)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        影片 (AVI)
+                </label>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/zh/mime_types_mac.xml
new file mode 100644
index 0000000..3fedf28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <widgetset name="web">
+                <label name="web_label">
+                        网页内容
+                </label>
+                <tooltip name="web_tooltip">
+                        该区域有网页内容
+                </tooltip>
+                <playtip name="web_playtip">
+                        显示网页内容
+                </playtip>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        影片
+                </label>
+                <tooltip name="movie_tooltip">
+                        这里可以播放影片
+                </tooltip>
+                <playtip name="movie_playtip">
+                        播放影片
+                </playtip>
+        </widgetset>
+        <widgetset name="none">
+                <label name="none_label">
+                        无内容
+                </label>
+                <tooltip name="none_tooltip">
+                        这里没有媒体
+                </tooltip>
+                <playtip name="none_playtip" />
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        图像
+                </label>
+                <tooltip name="image_tooltip">
+                        这里有图像
+                </tooltip>
+                <playtip name="image_playtip">
+                        显示该位置的图像
+                </playtip>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        音频
+                </label>
+                <tooltip name="audio_tooltip">
+                        这里可以播放音频
+                </tooltip>
+                <playtip name="audio_playtip">
+                        播放该位置的音频
+                </playtip>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        实时流媒体 (RTSP)
+                </label>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - 无 -
+                </label>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - 无 -
+                </label>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        音频
+                </label>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        视频
+                </label>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        图像
+                </label>
+        </mimetype>
+        <mimetype name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg 音频/视频
+                </label>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        带格式化的文本 (RTF)
+                </label>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    同步多媒体集成语言 (SMIL)
+                </label>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        网页 (XHTML)
+                </label>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+        </mimetype>
+        <mimetype name="application/x-shockwave-flash">
+                <label name="application/x-shockwave-flash_label">
+                        Flash
+                </label>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        音频 (MIDI)
+                </label>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        音频 (MP3)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        音频 (AIFF)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        音频 (WAV)
+                </label>
+        </mimetype>
+        <mimetype name="image/bmp">
+                <label name="image/bmp_label">
+                        图像 (BMP)
+                </label>
+        </mimetype>
+        <mimetype name="image/gif">
+                <label name="image/gif_label">
+                        图像 (GIF)
+                </label>
+        </mimetype>
+        <mimetype name="image/jpeg">
+                <label name="image/jpeg_label">
+                        图像 (JPEG)
+                </label>
+        </mimetype>
+        <mimetype name="image/png">
+                <label name="image/png_label">
+                        图像 (PNG)
+                </label>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        图像 (SVG)
+                </label>
+        </mimetype>
+        <mimetype name="image/tiff">
+                <label name="image/tiff_label">
+                        图像 (TIFF)
+                </label>
+        </mimetype>
+        <mimetype name="text/html">
+                <label name="text/html_label">
+                        网页
+                </label>
+        </mimetype>
+        <mimetype name="text/plain">
+                <label name="text/plain_label">
+                        文本
+                </label>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+        </mimetype>
+        <mimetype name="video/mpeg">
+                <label name="video/mpeg_label">
+                        影片 (MPEG)
+                </label>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        影片 (MP4)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        影片 (M4V)
+                </label>
+        </mimetype>
+        <mimetype name="video/quicktime">
+                <label name="video/quicktime_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        影片 (Windows Media ASF)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        影片 (Windows Media WMV)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        影片 (AVI)
+                </label>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/zh/mime_types_windows.xml
new file mode 100644
index 0000000..3fedf28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types_windows.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <widgetset name="web">
+                <label name="web_label">
+                        网页内容
+                </label>
+                <tooltip name="web_tooltip">
+                        该区域有网页内容
+                </tooltip>
+                <playtip name="web_playtip">
+                        显示网页内容
+                </playtip>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        影片
+                </label>
+                <tooltip name="movie_tooltip">
+                        这里可以播放影片
+                </tooltip>
+                <playtip name="movie_playtip">
+                        播放影片
+                </playtip>
+        </widgetset>
+        <widgetset name="none">
+                <label name="none_label">
+                        无内容
+                </label>
+                <tooltip name="none_tooltip">
+                        这里没有媒体
+                </tooltip>
+                <playtip name="none_playtip" />
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        图像
+                </label>
+                <tooltip name="image_tooltip">
+                        这里有图像
+                </tooltip>
+                <playtip name="image_playtip">
+                        显示该位置的图像
+                </playtip>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        音频
+                </label>
+                <tooltip name="audio_tooltip">
+                        这里可以播放音频
+                </tooltip>
+                <playtip name="audio_playtip">
+                        播放该位置的音频
+                </playtip>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        实时流媒体 (RTSP)
+                </label>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - 无 -
+                </label>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - 无 -
+                </label>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        音频
+                </label>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        视频
+                </label>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        图像
+                </label>
+        </mimetype>
+        <mimetype name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg 音频/视频
+                </label>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        带格式化的文本 (RTF)
+                </label>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    同步多媒体集成语言 (SMIL)
+                </label>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        网页 (XHTML)
+                </label>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+        </mimetype>
+        <mimetype name="application/x-shockwave-flash">
+                <label name="application/x-shockwave-flash_label">
+                        Flash
+                </label>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        音频 (MIDI)
+                </label>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        音频 (MP3)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        音频 (AIFF)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        音频 (WAV)
+                </label>
+        </mimetype>
+        <mimetype name="image/bmp">
+                <label name="image/bmp_label">
+                        图像 (BMP)
+                </label>
+        </mimetype>
+        <mimetype name="image/gif">
+                <label name="image/gif_label">
+                        图像 (GIF)
+                </label>
+        </mimetype>
+        <mimetype name="image/jpeg">
+                <label name="image/jpeg_label">
+                        图像 (JPEG)
+                </label>
+        </mimetype>
+        <mimetype name="image/png">
+                <label name="image/png_label">
+                        图像 (PNG)
+                </label>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        图像 (SVG)
+                </label>
+        </mimetype>
+        <mimetype name="image/tiff">
+                <label name="image/tiff_label">
+                        图像 (TIFF)
+                </label>
+        </mimetype>
+        <mimetype name="text/html">
+                <label name="text/html_label">
+                        网页
+                </label>
+        </mimetype>
+        <mimetype name="text/plain">
+                <label name="text/plain_label">
+                        文本
+                </label>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+        </mimetype>
+        <mimetype name="video/mpeg">
+                <label name="video/mpeg_label">
+                        影片 (MPEG)
+                </label>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        影片 (MP4)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        影片 (M4V)
+                </label>
+        </mimetype>
+        <mimetype name="video/quicktime">
+                <label name="video/quicktime_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        影片 (Windows Media ASF)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        影片 (Windows Media WMV)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        影片 (AVI)
+                </label>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index 415e5e7..0596e76 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -4,12 +4,18 @@
   <!-- I think "Second Life" should not be localized, actually. -Jacek -->
   <!--
   <global name="SECOND_LIFE">
-    二人生
+    第二人生
   </global>
   -->
+  
+  <!-- *警告* *警告* *警告* -->
+
+  <!-- 在 Visual Studio 中自动缩进打开后编辑该文件将会导致界面排版错误！ -->
+
+  <!-- *警告* *警告* *警告* -->
 
         <global name="skipnexttime">
-                下次不要再让������这个���
+                下次不再������。
         </global>
         <global name="alwayschoose">
                 总是选择该选项
@@ -37,7 +43,7 @@
        name="OK"
        text="$yestext"/>
       <button
-       name="Cancel"
+       name="取消"
        text="$notext"/>
     </form>
   </template>
@@ -49,7 +55,7 @@
        text="$yestext"/>
       <button
        
-       name="Cancel"
+       name="取消"
        text="$notext"/>
       <ignore text="$ignoretext"/>
     </form>
@@ -61,7 +67,7 @@
        name="OK"
        text="$yestext"/>
       <button
-       name="Help"
+       name="帮助"
        text="$helptext"/>
     </form>
   </template>
@@ -69,18 +75,18 @@
   <template name="yesnocancelbuttons">
     <form>
       <button
-       name="Yes"
+       name="是"
        text="$yestext"/>
       <button
-       name="No"
+       name="否"
        text="$notext"/>
       <button
-       name="Cancel"
+       name="取消"
        text="$canceltext"/>
     </form>
   </template>
         <notification functor="GenericAcknowledge" label="未知警报" name="MissingAlert">
-                您的第[VIEWER_NAME]版本无法显示所接收到的讯息。
+                您的 [VIEWER_NAME] 版本无法显示所接收到的讯息。
 
 错误详情：无法在notifications.xml中找到‘[_NAME]’。
                 <usetemplate name="okbutton" yestext="确定"/>
@@ -103,7 +109,7 @@
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
         </notification>
         <notification name="BadInstallation">
-                第[VIEWER_NAME]升级错误。请从[VIEWER_SITE]重新下载安装最新版本。
+                 [VIEWER_NAME] 升级错误。请从[VIEWER_SITE]重新下载安装最新版本。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -262,33 +268,33 @@
 其他居民在观看你的档案的时候可以访问你所指定的URL。
         </notification>
         <notification name="JoinGroupCanAfford">
-                加入该社团需花费L$[COST]。
+                加入该社团需花费[CURRENCY][COST]。
 你愿意继续吗？
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
         </notification>
         <notification name="JoinGroupCannotAfford">
-                加入该社团需花费 L$[COST]。
-您拥有的 L$ 不够。
+                加入该社团需花费 [CURRENCY][COST]。
+您拥有的 [CURRENCY] 不够。
         </notification>
         <notification name="LandBuyPass">
-                花费 L$[COST] 你就可以进入这块土地(‘[PARCEL_NAME]’)
+                花费 [CURRENCY][COST] 你就可以进入这块土地(‘[PARCEL_NAME]’)
 [TIME]小时。是否购买通行证？
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
         <notification name="SalePriceRestriction">
-                如果出售给任何人，出售价格必须 &gt; L$0。
-如果售价为L$0，请选定一个用户来售出。
+                如果出售给任何人，出售价格必须 &gt; [CURRENCY]0。
+如果售价为[CURRENCY]0，请选定一个用户来售出。
         </notification>
         <notification name="ConfirmLandSaleChange">
                 所选的 [LAND_SIZE]平方米土地正被设置为代售。
-你的售价将是为 L$[SALE_PRICE]并将被授权售给[NAME]。
+你的售价将是为 [CURRENCY][SALE_PRICE]并将被授权售给[NAME]。
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="确定"/>
         </notification>
         <notification name="ConfirmLandSaleToAnyoneChange">
-                请注意： 点击 ‘售出给任何人’ 将使你的土地对整个第[GRID_NAME]社区开放，包括当前不在这个地区中的人。
+                请注意： 点击 ‘售出给任何人’ 将使你的土地对整个 [GRID_NAME] 社区开放，包括当前不在这个地区中的人。
 
 所选的 [LAND_SIZE]平方米土地正被设置为代售。
-你的售价将是为 L$[SALE_PRICE]并将被授权售给[NAME]。
+你的售价将是为 [CURRENCY][SALE_PRICE]并将被授权售给[NAME]。
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="确定"/>
         </notification>
         <notification name="ReturnObjectsDeededToGroup">
@@ -512,7 +518,7 @@
                 无法写入文件 [[FILE]]
         </notification>
         <notification name="UnsupportedHardware">
-                警告： 您的系统没有满足第[VIEWER_NAME]的最低系统需求。如果您继续使用第[VIEWER_NAME]，您可能会得到糟糕的性能体验。不幸的是，我们无法为不支持的系统配备提供技术支持。
+                警告： 您的系统没有满足 [VIEWER_NAME] 的最低系统需求。如果您继续使用 [VIEWER_NAME] ，您可能会得到糟糕的性能体验。不幸的是，我们无法为不支持的系统配备提供技术支持。
 
 MINSPECS
 您希望访问 [_URL] 得到更多信息吗？
@@ -524,7 +530,7 @@ MINSPECS
         <notification name="UnknownGPU">
                 您的系统中安装了一个我们所不知道的显卡。
 这经常发生于我们还没有来得及测试的新硬件上。
-第[VIEWER_NAME]将很可能正常运行，但您也许要
+ [VIEWER_NAME] 将很可能正常运行，但您也许要
 调节您的图形设定到更合适的水平上。
 (编辑 &gt; 首选项 &gt; 图像)。
                 <form name="form">
@@ -678,19 +684,24 @@ MINSPECS
 [FILE]
         </notification>
         <notification name="UnknownVorbisEncodeFailure">
-                对文件进行 Vorbis 编码时发生错误： [FILE]
+                对文件进行 Vorbis 编码时发生错误： 
+[FILE]
         </notification>
         <notification name="CannotEncodeFile">
-                无法编码文件[FILE]
+                无法编码文件
+[FILE]
         </notification>
         <notification name="CorruptResourceFile">
-                崩坏的的资源文件： [FILE]
+                崩坏的的资源文件： 
+[FILE]
         </notification>
         <notification name="UnknownResourceFileVersion">
-                未知的林登资源文件版本发现于文件： [FILE]
+                未知的林登资源文件版本发现于文件： 
+[FILE]
         </notification>
         <notification name="UnableToCreateOutputFile">
-                无法创建输出文件： [FILE]
+                无法创建输出文件： 
+[FILE]
         </notification>
         <notification name="DoNotSupportBulkAnimationUpload">
                 我们现在不支持大宗上传动画文件。
@@ -832,8 +843,13 @@ www.secondlife.com/support
                 无法购买土地：
 无法找到该土地所在区域。
         </notification>
+        <notification name="CannotBuyLandMaturity">
+                无法购买土地：
+
+你所能访问的/选择的限制级别不允许你购买该土地。你可能首先需要在参数设定中更改你的限制级别。
+</notification>
         <notification name="CannotCloseFloaterBuyLand">
-                在第[GRID_NAME]完成对这次交易的估价前，
+                在 [GRID_NAME] 完成对这次交易的估价前，
 你不能关闭“购买土地”窗口。
         </notification>
         <notification name="CannotDeedLandNothingSelected">
@@ -908,8 +924,9 @@ www.secondlife.com/support
         </notification>
         <notification name="ReleaseLandWarning">
                 你将放弃面积为 [AREA] 平方米的土地。
-放弃该土地会将他从你拥有的土地中
-移走, 不会兑换成任何 L$。
+
+放弃该土地会将它从你持有的土地中
+去除, 但不会退还任何 [CURRENCY]。
 
 是否放弃土地？
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="确定"/>
@@ -1001,6 +1018,7 @@ www.secondlife.com/support
         </notification>
         <notification name="CannotSaveToAssetStore">
                 无法储存 [NAME] 至中央资料服务器。
+                
 这通常只是临时的问题。请自定义后再次保存。
 
 如果问题依然存在，请点击
@@ -1008,7 +1026,7 @@ www.secondlife.com/support
 您的网络设置的具体信息。
         </notification>
         <notification name="YouHaveBeenLoggedOut">
-                你已经退出[GRID_NAME]：
+                你已经被退出[GRID_NAME]：
 
 [MESSAGE]
 
@@ -1031,7 +1049,7 @@ www.secondlife.com/support
         <notification label="添加好友" name="AddFriendWithMessage">
                 好友间可以相互授权查看各自在地图上的位置和在线状态。
 
-��� [NAME] 为好友吗？
+是���提议 [NAME] 成为好友？
                 <form name="form">
                         <input name="message" type="text">
                                 您想成为我的好友么？
@@ -1069,7 +1087,7 @@ www.secondlife.com/support
                 你必须给分类广告设定一个名字。
         </notification>
         <notification name="MinClassifiedPrice">
-                广告刊登出价必须大于 L$[MIN_PRICE]。
+                广告刊登出价必须大于 [CURRENCY][MIN_PRICE]。
 
 请输入一个更高的价格。
         </notification>
@@ -1192,8 +1210,7 @@ www.secondlife.com/support
         </notification>
         <notification name="ClothingLoading">
                 你的装束仍在下载中。
-你现在可以按正常的使用这个世界，
-其他用户也可以看见你。
+你现在可以按正常地使用 [GRID_NAME]，其他用户也可以看见你。
                 <form name="form">
                         <ignore name="ignore" text="装束下载时间太长"/>
                 </form>
@@ -1208,7 +1225,7 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="继续" yestext="新帐户..."/>
         </notification>
         <notification name="LoginPacketNeverReceived">
-                我们遇到了一些连接上的麻烦。问题可能出在您的互联网连接，也可能出在第[GRID_NAME]的服务器。
+                我们遇到了一些连接上的麻烦。问题可能出在您的互联网连接，也可能出在 [GRID_NAME] 的服务器。
 
 请几分钟后再试, 或点击帮助连接我们的支持页面，或选择 “瞬间移动” 来尝试瞬间移动回家。
                 <form name="form">
@@ -1227,7 +1244,7 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/>
         </notification>
         <notification name="NotEnoughCurrency">
-                [NAME] L$ [PRICE] 您没有足够的 L$ 来这样做。
+                [NAME] [CURRENCY] [PRICE] 您没有足够的 [CURRENCY] 来这样做。
         </notification>
         <notification name="GrantedModifyRights">
                 你已经被授予特权，你可以任意修改[FIRST_NAME] [LAST_NAME]的物体。
@@ -1282,17 +1299,17 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="烘烤"/>
         </notification>
         <notification name="MaxAllowedAgentOnRegion">
-                你最多只能列出 [MAX_AGENTS]名允许的居民。
+                你最多只能列出 [MAX_AGENTS] 名允许的居民。
         </notification>
         <notification name="MaxBannedAgentsOnRegion">
                 你最多只能列出 [MAX_BANNED] 名禁止的居民。
         </notification>
         <notification name="MaxAgentOnRegionBatch">
                 尝试添加 [NUM_ADDED] 名代表时失败：
-超出 [LIST_TYPE] [MAX_AGENTS]名的限制 [NUM_EXCESS]名。
+超出 [LIST_TYPE] [MAX_AGENTS] 名的限制 [NUM_EXCESS] 名。
         </notification>
         <notification name="MaxAllowedGroupsOnRegion">
-                你只能有[MAX_GROUPS]个允许的社团。
+                你只能有 [MAX_GROUPS] 个允许的社团。
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="烘烤"/>
         </notification>
         <notification name="MaxManagersOnRegion">
@@ -1330,7 +1347,7 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="继续" yestext="下载"/>
         </notification>
         <notification name="DownloadWindowsReleaseForDownload">
-                [VIEWER_NAME] 有新版本可用。
+                [VIEWER_NAME] 有新版本可用。     
 [MESSAGE]
 
 这个更新不是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
@@ -1364,7 +1381,7 @@ www.secondlife.com/support
         </notification>
         <notification name="DeedObjectToGroup">
                 转让此物体会导致社团：
-* 收到付给该物体的L$。
+* 收到付给该物体的 [CURRENCY]。
                 <usetemplate ignoretext="转让物体到社团" name="okcancelignore" notext="取消" yestext="转让"/>
         </notification>
         <notification name="WebLaunchExternalTarget">
@@ -1462,7 +1479,9 @@ www.secondlife.com/support
 一个旧社团, 或者拒绝新社团邀请。
 离开社团请选择‘编辑’菜单下的
 ‘我的社团...’选项。
+
 [NAME]邀请你成为该社团成员。
+
 [INVITE]
                 <usetemplate name="okcancelbuttons" notext="谢绝" yestext="加入"/>
         </notification>
@@ -1581,7 +1600,7 @@ www.secondlife.com/support
         <notification name="RegionEntryAccessBlocked">
                 您的限制级不允许您访问此地区。这可能是由于您的年龄还没有被验证。
 
-请检查您的第[VIEWER_NAME]是否是最新版本并到知识库去了解有关区访问权限和限制级的关系。
+请检查您的 [VIEWER_NAME] 是否是最新版本并到知识库去了解有关区访问权限和限制级的关系。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -1619,7 +1638,7 @@ www.secondlife.com/support
         <notification name="LandClaimAccessBlocked">
                 您的限制级不允许您申请此地的产权。这可能是由于您还没有通过年龄验证。
 
-请检查您的第[VIEWER_NAME]是否是最新版本并到知识库去了解有关区访问权限和限制级的关系。
+请检查您的 [VIEWER_NAME] 是否是最新版本并到知识库去了解有关区访问权限和限制级的关系。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -1653,7 +1672,7 @@ www.secondlife.com/support
         <notification name="LandBuyAccessBlocked">
                 您的限制级不允许您购买此土地。这可能是由于您还没有通过年龄验证。
 
-请检查您的第[VIEWER_NAME]是否是最新版本并到知识库去了解有关区访问权限和限制级的关系。
+请检查您的 [VIEWER_NAME] 是否是最新版本并到知识库去了解有关区访问权限和限制级的关系。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -1709,7 +1728,7 @@ www.secondlife.com/support
         <notification name="PublishClassified">
                 请遵记： 分类广告费用不会退还。
 
-是否以L$[AMOUNT]发布广告？
+是否以 [CURRENCY][AMOUNT] 发布广告？
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="发布"/>
         </notification>
         <notification name="SetClassifiedMature">
@@ -1746,6 +1765,14 @@ www.secondlife.com/support
 
 默认： 关
         </notification>
+        <notification
+        label="最小年龄"
+ name="HelpRegionMinimumAge"
+ type="alertmodal">
+进入该地区的用户其账户必须至少已建立这么多天才能进入。
+
+默认: 0 (禁用)
+</notification>
         <notification label="锁定飞翔" name="HelpRegionBlockFly">
                 如果选择此项,无论每个地块设置如何，
 人们都不能在此区域内飞行。
@@ -1783,7 +1810,7 @@ www.secondlife.com/support
         <notification label="限制推动" name="HelpRegionRestrictPushObject">
                 设定所有区域为限制推动区。居民只能推动自己，或者由土地主人的脚本代码推动。
 
-(推动功能��llPushObject() LSL函数有关。)
+(推动���的是llPushObject() LSL函数。)
 
 默认： 关
         </notification>
@@ -1800,11 +1827,11 @@ www.secondlife.com/support
 
 默认： 选择
         </notification>
-        <notification label="Do Not Show In Search" name="HelpRegionSearch">
+        <notification label="不在搜索中显示" name="HelpRegionSearch">
                 打开该选项将阻止地块拥有者在搜索中列出他们的地块。
 默认：关
         </notification>
-        <notification label="更改区域的成人指数设定" name="RegionMaturityChange">
+        <notification label="更改区域的设定" name="RegionMaturityChange">
                 此区域内的成人内容等级已经更新。
 
 但是，世界地图更新时间需要大约5分钟，
@@ -1947,8 +1974,8 @@ www.secondlife.com/support
                 地产经理是你委派的负责区域控制
 和地产调节的居民。 地产经理
 有权改变控制板内任何调节项, 除了上传,
-下载, 和压缩地形。特���的, ���们有权允��
-或禁止居民进入你的地产。
+下载, 和压缩地形。���得指出的��点是
+他们���权允许���禁止居民进入你的地产。
 
 地产经理只能被地产主人雇佣或辞退
 , 不能互相之间委派。请选择你信任的
@@ -2005,8 +2032,8 @@ www.secondlife.com/support
 默认：关
         </notification>
         <notification label="语音聊天版本不符合" name="VoiceVersionMismatch">
-                该版本的第[VIEWER_NAME]与该地区的语音聊天不兼容。
-为了正常使用语音聊天你需要更新第[VIEWER_NAME]。
+                该版本的 [VIEWER_NAME] 与该地区的语音聊天不兼容。
+为了正常使用语音聊天你需要更新 [VIEWER_NAME] 。
         </notification>
         <notification label="不动产契约合同" name="HelpEstateCovenant">
                 设置不动产的契约合同使你可以出售地产中的土地。如果不动产契约合同没有设置，你则不能出售土地。如果在买主购买之前，你不想在土地上设置任何相关的给买主的意见和规定，你的契约合同的注释卡可以是空的。
@@ -2028,48 +2055,50 @@ www.secondlife.com/support
 请仅选择一件物体，再试一次。
         </notification>
         <notification name="BuyOriginal">
-                是否以 L$[PRICE] 购买原物体？
+                是否以 [CURRENCY][PRICE] 购买原物体？
 你将成为物体的主人。
 你将可以：
- 修改： [MODIFYPERM]
- 复制： [COPYPERM]
- 转卖或赠送： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• 复制： [COPYPERM]
+• 转卖或赠送： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
         <notification name="BuyOriginalNoOwner">
-                是否以 L$[PRICE] 购买原物体？
+                是否以 [CURRENCY][PRICE] 购买原物体？
 你将成为物体的主人。
 你将可以：
- 修改： [MODIFYPERM]
- 复制： [COPYPERM]
- 转卖或赠送： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• 复制： [COPYPERM]
+• 转卖或赠送： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
         <notification name="BuyCopy">
-                是否以 L$[PRICE] 从 [OWNER] 购买物体的副本？
+                是否以 [CURRENCY][PRICE] 从 [OWNER] 购买物体的副本？
 这件物体将被复制到你的库存。
 你将可以：
- 修改： [MODIFYPERM]
- 复制： [COPYPERM]
- 转卖或赠送： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• 复制： [COPYPERM]
+• 转卖或赠送： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
         <notification name="BuyCopyNoOwner">
-                是否以 L$[PRICE] 购买物体的副本？
+                是否以 [CURRENCY][PRICE] 购买物体的副本？
 这件物体将被复制到你的库存。
 你将可以：
- 修改： [MODIFYPERM]
- 复制： [COPYPERM]
- 转卖或赠送： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• 复制： [COPYPERM]
+• 转卖或赠送： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
         <notification name="BuyContents">
-                是否以 L$[PRICE] 从 [OWNER] 购买内容？
+                是否以 [CURRENCY][PRICE] 从 [OWNER] 购买内容？
+
 它们将被复制到你的库存。
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
         <notification name="BuyContentsNoOwner">
-                是否以 L$[PRICE] 购买内容？
+                是否以 [CURRENCY][PRICE] 购买内容？
+
 它们将被复制到你的库存。
                 <usetemplate name="okcancelbuttons" notext="取消" yestext="购买"/>
         </notification>
@@ -2082,6 +2111,7 @@ www.secondlife.com/support
         </notification>
         <notification name="ConfirmPurchasePassword" type="password">
                 此项交易将：
+
  [ACTION]
 
 你确定要继续购买吗？
@@ -2127,16 +2157,19 @@ www.secondlife.com/support
                 这个物体中没有你能够复制的项目。
         </notification>
         <notification name="WebLaunchAccountHistory">
-                是否前往第[SECOND_LIFE]网站查看你的帐户记录？
+                是否前往 [SECOND_LIFE] 网站查看你的帐户记录？
                 <usetemplate ignoretext="打开浏览器查看帐户记录" name="okcancelignore" notext="取消" yestext="打开网页"/>
         </notification>
         <notification name="ClickOpenF1Help">
-                访问第[SECOND_LIFE]帮助网站吗？
-                <usetemplate ignoretext="访问第[SECOND_LIFE]帮助网站时" name="okcancelignore" notext="取消" yestext="打开页面"/>
+                访问 [SECOND_LIFE] 帮助网站吗？
+                <usetemplate ignoretext="访问 [SECOND_LIFE] 帮助网站时" name="okcancelignore" notext="取消" yestext="打开页面"/>
+        </notification>
+        <notification name="NoSupportUrl">
+                [GRID_NAME] 没有支持网页的链接。
         </notification>
         <notification name="ConfirmQuit">
                 确定退出？
-                <usetemplate ignoretext="退出第[VIEWER_NAME]时" name="okcancelignore" notext="继续" yestext="退出"/>
+                <usetemplate ignoretext="退出 [VIEWER_NAME] 时" name="okcancelignore" notext="继续" yestext="退出"/>
         </notification>
         <notification name="HelpReportAbuseEmailLL">
                 使用该工具来报告违反服务条款和社区标准。 请访问：
@@ -2157,9 +2190,9 @@ www.secondlife.com/support
 这块区域的主人将遵守基于土地契约所概述的当地规则，解决报告。
 (你可以从世界菜单中选择 “关于土地” 来查看契约。)
 
-该报告的解决结果仅对该区域有效；居民对第[GRID_NAME]其他地方的使用
+该报告的解决结果仅对该区域有效；居民对 [GRID_NAME] 其他地方的使用
 将不会受该报告结果的影响。<!-- 只有林登实验室能够限制访问整个
-第[GRID_NAME]。-->
+[GRID_NAME]。-->
         </notification>
         <notification name="HelpReportBug">
                 这个工具只用来报告与描述或预期工作不一致的技术功能。请尽能提供详细资料。
@@ -2187,17 +2220,14 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="HelpReportAbuseAbuserLocationEmpty">
                 请输入不良行为发生的地址。
-
 输入正确的描述可以帮助我们归档和处理不良行为报告。
         </notification>
         <notification name="HelpReportAbuseSummaryEmpty">
                 请输入不良行为的概况。
-
 输入对事件的正确描述可以帮助我们归档和处理不良行为报告。
         </notification>
         <notification name="HelpReportBugSummaryEmpty">
                 请输入错误概况。
-
 输入对事件的正确描述可以帮助我们归档和处理错误报告。
         </notification>
         <notification name="HelpReportAbuseDetailsEmpty">
@@ -2215,9 +2245,9 @@ http://secondlife.com/community/support.php
                 亲爱的居民,
 如果您将要报告知识产权侵犯，请确认您通过正确的方式报告：
 
-(1) 不良行为报告手续。您可以提交一份不良行为报告，如果您相信某位居民正在利用第[SECOND_LIFE]许可系统的漏洞，例如使用 CopyBot 或者类似的复制工具，来侵犯知识产权。不良行为调查小组负责对于违反第[SECOND_LIFE]社区标准或服务条款的行为进行调查以及实行相应的惩罚措施。但是，不良行为调查小组不负责从世界中移除内容，并且不会对这类请求作出回应。
+(1) 不良行为报告手续。您可以提交一份不良行为报告，如果您相信某位居民正在利用 [SECOND_LIFE] 许可系统的漏洞，例如使用 CopyBot 或者类似的复制工具，来侵犯知识产权。不良行为调查小组负责对于违反 [SECOND_LIFE] 社区标准或服务条款的行为进行调查以及实行相应的惩罚措施。但是，不良行为调查小组不负责从世界中移除内容，并且不会对这类请求作出回应。
 
-(2) DMCA (数字千年版权协定) 或者说内容移除手续。 要请求从第[SECOND_LIFE]中去除内容，您*必须*提交一份按我们 DMCA 条例 http://secondlife.com/corporate/dmca.php 中所指出的，有效的侵权通知。
+(2) DMCA (数字千年版权协定) 或者说内容移除手续。 要请求从 [SECOND_LIFE] 中去除内容，您*必须*提交一份按我们 DMCA 条例 http://secondlife.com/corporate/dmca.php 中所指出的，有效的侵权通知。
 
 如果您仍希望继续不良行为的报告，请关闭此窗口，并完成提交您的报告。
 您可能需要选择 ‘CopyBot 或利用漏洞’ 这一特定分类。
@@ -2228,10 +2258,12 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="FailedRequirementsCheck">
                 以下必须的部件丢失于 [FLOATER]：
+                
 [COMPONENTS]
         </notification>
         <notification label="替换已经存在的附件" name="ReplaceAttachment">
                 已经有一个物体附在身体的这个部位上了。
+                
 你是否要用所选物体替代它？
                 <form name="form">
                         <ignore name="ignore" save_option="true" text="替换已有的附件时"/>
@@ -2345,7 +2377,7 @@ http://secondlife.com/community/support.php
 点击 ‘高级水面选项’ 来打开较高级水面设置的编辑器。
         </notification>
         <notification name="HelpDayCycle">
-                日夜周期编辑器给予你对第[GRID_NAME]日夜循环中天空的控制。这也是基础环境编辑器的时间滑块所使用的周期。
+                日夜周期编辑器给予你对 [GRID_NAME] 日夜循环中天空的控制。这也是基础环境编辑器的时间滑块所使用的周期。
 
 日夜周期编辑器的基础是关键帧。它们是带有天空预设的节点 (在时间图上以灰色的点表示)。当时间流逝，WindLight 的天空 也会通过过在这些关键帧之间插值而产生变化。
 
@@ -2427,7 +2459,7 @@ http://secondlife.com/community/support.php
                 控制云层在 Y 轴移动的速度。
         </notification>
         <notification name="HelpClassicClouds">
-                选取该框以在渲染 WindLight 的云层同时渲染第[SECOND_LIFE]的旧云层。
+                选取该框以在渲染 WindLight 的云层同时渲染 [SECOND_LIFE] 的旧云层。
         </notification>
         <notification name="HelpWaterFogColor">
                 控制水雾颜色。
@@ -2515,8 +2547,8 @@ http://secondlife.com/community/support.php
         <notification name="Cannot_Purchase_an_Attachment">
                 物品作为附件时无法购买。
         </notification>
-        <notification label="About Requests for the Debit Permission" name="DebitPermissionDetails">
-                授予该请求将给予脚本持续的从您的帐户中提取林登币 (L$) 的许可。要取消这项许可，物体的拥有者必须删除物体或重置物体中的脚本。
+        <notification label="关于提款权限请求" name="DebitPermissionDetails">
+                授予该请求将给予脚本持续的从您的帐户中提取 [CURRENCY] 的许可。要取消这项许可，物体的拥有者必须删除物体或重置物体中的脚本。
                 <usetemplate name="okbutton" yestext="确定"/>
         </notification>
         <notification name="AutoWearNewClothing">
@@ -2525,17 +2557,17 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="NotAgeVerified">
                 您需要验证年龄才能进入这个地块。
-您希望访问第[SECOND_LIFE]网站验证您的年龄吗？
+您希望访问 [SECOND_LIFE] 网站验证您的年龄吗？
 
 [_URL]
                 <url name="url" option="0">
                         https://secondlife.com/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]网站来设置么？
+您要到 [SECOND_LIFE] 网站来设置么？
 
 [_URL]
                 <url name="url" option="0">
@@ -2549,6 +2581,68 @@ http://secondlife.com/community/support.php
         <notification name="SystemMessageTip">
                 [MESSAGE]
         </notification>
+        <notification name="SetDisplayNameSuccess">
+        你好 [DISPLAY_NAME]!
+
+        和真实生活中一样，大家认识新名字要有一段时间。所以若新的显示名称没有立即在物体、脚本、搜索等等中更新的话，请稍待几天。
+        </notification>
+
+        <notification name="SetDisplayNameBlocked">
+        抱歉，你不能更改你的显示名称。若你觉得这不应该发生，请联系支持人员。
+        </notification>
+
+        <notification name="SetDisplayNameFailedLength">
+        抱歉，那个名字太长了。显示名称最长可以有 [LENGTH] 个字符。
+
+        请尝试短一点的名字。
+        </notification>
+
+        <notification name="SetDisplayNameFailedGeneric">
+        抱歉，我们不能设置你的显示名称。请稍候再试。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="SetDisplayNameMismatch">
+        你键入的显示名称不一致。请重新输入。
+        </notification>
+
+        <!-- *NOTE: This should never happen -->
+        <notification name="AgentDisplayNameUpdateThresholdExceeded">
+        抱歉，你要多等一段时间才能更改你的显示名称。
+
+        参见 http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+        请稍候再试。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="AgentDisplayNameSetBlocked">
+        抱歉，我们不能设置你所希望的显示名称，因为其中含有禁止用词。
+
+        请尝试别的名字。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="AgentDisplayNameSetInvalidUnicode">
+        你所希望设置的显示名称包含无效字符。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="AgentDisplayNameSetOnlyPunctuation">
+        你的显示名称必须含有不是标点符号的字。
+        </notification>
+
+
+        <notification
+                 icon="notifytip.tga"
+                 name="DisplayNameUpdate">
+        [OLD_NAME] ([SLID]) 已改名为 [NEW_NAME].
+        </notification>
+
         <notification name="Cancelled">
                 已取消
         </notification>
@@ -2578,7 +2672,7 @@ http://secondlife.com/community/support.php
 (大概要 5 分钟)
         </notification>
         <notification name="UploadPayment">
-                您为了上传付出了 L$[AMOUNT]。
+                您为了上传付出了 [CURRENCY][AMOUNT]。
         </notification>
         <notification name="UploadWebSnapshotDone">
                 快照已经被上传至网页。
@@ -2603,6 +2697,7 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="CapsKeyOn">
                 大写锁定处于开启状态。
+
 因为这会影响您键入的密码，
 也许您会想把它关掉。
         </notification>
@@ -2730,12 +2825,26 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="DeactivatedGesturesTrigger">
                 取消激活了触发器相同的动作：
+
 [NAMES]
         </notification>
         <notification name="NoQuickTime">
                 Apple 公司的 QuickTime 没有安装在你的操作系统中。如果你希望观看在支持的地块中播放的媒体流，则需要从
 QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
+        <notification name="NoPlugin">
+        没有找到能处理 “[MIME_TYPE]” MIME 类型的插件。此类媒体将不可用。
+        </notification>
+        <notification name="MediaPluginFailed">
+        以下的媒体插件已崩溃：
+        [PLUGIN]
+
+        请重新安装或如果持续遇到问题，清联系供应商。
+                <form name="form">
+                  <ignore name="ignore"
+                   text="媒体插件崩溃时"/>
+                </form>
+        </notification>
         <notification name="OwnedObjectsReturned">
                 在所选地块上你所拥有的物体已经被归还至你的库存中。
         </notification>
@@ -2749,7 +2858,9 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="GroupObjectsReturned">
                 在所选地块上，与社团 [GROUPNAME] 分享的物体已经被归还至它们的主人的库存里。
+                
 可转让的转让到社团的物体已经被归还至它们先前主人处。
+
 不可转让的转让到社团的物体已经删除。
         </notification>
         <notification name="UnOwnedObjectsReturned">
@@ -2757,14 +2868,17 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="NotSafe">
                 这块土地打开了伤害选项 (‘不安全’)。
+
 您在这里可能会受伤。如果您死了，您将会被瞬间移动至您的家位置。
         </notification>
         <notification name="NoFly">
                 这块土地关闭了飞行 (‘不能飞行’)。
+
 您不能在这里飞行。
         </notification>
         <notification name="PushRestricted">
                 这块土地 ‘不允许推动’。
+
 您不能推动这里的任何物体，除非您拥有这块土地。
         </notification>
         <notification name="NoVoice">
@@ -2772,6 +2886,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="NoBuild">
                 这块土地上关闭了建造 (‘不能建造’)。
+
 您不能在此创建物体。
         </notification>
         <notification name="ScriptsStopped">
@@ -2782,13 +2897,14 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="NoOutsideScripts">
                 这块土地关闭了外部脚本 (‘没有外部脚本’)。
+
 除了属于土地主人的脚本，任何脚本在这里都不会运行。
         </notification>
         <notification name="ClaimPublicLand">
                 只能对您所在的公共土地上申请产权。
         </notification>
         <notification name="RegionTPAccessBlocked">
-                您的限制级不允许您进入此地。您可能需要下载并安装最新的第[VIEWER_NAME]软件或取得年龄验证。
+                您的限制级不允许您进入此地。您可能需要下载并安装最新的 [VIEWER_NAME] 软件或取得年龄验证。
 
 请去知识库了解更多关于访问权限与限制级的关系。
         </notification>
@@ -2799,8 +2915,8 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 您的账号不能连接到该“少年专属区”。
         </notification>
         <notification name="NoHelpIslandTP">
-                您不能瞬间转移回“援助岛”。
-去“公共援助岛”重复您的教程。
+                您不能瞬间移������ “Help Island”。
+去 “Help Island Public” 重复您的教程。
         </notification>
         <notification name="ImproperPaymentStatus">
                 您没有适当的付款信息，不能进入此区。
@@ -2848,19 +2964,19 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 没有有效的回路
         </notification>
         <notification name="NoValidTimestamp">
-                没有有效的时间���记
+                没有有效的时间���
         </notification>
         <notification name="NoPendingConnection">
                 无法建立连接。
         </notification>
         <notification name="InternalUsherError">
-                瞬间转移的传送过程导致了一个服务器错误。第[GRID_NAME]服务器可能存在异常。
+                瞬间转移的传送过程导致了一个服务器错误。 [GRID_NAME] 服务器可能存在异常。
         </notification>
         <notification name="NoGoodTPDestination">
                 在此地区中无法找到一个合适的传送点。
         </notification>
         <notification name="InternalErrorRegionResolver">
-                您的瞬间转移请求在解释全局坐标时导致了一个服务器错误。第[GRID_NAME]服务器可能存在异常。
+                您的瞬间转移请求在解释全局坐标时导致了一个服务器错误。 [GRID_NAME] 服务器可能存在异常。
         </notification>
         <notification name="NoValidLanding">
                 找不到一个有效的降落点
@@ -2894,6 +3010,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="GodMessage">
                 [NAME]
+
 [MESSAGE]
         </notification>
         <notification name="JoinGroup">
@@ -2915,6 +3032,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="GotoURL">
                 [MESSAGE]
+
 [URL]
                 <form name="form">
                         <button name="Later" text="稍后"/>
@@ -2930,6 +3048,8 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 <form name="form">
                         <button name="Accept" text="接受"/>
                         <button name="Decline" text="谢绝"/>
+                        <button name="Profile" text="档案"/>
+                        <button name="Ignore" text="忽略"/>
                 </form>
         </notification>
         <notification name="OfferFriendshipNoMessage">
@@ -2938,6 +3058,8 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 <form name="form">
                         <button name="Accept" text="接受"/>
                         <button name="Decline" text="谢绝"/>
+                        <button name="Profile" text="档案"/>
+                        <button name="Ignore" text="忽略"/>
                 </form>
         </notification>
         <notification name="FriendshipAccepted">
@@ -2947,19 +3069,24 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 [NAME] 谢绝了您的好友邀请。
         </notification>
         <notification name="OfferCallingCard">
-                [FIRST] [LAST] 要给你他的通话卡。这将在你的库存中添加一个书签，这样你就可以快速的通过即时消息联系这位居民。
+                [FIRST] [LAST] 要给你他的通话卡。
+                
+这将在你的库存中添加一个书签，这样你就可以快速的通过即时消息联系这位居民。
                 <form name="form">
                         <button name="Accept" text="接受"/>
                         <button name="Decline" text="谢绝"/>
+                        <button name="Ignore" text="忽略"/>
                 </form>
         </notification>
         <notification name="RegionRestartMinutes">
-                地区将在 [MINUTES]分钟后重新启动。
-如果仍留在此地区内，您将会被登出。
+                区域将在 [MINUTES]分钟后重新启动。
+
+如果仍留在此区域内，您将会被登出。
         </notification>
         <notification name="RegionRestartSeconds">
                 区域将在 [MINUTES]秒后重新启动。
-如果仍留在此地区内，您将会被登出。
+
+如果仍留在此区域内，您将会被登出。
         </notification>
         <notification name="LoadWebPage">
                 是否载入网页[URL]？
@@ -2979,12 +3106,13 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 在数据库中没能找到名为 [DESC] 的[TYPE]。
         </notification>
         <notification name="InvalidWearable">
-                您所要穿戴的物品使用了一种当前客户端无法处理的功能。请升级您的第[VIEWER_NAME]版本以正确穿戴此物品。
+                您所要穿戴的物品使用了一种当前客户端无法处理的功能。请升级您的 [VIEWER_NAME] 版本以正确穿戴此物品。
         </notification>
         <notification name="ScriptQuestion">
                 ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想要：
 
 [QUESTIONS]
+
 这样可以吗？
                 <form name="form">
                         <button name="Yes" text="允许"/>
@@ -2996,6 +3124,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想要：
 
 [QUESTIONS]
+
 如果您不信任该物体和它的创建者，您应该拒绝这请求。点击细节按钮察看详细资料。
 
 是否授予许可？
@@ -3020,17 +3149,22 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 </form>
         </notification>
         <notification name="FirstBalanceIncrease">
-                您刚收到了 L$[AMOUNT]。
-物体和其他用户可以向您支付L$。
+                您刚收到了 [CURRENCY][AMOUNT]。
+
+物体和其他用户可以向您支付 [CURRENCY]。
+
 您的帐户余额显示在屏幕的右上角。
         </notification>
         <notification name="FirstBalanceDecrease">
-                您刚支付了 L$[AMOUNT]。
+                您刚支付了 [CURRENCY][AMOUNT]。
+
 您的帐户余额显示在屏幕的右上角。
         </notification>
         <notification name="FirstSit">
                 您正在坐着。
+
 使用方向键 (或者AWSD) 来改变视角。
+
 点击 ‘站起来’ 按钮起身。
         </notification>
         <notification name="FirstMap">
@@ -3038,6 +3172,12 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
 双击以瞬间移动。
 使用右边的控件查找信息，并显示不同的背景。
         </notification>
+        <notification
+         icon="notify.tga"
+         name="FirstMiniMap"
+         type="notify">
+                右键单击迷你地图查看更多选项。
+        </notification>
         <notification name="FirstBuild">
                 您可以在 [GRID_NAME] 的某些区域中创建新物体。
 使用左上角的工具建造，也试一试按下 Ctrl 或者 Alt 键快速地切换工具。
@@ -3064,9 +3204,9 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="FirstInventory">
                 这是您的库存，是存放物体、记事卡、衣服和您拥有的其他东西的地方。
-* 要穿上物体或装备文件夹，将它拖动到您自己身上。
-* 要将物体带入世界中，将它拖动到地上。
-* 要阅读记事卡，双击它。
+• 要穿上物体或装备文件夹，将它拖动到您自己身上。
+• 要将物体带入世界中，将它拖动到地上。
+• 要阅读记事卡，双击它。
         </notification>
         <notification name="FirstSandbox">
                 这是一块沙盒区域。
@@ -3080,17 +3220,41 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="FirstDebugMenus">
                 您已启用了高级菜单。
-该菜单包含对调试第[VIEWER_NAME]的开发者有用的功能。
+该菜单包含对调试 [VIEWER_NAME] 的开发者有用的功能。
 要切换该菜单，在 Windows 中按 Ctrl-Alt-D。 在 Mac 中按 Cmd-Opt-Shift-D。
         </notification>
         <notification name="FirstSculptedPrim">
-                您正在编辑 sculpted 元件。
-Sculpted 元件需要特殊的材质来指定其形状。
-您可以在库存库中找到示范 sculpted 材质。
+                您正在编辑雕������件。
+雕������件需要特殊的材质来指定其形状。
+您可以在库存中找到示范雕塑材质。
         </notification>
         <notification name="FirstMedia">
                 您已经开始播放媒体。媒体可以在参数设置的音频和视频一栏中设置为自动播放。请注意这对于您不信任的媒体站点可能会有安全隐患。
         </notification>
+<notification name="FirstRLVDetach">
+您的一个或多个附件已被 Restrained Life 设置为不可卸下。
+请注意这同时会禁用所有附件的‘穿上’选项，除非它们被正确地命名。
+
+详细资料请在 SL Wiki 上搜索‘Restrained Life’。
+</notification>
+
+<notification name="FirstRLVFartouch">
+您已被距离触摸限制: 您将不能触摸离您的化身1.5米以外的物体，直到限制解除。
+
+提示: 距离外的物体在鼠标划过时将不会改变指针，并且如果您尝试右键点击的话将会听到错误提示音。
+</notification>
+
+<notification name="FirstRLVGiveToRLV">
+接受物品时，名称以 &apos;#RLV/~&apos; 开始的文件夹可以被自动放置在您的 #RLV 共享文件夹下。 
+
+请注意，一旦启用，接受的物品将会立即可供脚本使用，并可以调用 RLV API 的所有功能，这可能导致意想不到的或令人不快的情况发生。
+
+您是否希望启用这个功能?
+  <usetemplate
+   name="okcancelbuttonscanceldefault"
+   notext="否"
+   yestext="是"/>
+</notification>
         <notification name="MaxListSelectMessage">
                 您从该列表中最多只能选择[MAX_SELECT] 个项目。
         </notification>
@@ -3184,11 +3348,483 @@ Sculpted 元件需要特殊的材质来指定其形状。
         <notification name="UnableToOpenCommandURL">
                 您点击的URL不能从该浏览器中打开。
         </notification>
+        <notification name="QueryClientTags">
+        您是否希望从 kokuaviewer.org 自动更新客户端标识数据库？
+
+这将确保您关于其它客户端的资料是最新的。
+                <form name="form">
+                  <button
+                         name="Yes"
+                         text="是"/>
+                  <button
+                         name="No"
+                         text="否"/>
+                </form>
+        </notification>
+<!--Begin Imprudence notifications-->
+
+<notification name="ClickBuildConstants">
+本标签页中可以使用以下常数: 
+
+PX  —  X 轴位置
+PY  —  Y 轴位置
+PZ  —  Z 轴位置
+SX  —  X 轴尺寸
+SY  —  Y 轴尺寸
+SZ  —  Z 轴尺寸
+RX  —  X 轴角度
+RY  —  Y 轴角度
+RZ  —  Z 轴角度
+CB  —  路径截断开始
+CE  —  路径截断结束
+HLW  —  窟窿大小
+SKW  —  倾斜
+PB  —  切片/凹陷/剖面截断开始
+PE  —  切片/凹陷/剖面截断结束
+TB  —  扭曲开始
+TE  —  扭曲结束
+SHX  —  X 轴顶面倾斜
+SHY  —  Y 轴顶面倾斜
+HLX  —  X 轴洞的尺寸
+HLY  —  Y 轴洞的尺寸
+TPX  —  X 轴锥形
+TPY  —  Y 轴锥形
+ROF  —  半径变化
+REV  —  旋转次数
+
+PI  —  π
+TWO_PI  —  2π
+PI_BY_TWO  —  π/2
+SQRT2  —  2的平方根
+DEG_TO_RAD  —  角度到弧度转换 (π/180)
+RAD_TO_DEG  —  弧度到角度转换 (180/π)
+GRAVITY  —  -9.8
+
+*  —  乘
+\  —  除
++  —  加
+-  —  减
+
+更多信息请点击 “更多信息”。
+  <usetemplate
+   name="okhelpbuttons"
+   yestext="确定"
+   helptext="更多信息"/>
+</notification>
+
+<notification name="ClickTextureConstants" type="alert">
+本标签页中可以使用以下常数: 
+
+TSU  —  每面重复次数 (水平)
+TSV  —  每面重复次数 (垂直)
+TOU  —  位移 (水平)
+TOV  —  位移 (垂直)
+TRNS —  透明度
+TROT —  材质旋转角度
+GLOW —  发光
+
+*  —  乘
+\  —  除
++  —  加
+-  —  减
+
+更多信息请点击 “更多信息”。
+  <usetemplate
+   name="okhelpbuttons"
+   yestext="确定"
+   helptext="更多信息"/>
+</notification>
+
+<notification name="ConfirmAutoPilot">
+你确定要前往这里吗?
+  <usetemplate
+   ignoretext="使用自动寻路时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="前往"/>
+</notification>
+
+<!--looks like a singular they - not much I can do about it - Kaku -->
+<notification name="ConfirmDerender">
+您确定要隐藏 [NAME]?
+
+[NAME] 将不再被渲染，直到您离开区域或他们更换装束。
+  <usetemplate
+    ignoretext="隐藏物体或化身时"
+    name="okcancelignore"
+    notext="取消"
+    yestext="隐藏"/>
+</notification>
+
+<notification name="ConfirmDoubleClickTP">
+您确定要瞬间移动到这里吗？
+  <usetemplate
+   ignoretext="双击瞬间移动时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="瞬间移动"/>
+</notification>
+
+<notification name="ConfirmMuteAgent">
+您确定要屏蔽 [NAME] (居民)吗?
+  <usetemplate
+    ignoretext="屏蔽居民时"
+    name="okcancelignore"
+    notext="取消"
+    yestext="屏蔽"/>
+</notification>
+
+<notification name="ConfirmMuteObject">
+您确定要屏蔽 [NAME] (物体)吗?
+   <usetemplate
+    ignoretext="屏蔽物体时"
+    name="okcancelignore"
+    notext="取消"
+    yestext="屏蔽"/>
+</notification>
+
+<notification name="ConfirmToggleFullscreen">
+您确定要切换全屏模式吗?
+  <usetemplate
+   name="okcancelbuttons"
+   notext="取消"
+   yestext="切换"/>
+</notification>
+
+<notification name="ConfirmRemoveAllClothes">
+您确定要脱下所有衣物吗?
+  <usetemplate
+   ignoretext="脱下所有衣物时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="脱下"/>
+</notification>
+
+<notification name="ConfirmResetAllPreferences">
+您确定要重置所有设置吗?
+
+设置将在 [VIEWER_NAME] 重新启动时清除。
+  <usetemplate
+   ignoretext="重置设置时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="重置"/>
+</notification>
+
+<notification name="ConfirmRestoreToWorld">
+您确定要恢复该物体到其最后的位置吗?
+
+警告: 如果你不确定物体会恢复到哪里, 不要执行恢复!
+
+更多信息请点击 “更多信息”。
+  <usetemplate
+   name="okcancelhelpignore"
+   yestext="恢复"
+   helptext="更多信息"
+   notext="取消"
+   ignoretext="恢复物体到其最后位置时" />
+</notification>
+
+<notification name="ConfirmTeleportHome">
+您确定要瞬间移动回家吗?
+  <usetemplate
+   ignoretext="瞬间移动回家时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="瞬间移动"/>
+</notification>
+
+<notification name="ConnectingToRegionError">
+无法连接到当前区域。请尝试登入到其他区域。
+
+默认登录区域可以在参数设置的一般选项卡中设置。
+</notification>
+
+<notification name="DisconnectedFromRegion">
+您与所在的区域的链接已被断开。无法继续。
+</notification>
+
+<notification name="GridsNoNick">
+不能保存新的网格信息。
+
+您必须指定一个唯一的网格昵称。
+</notification>
+
+<notification name="GridsNoLoginUri">
+不能保存新网格 ‘[NAME]’.
+
+您必须指定登入 URI 。
+</notification>
+
+<notification name="GridInfoDirty">
+您有未保存的更改，将会丢失。继续？
+  <usetemplate
+   ignoretext="创建新网格时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="继续"/>
+</notification>
+
+<notification name="GridExists">
+不能保存新网格 ‘[NAME]’.
+
+昵称相同的网格已经存在。
+</notification>
+
+<notification
+  icon="alertmodal.tga"
+  name="GridInfoNoLoginUri"
+  type="alertmodal">
+  获取网格信息需要其登入 URI.
+</notification>
+
+<notification name="GridInfoNoLoginUri">
+获取网格的信息需要网格登入 URI。
+</notification>
+
+<notification name="GridInfoError">
+无法从服务器获取网格信息。
+</notification>
+  
+<notification name="IMLogNotFound">
+找不到与 [NAME] 的即时聊天记录。
+  <usetemplate
+   name="okbutton"
+   yestext="确定"/>
+</notification>
+
+<notification name="InvalidLogInSecondLife">
+哎呀! 您所输入的登入名称格式不对！
+
+[SECOND_LIFE] 接受以下登入名格式:
+
+ - 用户名
+ - 用户名.Resident
+ - 名.姓
+
+如果您没有账户的话，要不要现在创建一个？
+  <usetemplate
+   name="okcancelbuttons"
+   notext="再试一次"
+   yestext="创建账户"/>
+</notification>
+
+<notification name="InvalidPassword">
+您已输入了无效的密码！请重试。
+</notification>
+  
+<notification name="IncompleteInventoryItem">
+您正访问的物品尚未在本地可用。请稍候再试。
+</notification>
+
+<notification name="ShowLookAtInfo">
+显示视线目标是一个调试功能，可以显示化身的头部在看什么东西。请注意: 这项功能并*不会*显示化身的摄像机视角实际朝向哪个方向。请不要依赖该功能保护任何隐私!
+  <usetemplate
+   ignoretext="设置显示视线目标时"
+   name="okignore"
+   yestext="OK"/>
+</notification>
+  
+<notification name="WebLaunchImprudenceBlog">
+前往 Imprudence 官方日志阅读最新的新闻和信息。
+  <usetemplate
+   ignoretext="打开网络浏览器阅读网络日志时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="打开网页"/>
+</notification>
+
+<notification name="WebLaunchImprudenceForums">
+前往 Imprudence 官方论坛讨论 Imprudence 工程。
+  <usetemplate
+   ignoretext="打开网络浏览器阅读论坛时"
+   name="okcancelignore"
+   notext="取消"
+   yestext="打开网页"/>
+</notification>
+
+<notification
+ icon="alert.tga"
+ name="WebLaunchAutoscript"
+ type="alert">
+打开 Autoscript 生成器 (由 3greeneggs.com 制作)?
+  <usetemplate
+   ignoretext="打开 Autoscript 生成器"
+   name="okcancelignore"
+   notext="取消"
+   yestext="确定"/>
+</notification>
+
+<notification
+ icon="notify.tga"
+ name="FirstAO"
+ type="notify">
+使用方法可以在新建记事卡模板中找到。使用工具栏打开或关闭动画覆盖。
+</notification>
+
+<notification
+ icon="notifytip.tga"
+ name="NoShadows"
+ type="notifytip">
+不能启用阴影，因为您的图形设置过低。请确定您的图像设置为 “极高” 并已启用了基本和大气着色器。
+</notification>
+
+<notification name="NoTextureExportSL">
+为了遵守 Second Life 服务协议, Imprudence 没有下载导出物体的任何材质。
+</notification>
+
+<notification
+ icon="alert.tga"
+ name="Help_CmdLine"
+ type="alert">
+各种命令行功能的选项。
+
+要使用某一条命令, 在聊天栏 (本地聊天) 中键入命令并按回车键。
+</notification>
+  
+<notification label="拼写检查帮助" name="EmeraldHelp_SpellCheck">
+要拼写检查某个单词, 右键点击它, 然后选择正确的词替换。
+您可以选择一个基本辞典, 该辞典储存语式和基本词汇。
+您也可以选择安装其他词汇列表, 只要从列表中选中然后 “安装”。
+</notification>
+
+<notification
+ name="ConfirmLightShare"
+ type="notify"
+ icon="notify.tga">
+该区域正在广播自定义天空和水面设置。
+应用该区域的设定？ (&quot;忽略&quot; 将会忽略所有区域设置，直到你离开这个区域。)
+  <form name="form">
+    <button name="apply"  text="应用"/>
+    <button name="temp"   text="现在不要"/>
+    <button name="region" text="忽略"/>
+  </form>
+</notification>
+
+<notification
+ name="ChangeFont"
+ icon="notify.tga"
+ type="notify">
+新字体将在您重新启动 [VIEWER_NAME] 后使用。
+</notification>
+
+<notification name="FirstPrivacy">
+注意: Second Life 服务条款要求所有客户端，包括 Imprudence 查看器, 连接到 Second Life 时每 5 分钟向林登实验室发送一个 “统计数据封包”。
+
+该封包包括关于您的计算机以及您使用 Second Life 的情况的一些非个人识别性的信息, 例如您的计算机硬件和操作系统，平均帧率，访问的区域数，附近化身数量，以及其他信息。请阅读 Second Life 隐私政策了解林登实验室如何使用此项以及其他信息。
+
+该封包仅发送给林登实验室; Imprudence 开发者并不接收或采集任何此类信息。
+
+Second Life 服务条款不允许您选择不发送此信息。登入 Second Life 代表您同意采集这些数据。
+  <usetemplate
+   name="okcancelbuttons"
+   yestext="登入"   notext="取消"/>
+</notification>
+
+<notification
+   icon="alert.tga"
+   name="MediaAlert"
+   type="alert">
+该地块的拥有者已请求查看器加载以下 [TYPE] URL:
+
+[URL]
+
+您可以选择允许或禁止对应的域名或世界内物体服务器:
+
+[DOMAIN]
+
+“允许” 和 “禁止” 仅对该会话有效，而 “黑名单” 和 “白名单” 永久有效。
+   <form name="form">
+    <button
+         name="Allow"
+         text="允许"/>
+        <button
+         name="Deny"
+         text="禁止"/>
+        <button
+         name="Blacklist"
+         text="黑名单"/>
+        <button
+         name="Whitelist"
+         text="白名单"/>
+   </form>
+  </notification>
+
+  <notification
+   name="MediaListed">
+[DOMAIN] 的媒体/音频 URL 已经被 [LISTED]
+  </notification>
+
+  <notification  name="MediaBlocked">
+屏蔽了来自 [DOMAIN] 的媒体/音频。
+  </notification>
+
+  <notification  name="MediaFiltersCleared">
+媒体过滤列表已经清除
+  </notification>
+
+  <notification name="ProxyNeedRestart">
+Socks 代理服务器设置将在您重新启动 [VIEWER_NAME] 后生效.
+  </notification>
+
+  <notification name="SOCKS_CONNECT_OK">
+成功连接 Socks5 代理服务器 [PROXY]。
+  </notification>
+
+  <notification name="SOCKS_NOT_PERMITTED">
+Socks5 代理服务器 [PROXY] 拒绝了连接，连接未被规则允许
+  </notification>
+
+  <notification name="SOCKS_CONNECT_ERROR">
+Socks5 代理服务器 [PROXY] 拒绝了连接, 无法打开 TCP 连接
+  </notification>
+
+  <notification name="SOCKS_NOT_ACCEPTABLE">
+Socks5 代理服务器 [PROXY] 拒绝了选中的身份验证系统
+  </notification>
+
+  <notification name="SOCKS_AUTH_FAIL">
+Socks5 代理服务器 [PROXY] 报告您的身份验证信息无效
+  </notification>
+
+  <notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+Socks5 代理服务器 [PROXY] 拒绝了 UDP 关联请求
+  </notification>
+
+  <notification name="SOCKS_HOST_CONNECT_FAILED">
+无法连接到 Socks5 代理服务器 [PROXY]
+  </notification>
+
+<!--End Imprudence notifications-->
+ <!-- [KITTY VIEWER] -->
+  <notification
+   icon="alertmodal.tga"
+   name="KittyInvalidWaterlightNotecard"
+   type="alert">
+[NAME] 不是有效的水面设定资产。
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="KittyInvalidWindlightNotecard"
+   type="alert">
+[NAME] 不是有效的 WindLight 设定资产。
+  </notification>
+
+  <notification
+   name="KittyWLSaveNotecardAlert">
+您是否要覆盖已经保存的预设?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="否"
+     yestext="是"/>
+  </notification>
+ <!-- [/KITTY VIEWER] -->
         <global name="UnsupportedCPU">
                 - 您的 CPU(中央处理器)速度没有达到最低需求。
         </global>
         <global name="UnsupportedGLRequirements">
-                您似乎没有满足第[VIEWER_NAME]的系统需求的硬件。第[VIEWER_NAME]需要支持多重材质 (multitexture)
+                您似乎没有满足 [VIEWER_NAME] 的系统需求的硬件。 [VIEWER_NAME] 需要支持多重材质 (multitexture)
 的 OpenGL 显示卡。如果您满足这个条件的话，也许您需要确认已经
 安装了您的显示卡的最新驱动程序、以及操作系统的 Service Pack 和补丁。
 
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_controls.xml
new file mode 100644
index 0000000..75d01fe
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_controls.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="ao_controls">
+  <button label="动画覆盖" label_selected="动画覆盖" name="ao_btn" 
+                tool_tip="点击这里切换动画覆盖器" />
+  <button name="popup_btn" tool_tip="更多选项" width="22" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_expanded.xml b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_expanded.xml
new file mode 100644
index 0000000..283d7cf
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_expanded.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="ao_remote">
+  <button
+                 label="坐姿覆盖关闭"
+                 label_selected="坐姿覆盖打开"
+                 name="ao_sit_btn" />
+</panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
index a537046..182b184 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
@@ -23,6 +23,9 @@
         <slider 
                  name="Wind Volume" 
              label="环境"  />
+        <slider
+                 label="动作"
+                 name="Gestures Volume" />
         <slider name="UI Volume"
              label="界面" />
                  
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
index a1ed123..1d1848d 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Panel Avatar">
         <tab_container name="tab">
-                <panel label="Avatar" name="2nd Life">
+                <panel label="档案" name="2nd Life">
+                        <button label="复制键值" label_selected="复制键值" name="btn_copy_uuid" />
+           
+        
                         <string name="CaptionTextAcctInfo">
 [ACCTTYPE]
 [PAYMENTINFO]
@@ -14,7 +17,7 @@
                                 试用者
                         </string>
                         <string name="AcctTypeCharterMember">
-                                宪������定委员会成员
+                                ���身会员
                         </string>
                         <string name="AcctTypeEmployee">
                                 林登实验室雇员
@@ -40,11 +43,23 @@
                         <text name="online_yes">
                                 当前在线
                         </text>
+                        <text name="online_no">
+                                不在线
+                        </text>
+                        <text name="online_unknown">
+                                在线状态未知
+                        </text>
                         <text name="label">
                                 出生:
                         </text>
+                        <string name="copy_key_info">
+                                已将 [AVATAR] 的键值复制到剪贴板: [KEY]
+                        </string>
+                        <string name="days_old_text">
+                                ([DAYS] 天)
+                        </string>
                         <text name="label2">
-                                账户:
+                                账户信息:
                         </text>
                         <text name="partner_label" tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
                                 搭档:
@@ -61,7 +76,7 @@
                                 社团:
                         </text>
                         <text name="About:">
-                                关于:
+                                关于: (8196个字)
                         </text>
                         <text name="(500 chars)">
                                 (500 个字)
@@ -69,8 +84,11 @@
                         <text name="Give item:">
                                 给与物品:
                         </text>
-                        <text name="Give inventory" tool_tip="要把库存中的物体赠与这个人，将其拖动到这里。">
-                                放置库存物品于此。
+                        <text name="drop target" tool_tip="要把库存中的物体赠与这个人，将其拖动到这里。">
+                                拖动库存条目
+                        </text>
+                        <text name="Give inventory 2" tool_tip="要把库存中的物体赠与这个人，将其拖动到这里。">
+                                到这里赠与居民
                         </text>
                         <check_box label="在搜索结果中显示" name="allow_publish" tool_tip="在搜索中显示额外信息，例如描述和照片。"/>
                         <button label="?" label_selected="?" name="?"/>
@@ -78,17 +96,18 @@
                         <button label="邀请瞬间移动..." label_selected="邀请瞬间移动..." name="Offer Teleport..."/>
                         <button label="添加为好友..." label_selected="添加为好友..." name="Add Friend..."/>
                         <button label="付款..." label_selected="付款..." name="Pay..."/>
-                        <button label="即时消息..." label_selected="即时消息..." name="Instant Message..." tool_tip="即时通信"/>
+                        <button label="即时消息..." label_selected="即时消息..." name="Instant Message..." tool_tip="即时消息 (IM)"/>
                         <button label="屏蔽" label_selected="屏蔽" name="Mute"/>
+                        <button label="邀请加入社团..."    label_selected="邀请加入社团..." name="Invite to Group..." />
                 </panel>
                 <panel label="Web" name="WebProfile">
                         <line_editor is_unicode="false" name="url_edit"/>
                         <flyout_button label="加载" label_selected="加载" name="load" tool_tip="用内部浏览器打开这个档案页面。">
                                 <flyout_button_item name="open_item">
-                                        在外部浏览器中
+                                        在外部浏览器中打开
                                 </flyout_button_item>
                                 <flyout_button_item name="home_item">
-                                        家连接
+                                        ����起始页面
                                 </flyout_button_item>
                         </flyout_button>
                         <button label="?" label_selected="?" name="web_profile_help"/>
@@ -122,31 +141,31 @@
                 </panel>
                 <panel label="收藏" name="Picks">
                         <text name="Tell everyone about your favorite places in Second Life.">
-                                告诉大家你在第二人生中最喜欢的地点。
+                                告诉大家你最喜欢的地点。
                         </text>
                         <button label="新建..." label_selected="新建..." name="New..."/>
                         <button label="删除..." label_selected="删除..." name="Delete..."/>
                         <text name="loading_text">
-                                加载...
+                                载入中...
                         </text>
                 </panel>
                 <panel label="分类广告" name="Classified">
                         <text name="Place an ad in Second Life&apos;s classified listings.">
-                                在第二人生的分类栏中刊登广告。
+                                在分类广告栏中刊登广告。
                         </text>
                         <button label="新建..." label_selected="新建..." name="New..."/>
                         <button label="删除..." label_selected="删除..." name="Delete..."/>
                         <text name="loading_text">
-                                加载...
+                                载入中...
                         </text>
                 </panel>
-                <panel label="���一人生" name="1st Life">
+                <panel label="���实生活" name="1st Life">
                         <text name="Photo:">
                                 照片：
                         </text>
                         <texture_picker label="" name="img" tool_tip="点击这里来选择图片"/>
                         <text name="Info:">
-                                消息:
+                                消息 (8196 个字):
                         </text>
                         <text name="(250 chars)">
                                 (250个字)
@@ -154,7 +173,7 @@
                 </panel>
                 <panel label="我的备注" name="My Notes">
                         <string name="Loading">
-                                加载...
+                                载入中...
                         </string>
                         <text name="label">
                                 使用这块空间来记录你关于这个人的笔记。 追踪交易
@@ -171,7 +190,7 @@
         <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="对此位居民开启顾客服务工具。"/>
         <string name="ShowOnMapNonFriend">
                 在地图上显示位置。
-由于你和���������间没有友谊关系，所以刚才的操作无效。
+由于你和���方之间没有友谊关系，所以刚才的操作无效。
         </string>
         <string name="ShowOnMapFriendOffline">
                 在地图上显示位置。
@@ -190,6 +209,9 @@
                 邀请瞬间移动到你所在的位置。
         </string>
         <string name="Loading">
-                加载...
+                载入中...
+        </string>
+        <string name="HiddenLabel">
+                (隐藏)
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
index f70eef3..761d58a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
@@ -26,7 +26,7 @@
         <button label="发布..." name="classified_update_btn"/>
         <check_box label="每周自动更新" name="auto_renew_check"/>
         <string name="ad_placed_paid">
-                广告发布: [DATE]，为此付出了 L$[AMT]。
+                广告发布: [DATE]，为此付出了 [CURRENCY][AMT]。
         </string>
         <string name="update_txt">
                 更新
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
index 09ded10..7646245 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
@@ -6,21 +6,21 @@
         <button label="瞬间移动" name="classified_teleport_btn"/>
         <button label="在地图中显示" name="classified_map_btn"/>
         <button label="档案" name="classified_profile_btn"/>
-        <combo_box name="classified_mature_check">
+        <combo_box label="" name="classified_mature_check">
                 <combo_item name="select_mature">
-                        -选择限制级-
+                        - 选择限制级 -
                 </combo_item>
                 <combo_item name="mature">
-                        Mature Content
+                        Mature内容
                 </combo_item>
                 <combo_item name="pg">
-                        PG Content
+                        PG内容
                 </combo_item>
         </combo_box>
         <combo_box label="" name="classified_category_combo"/>
         <button label="更新" name="classified_update_btn"/>
         <string name="ad_placed_paid">
-                广告������：[DATE],发���付款 L$[AMT]
+                广告������: [DATE]，���此付出了 [CURRENCY][AMT]。
         </string>
         <string name="update_txt">
                 更新
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
index fafb6e8..16b16fc 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
@@ -9,12 +9,16 @@
                 <column name="icon_visible_online" tool_tip="好友可以看见你是否在线"/>
                 <column name="icon_visible_map" tool_tip="好友可以在地图上找到你"/>
                 <column name="icon_edit_mine" tool_tip="好友可以编辑你的物体"/>
+                <column name="icon_visible_map" tool_tip="你可以在地图上找到这位好友"/>
                 <column name="icon_edit_theirs" tool_tip="你可以编辑这位好友的物体"/>
         </scroll_list>
         <button label="聊天/呼叫" name="im_btn" tool_tip="打开即时通信会话"/>
         <button label="档案" name="profile_btn" tool_tip="显示图片、社团和其他信息"/>
         <button label="瞬间移动..." name="offer_teleport_btn" tool_tip="邀请该好友瞬间移动到你的当前位置"/>
-        <button label="付款..." name="pay_btn" tool_tip="给这位好友林登币 (L$)"/>
+        <button label="付款..." name="pay_btn" tool_tip="给这位好友货币"/>
         <button label="移除..." name="remove_btn" tool_tip="将这个人从你的好友列表中去除"/>
         <button label="添加..." name="add_btn" tool_tip="邀请其他居民成为你的好友"/>
+  <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
+       height="18" left="10" right="-100" name="buddy_search"
+       label="在这里打字查找好友" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 43d6d3e..cddaac2 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -26,7 +26,7 @@
         <text_editor name="charter">
                 社团宪章
         </text_editor>
-        <button label="加入(L$0)" label_selected="加入(L$0)" name="join_button"/>
+        <button label="加入 (免费)" label_selected="加入 (免费)" name="join_button"/>
         <button label="详细视图" label_selected="详细察看" name="info_button"/>
         <text name="text_owners_and_visible_members">
                 拥有者和可见的会员
@@ -45,7 +45,7 @@
         <panel name="preferences_container">
                 <check_box label="在搜索中显示" name="show_in_group_list" tool_tip="让别人在搜索结果中看到这个社团。"/>
                 <check_box label="公开注册" name="open_enrollement" tool_tip="设置该社团是否允许新会员加入而不需要被邀请。"/>
-                <check_box label="注册费用: L$" name="check_enrollment_fee" tool_tip="设定是否收将取社团入会费。"/>
+                <check_box label="注册费用: [CURRENCY]" name="check_enrollment_fee" tool_tip="设定是否收将取社团入会费。"/>
                 <spinner name="spin_enrollment_fee" tool_tip="如果选择了注册费用的话，新会员加入社团时必须付出这笔费用。"/>
                 <combo_box name="group_mature_check" tool_tip="设置是否应将社团信息看作Mature内容。">
                         <combo_item name="select_mature">
@@ -65,12 +65,16 @@
                         <combo_box name="active_title" tool_tip="设置当该社团激活时，在化身姓名标签中显示的头衔。"/>
                 </panel>
                 <check_box label="接受社团通知" name="receive_notices" tool_tip="设置您是否想要从该社团接受通知。如果这个社团向您乱发垃圾信息，那就取消选择这项。"/>
+                <check_box
+                         label="加入社团聊天"
+                         name="receive_chat"
+                         tool_tip="设置是否想参加社团聊天。如果这个社团向您乱发垃圾信息，那就取消选择这项。" />
                 <check_box label="在我的档案中列出该社团" name="list_groups_in_profile" tool_tip="设置您是否想要在档案中列出该社团"/>
         </panel>
         <string name="incomplete_member_data_str">
-                重新获取会员信息
+                获取������信息中
         </string>
         <string name="confirm_group_create_str">
-你真的，真的，真----的----确定要花费M$0来创建这个社团吗?
+你真的，真的，真----的----确定要花费[GROUPCREATEFEE]来创建这个社团吗?
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index cf1866c..0c0a64a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -11,7 +11,7 @@
                 你没有查看这个社团账户信息的权限。
         </string>
         <string name="loading_txt">
-                载入...
+                载入中...
         </string>
         <text name="group_land_heading">
                 社团所持有土地
@@ -55,7 +55,7 @@
                 社团成员必须贡献更多的土地额度，来支持土地的使用。
         </text>
         <text name="group_money_heading">
-                社团资产 L$
+                社团 [CURRENCY]
         </text>
         <tab_container name="group_money_tab_container">
                 <panel label="计划" name="group_money_planning_tab">
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
index cb658cb..a67c585 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="groups">
+        <scroll_list
+                         name="group list">
+                <column
+                                 label="社团名称"
+                                 name="name" />
+                <column
+                                 label="通知"
+                                 name="receive_notices"
+                                 tool_tip="接受该社团的通知" />
+                <column
+                                 label="聊天"
+                                 name="join_group_chat"
+                                 tool_tip="参加该社团的社团聊天" />
+                <column
+                                 label="公开"
+                                 name="list_in_profile"
+                                 image="ff_visible_online_button.tga"
+                                 tool_tip="在你的档案中列出该社团" />
+        </scroll_list>
         <text name="groupdesc" >
                 您当前激活的社团以粗体表示。
         </text>
@@ -17,6 +36,12 @@
                  label="激活"
                  name="Activate" />
         <button
+                 label="头衔..."
+                 name="Titles..." />
+        <button
+                 label="邀请..."
+                 name="Invite..." />
+        <button
                  label="离开"
                  name="Leave" />
         <button
@@ -25,5 +50,8 @@
         <button
                  label="搜索..."
                  name="Search..." />
+        <search_editor 
+                name="group_search"
+                label="搜索你的社团" />
 </panel>
 <!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_login.xml b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
index a10df47..b43d441 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,11 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
+  <web_browser name="login_html" 
+                         bottom="102" top="-1" left="0" right="-1"
+                         border_visible="false" follows="top|left|bottom|right"
+                         start_url="data:text/html,
+                         %3Chtml%3E
+                         %3Chead%3E %3C/head%3E
+                         %3Cbody bgcolor=%22#5a2d65%22 text=%22ffffff%22%3E
+                         %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E
+                           %3Ctr%3E
+                                 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E
+                                   %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E
+                                   %3Cbr/%3E
+                                   %3CH1%3E请稍候...%3C/H1%3E
+                                 %3C/td%3E
+                           %3C/tr%3C
+                         %3C/table%3E
+                         %3C/body%3E
+                         %3C/html%3E" />
         <text name="first_name_text">
                 名:
         </text>
         <text name="last_name_text">
                 姓:
         </text>
+        <text name="username_text">
+                登入名称:
+        </text>
         <text name="password_text">
                 密码:
         </text>
@@ -27,6 +48,10 @@
         <text name="full_screen_text">
                 登陆后显示器会采用全屏显示。
         </text>
+        <text name="grid_text">
+                网格:
+        </text>
+        <button name="grid_btn" label="网格管理器" />
         <button label="新帐户..." label_selected="新帐户..." name="new_account_btn" />
         <button label="登入" label_selected="登入" name="connect_btn" />
         <button label="参数选择..." label_selected="参数选择..." name="preferences_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml
index cc55e26..655d866 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml
@@ -24,4 +24,13 @@
         <text name="nw_label" width="40">
                 西北
         </text>
+        <string name="tooltip_tp">
+                双击瞬间移动
+        </string>
+        <string name="tooltip_pan">
+                按住 Shift 拖动平移
+        </string>
+        <string name="tooltip_map">
+                双击打开地图
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
index 6e5424d..98ccab6 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
@@ -4,13 +4,16 @@
                 <layout_panel min_width="420" name="main_panel">
                         <layout_stack name="chatbar_and_buttons">
                                 <layout_panel name="state_buttons">
-                                        <button label="已收到即时消息" label_selected="已收到即时消息" name="IM Received" tool_tip="你有一个未察看的即时消息。请点击察看"/>
-                                        <button label="取消忙碌状态" label_selected="取消忙碌状态" name="Set Not Busy" tool_tip="聊天与即时消息模式已对你隐藏。 点击这里来设定你不在忙碌模式下"/>
-                                        <button label="三维浏览" label_selected="三维浏览" name="Flycam" tool_tip="你的手柄当前被手柄所控制，点击这里释放。"/>
+                                        <button label="条未读消息" label_selected="条未读消息" name="IM Received" tool_tip="你有一条未察看的即时消息。请点击察看"/>
+                                        <button label="取消忙碌状态" label_selected="取消忙碌状态" name="Set Not Busy" tool_tip="聊天与即时消息模式已对你隐藏。 点击这里离开忙碌模式"/>
+                                        <button label="三维浏览" label_selected="三维浏览" name="Flycam" tool_tip="你的视角当前被手柄所控制，点击这里释放。"/>
                                         <button label="第一人称视角" label_selected="第一人称视角" name="Mouselook" tool_tip="使用鼠标控制屏幕。如果你有枪，点击则可以射击。"/>
                                         <button label="起身" label_selected="起身" name="Stand Up" tool_tip="点击这里来站立"/>
                                 </layout_panel>
                         </layout_stack>
                 </layout_panel>
         </layout_stack>
+        <string name="unread_count_string_plural">
+                条未读消息
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_particle_settings.xml b/linden/indra/newview/skins/default/xui/zh/panel_particle_settings.xml
new file mode 100644
index 0000000..5bc7ca6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_particle_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="粒子设置"
+         name="ParticleSettings">
+ 
+        <text
+                 name="part_start_color_textbox">
+                起始颜色:
+        </text>
+        <color_swatch
+                 name="part_start_color_swatch"
+                 tool_tip="点击这里来打开色彩选择器" />
+        <text
+                 name="part_end_color_textbox">
+                结束颜色:
+        </text>
+        <color_swatch
+                 label=""
+                 name="part_end_color_swatch"
+                 tool_tip="点击这里来打开色彩选择器" />
+        <text
+                 name="part_texture_textbox">
+                材质:
+        </text>
+ 
+        <texture_picker
+                 label=""
+                 name="part_texture_picker"
+                 tool_tip="点击这里来选择图片" />
+        <button
+                 name="reset_cloud_this_account"
+                 label="重置该账户"
+                 tool_tip="重置该账户的化身粒子云到默认值" />
+        <button
+                 name="save_cloud_this_account"
+                 label="保存该账户"
+                 tool_tip="保存该账户的化身粒子云" />
+        <button
+                 name="save_cloud_any_account"
+                 label="保存所有账户"
+                 tool_tip="保存化身粒子云设置到所有账户" />
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_place.xml b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
index 91512d9..b2c5492 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
@@ -37,7 +37,7 @@
         </string>
         <string
                  name="forsale_text">
-                以L$[PRICE]的价格出售
+                以 [CURRENCY][PRICE] 的价格出售
         </string>
         <string
                  name="auction_text">
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
index bbda749..1e978d0 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
@@ -25,7 +25,7 @@
                 面积：[AREA]平方米。
         </string>
         <string name="forsale_text">
-                以L$[PRICE]出售
+                以 [CURRENCY][PRICE] 出售
         </string>
         <string name="auction_text">
                 拍卖 ID [ID]。
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
index f3ce87e..65cfee8 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
@@ -1,4 +1,164 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="advanced_panel">
-        <check_box label="与物体共享语言" name="language_is_public" tool_tip="这使得世界内的物体可以知道你偏好的语言。"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="高级"
+         name="advanced_panel">
+  <!-- Start organizing these when we get enough of 'em - MC -->
+  <tab_container
+                 label="第 2 页"
+                 name="tab2"
+                 tab_min_width="50">
+ 
+    <panel
+                         label="主要"
+                         name="main_panel">
+      <text name="user_interface_text">
+        用户界面:
+      </text>
+
+      <check_box
+                                 label="禁用登入 / 登出屏幕"
+                                 name="disable_log_screen_check" />
+      <check_box
+                                 label="禁用瞬间移动屏幕"
+                                 name="disable_tp_screen_check" />
+      <check_box
+                                 label="显示 WindLight 工具栏"
+                                 name="toggle_windlight_control" />
+      <check_box
+                                 label="使用旧式菜单"
+                                 name="legacy_pie_menu_checkbox" />
+      <text     name="avatar_text">
+        化身:
+      </text>
+      
+      <check_box
+                                 label="在姓名标签中显示客户端名称"
+                                 name="client_name_tag_check" />
+      <check_box
+                                 label="用颜色显示客户端名称"
+                                 name="client_name_color_check" />
+      <check_box
+                                 label="悬停提示中显示客户端名称"
+                                 name="client_name_hover_check" />
+      <check_box
+                                 label="对他人显示你的客户端名称"
+                                 name="client_name_tag_broadcast_check" />
+      <check_box
+                                 tool_tip="切换编辑外观时是否起立转身。"
+                                 label="编辑外观时播放化身动画"
+                                 name="appearance_anim_check" />
+      <check_box label="头部跟随鼠标" tooltip="如果您的化身头部跟随您的鼠标动作" name="head_follows_mouse_checkbox" />
+      <check_box label="起飞/着陆通过键盘上/下键控制" name="automatic_fly"/>
+      <check_box label="聊天时箭头键总是移动你的化身"
+             name="arrow_keys_move_avatar_check" />
+
+      <text name="chat_text">
+        聊天:
+      </text>
+      <check_box label="以聊天形式显示脚本错误和警告" name="script_errors_as_chat" />
+      <check_box label="显示收到消息的时间" name="show_timestamps_check" />
+      <check_box
+                                 label="聊天和即时通信中使用 MU* 风格动作"
+                                 name="allow_mupose"
+                                 tool_tip="聊天和即时通信中使用 MU* 风格动作 (':' 可以用来代替 '/me ')。" />
+      <check_box
+                                 label="自动关闭 OOC (( )) 发言"
+                                 name="auto_close_ooc"
+                                 tool_tip="自动关闭脱离角色的发言 (即是， 如果键入了 (( 但没有 )) 就添加 )) )." />
+
+      <text
+                                 name="textbox">
+        世界:
+      </text>
+      <check_box
+                                 label="启用阴影 (警告: 不稳定并需要图像设置为最高)"
+                                 name="shadows_check" />
+      <text name="lightshare_text">
+          启用区域  WindLight 设置 (LightShare):
+      </text>
+      <combo_box
+                                 name="lightshare_combo"
+                                 allow_text_entry="false">
+        <combo_item
+                                         name="never"
+                                         value="0">
+          从不
+        </combo_item>
+        <combo_item
+                                         name="ask"
+                                         value="1">
+          每次都询问我
+        </combo_item>
+        <combo_item
+                                         name="always"
+                                         value="2">
+          总是
+        </combo_item>
+      </combo_box>
+
+      <check_box label="用颜色区别客户端" name="client_name_color_check" />
+
+
+      <check_box
+                                 label="使用 HTTP 获取材质 (实验性)"
+                                 name="http_texture_check" />
+      <check_box
+                                 label="通过逐渐增加描绘距离加速载入"
+                                 name="speed_rez_check" />
+      <spinner
+                                 tool_tip="描绘距离增加之间的将各"
+                                 label="步进间隔:"
+                                 name="speed_rez_interval_spinner" />
+      <text
+                                 name="speed_rez_seconds_text">
+        seconds
+      </text>
+
+
+      <check_box label="与物体共享语言" name="language_is_public" tool_tip="这使得世界内的物体可以知道你偏好的语言。"/>
+
+
+ 
+  <!-- Uncomment when we start using the crash logger - MC -->
+  <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="18" left="12"
+       mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
+    崩溃报告:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
+             height="18" left="153" max_chars="20" mouse_opaque="true"
+             name="crash_behavior_combobox" width="146">
+    <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
+      Ask before sending
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
+      Always send
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
+      Never send
+    </combo_item>
+  </combo_box>-->
+ 
+    <button
+                                 label="重置所有选项到默认值"
+                                 name="reset_btn"
+                                 tool_tip="重置所有选项到默认值 (需要重启动)" />
+    </panel>
+ 
+
+  <panel
+                   label="化身粒子设置"
+                   name="AvatarCloud">
+  <text
+                           name="must_be_logged_in_textbox">
+          必须登入后才能更改
+  </text>
+  <check_box
+                           label="预览化身为云"
+                           name="preview_cloud"
+                           tool_tip="预览化身为云，即使已经 rezzed" />
+  </panel>
+  </tab_container>
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
index 3b505b7..8c61f4f 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
@@ -4,19 +4,30 @@
                 音量:
         </text>
         <text name="streaming_prefs_text">
-                流媒体首选项:
+                流媒体:
         </text>
         <text name="audio_prefs_text">
-                音频首选项:
+                音频:
         </text>
         <panel label="音量" name="Volume Panel"/>
         <check_box label="当音乐可用时播放音乐流(会占用更多带宽)" name="streaming_music"/>
+        <check_box label="聊天记录中显示流信息" name="show_stream_title" />
         <check_box label="当视频可用时播放视频流(会占用更多带宽)" name="streaming_video"/>
         <check_box label="自动播放媒体" name="auto_streaming_video"/>
+        <check_box label="媒体控制小工具" name="media_helper_widget" />  
+        <check_box label="过滤媒体 URL" name="enable_media_filter" />
+        <button
+                 name="show_media_filter"
+                 label="媒体过滤设置"
+                 tool_tip="编辑媒体过滤器的设置和允许和禁止列表。" />
         <check_box label="当窗口最小化时屏蔽声音" name="mute_when_minimized"/>
         <slider label="多普勒效应" name="Doppler Effect" width="250"/>
         <slider label="距离系数" name="Distance Factor"/>
         <slider label="衰减系数:" name="Rolloff Factor"/>
-        <spinner label="L$ 变化阈值" name="L$ Change Threshold"/>
-        <spinner label="生命值变化阈值" name="Health Change Threshold"/>
+        <spinner label="[CURRENCY] 变化阈值" name="L$ Change Threshold"/>
+        <spinner label="生命值变化阈值" name="Health change threshold"/>
+  <text name="ambient_prefs_text">
+    环境:
+  </text>
+  <check_box label="启用风声" name="mute_wind_check" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index 143821d..e2df77f 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,72 +1,253 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="聊天" name="chat">
-        <text type="string" length="1" name="text_box">
-                聊天字体大小:
-        </text>
-        <radio_group name="chat_font_size">
-                <radio_item type="string" length="1" name="radio">
-                        小号
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        中号
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        大号
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="text_box2">
-                聊天颜色:
-        </text>
-        <!--Geneko Nemeth: 最多只能写三个字。/Maximum 3 Chinese characters.-->
-        <color_swatch
-                 label="您"
-                 name="user" />
-        <color_swatch
-                 label="其他人"
-                 name="agent" />
-        <color_swatch
-                 label="即时"
-                 name="im" />
-        <color_swatch label="系统" name="system" />
-        <color_swatch label="错误" name="script_error" />
-        <color_swatch label="用户" name="users" />
-        <color_swatch label="物体" name="objects" />
-        <color_swatch label="Owner" name="owner" />
-        <color_swatch label="气球" name="background" />
-        <color_swatch label="链接" name="links" />
-        <text type="string" length="1" name="text_box3">
-                聊天控制台:
-        </text>
-        <spinner label="对话淡出时间" name="fade_chat_time" />
-        <text type="string" length="1" name="text_box4">
-                (秒)
-        </text>
-        <text type="string" length="1" name="text_box5">
-                (行)
-        </text>
-        <slider label="不透明度" name="console_opacity" />
-        <check_box
-                 label="使用全屏宽度  (需要重启动)"
-                 name="chat_full_width_check" />
-        <text type="string" length="1" name="text_box6">
-                聊天选项:
-        </text>
-        <check_box label="用全屏宽度聊天 (需重启)" name="chat_full_width_check" />
-        <check_box label="按回车键关闭聊天栏" name="close_chat_on_return_check" />
-        <check_box label="聊天时箭头键总是移动你的化身"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="本地聊天时显示时间戳" name="show_timestamps_check" />
-        <check_box
-                 label="聊天时播放打字动画"
-                 name="play_typing_animation" />
-        <text type="string" length="1" name="text_box7">
-                聊天气球:
-        </text>
-        <check_box label="使用气球聊天" name="bubble_text_chat" />
-        <slider label="不透明度" name="bubble_chat_opacity" />
-        <text type="string" length="1" name="text_box8">
-                脚本错误:
-        </text>
-        <check_box label="以聊天形式显示脚本错误和警告" name="script_errors_as_chat" />
+  <tab_container
+                 name="chattab2">
+    <panel
+                         label="聊天和即时消息"
+                         name="chat_panel">
+                <text type="string" length="1" name="text_box">
+                        聊天字体大小:
+                </text>
+                <combo_box
+                                 name="chat_font_size">
+                        <combo_item name="0">
+                          小号
+                        </combo_item>
+                        <combo_item name="1">
+                          中号
+                        </combo_item>
+                        <combo_item name="2">
+                          大号
+                        </combo_item>
+                </combo_box>
 
+                <text type="string" length="1" name="text_box2">
+                        聊天颜色:
+                </text>
+                <color_swatch
+                         label="您"
+                         name="user" />
+                <color_swatch
+                         label="其他人"
+                         name="agent" />
+                <color_swatch
+                         label="即时消息"
+                         name="im" />
+                <color_swatch label="系统" name="system" />
+                <color_swatch label="错误" name="script_error" />
+                <color_swatch label="用户" name="users" />
+                <color_swatch label="物体" name="objects" />
+                <color_swatch label="Owner" name="owner" />
+                <color_swatch label="气球" name="background" />
+                <color_swatch label="链接" name="links" />
+                <text type="string" length="1" name="text_box3">
+                        聊天控制台:
+                </text>
+                <spinner label="对话淡出时间" name="fade_chat_time" />
+                <text type="string" length="1" name="text_box4">
+                        (秒)
+                </text>
+                <text type="string" length="1" name="text_box5">
+                        (行)
+                </text>
+                <slider label="不透明度" name="console_opacity" />
+                <check_box
+                         label="使用全屏宽度  (需要重启动)"
+                         name="chat_full_width_check" />
+                <text type="string" length="1" name="text_box6">
+                        聊天栏:
+                </text>
+                <check_box label="用全屏宽度聊天 (需重启)" name="chat_full_width_check" />
+                <check_box label="按回车键关闭聊天栏" name="close_chat_on_return_check" />
+                <check_box
+                         label="聊天时播放打字动画"
+                         name="play_typing_animation" />
+        <check_box
+                         label="将聊天栏作为命令行使用"
+                         name="command_line_check" />
+        <button
+                         label="聊天栏命令"
+                         name="command_line_btn"
+                         tool_tip="Set specific chatbar command line commands here" />
+                <text type="string" length="1" name="text_box7">
+                        聊天气球:
+                </text>
+                <check_box label="使用气球聊天" name="bubble_text_chat" />
+                <check_box
+                         label="同时显示本地聊天和气球"
+                         name="local_bubble_text_chat" />
+                <slider label="不透明度" name="bubble_chat_opacity" />
+                <text type="string" length="1" name="text_box8">
+                        脚本错误:
+                </text>
+                <check_box
+                         label="显示自定义聊天频道"
+                         name="toggle_channel_control" />
+            <text
+                                 name="Instant Messages:">
+        即时消息:
+      </text>
+
+                <check_box label="发送即时消息至电子邮件([EMAIL])" name="send_im_to_email" />
+                <text
+                         name="show_ims_label">
+                        显示即时消息:
+                </text>
+                <check_box
+                         label="聊天控制台"
+                         name="include_im_in_chat_console" />
+                <check_box
+                         label="本地聊天窗口"
+                         name="include_im_in_chat_history" />
+                <check_box
+                         label="垂直即时消息标签页 (需要重启动)"
+                         name="vertical-imtabs-toggle" />
+        </panel>
+    <panel
+                         label="拼写检查"
+                         name="spell_check_tab">
+
+      <text name="text_box">
+        拼写检查:
+      </text>
+      <button
+                                 label="?"
+                                 name="EmeraldHelp_SpellCheck"
+                                 tool_tip="点击这里获取该页面设置的帮助。" />
+      <check_box
+                                 label="以红色显示拼错的词"
+                                 name="EmeraldSpellDisplay" />
+      <text
+                                 name="EmSpell_txt1">
+        当前语言 (词典):
+      </text>
+      <text
+                                 name="EmSpell_txt3">
+        下载语言 (词典):
+      </text>
+      <button
+                                 label="安装"
+                                 name="EmSpell_Add"
+                                 tool_tip="" />
+      <button
+                                 label="下载更多..."
+                                 name="EmSpell_GetMore"
+                                 tool_tip="在线获取更多词典" />
+      <text
+                                 name="EmSpell_txt2">
+        附加的自定义词典:
+      </text>
+      <button
+                                 label="移除"
+                                 name="EmSpell_Remove"
+                                 tool_tip="" />
+      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
+      <text
+                                 name="EmSpell_txt4">
+                                 要使用拼写检查，右键单击拼错的词并选择正确的词替换。
+      </text>
+      <button
+                                 name="ac_button"
+                                 label="自动更正设定..."
+                                 tool_tip="更改自动更正词汇表和设置" />
+                <text
+                         name="text_translate">
+                        翻译聊天:
+                </text>
+                <check_box
+                         label="机器翻译聊天 (由 Google 强力驱动)"
+                         name="translate_chat" />
+                <text
+                         name="text_translate_chat">
+                        翻译为以下语言:
+                </text>
+                <combo_box
+                         name="translate_language_combobox">
+                        <combo_item
+                                         name="System Default Language">
+                          系统默认值
+                        </combo_item>
+                        <combo_item
+                                         name="English">
+                          English (英语)
+                        </combo_item>
+
+                        <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+
+                        <combo_item
+                                         name="Danish">
+                          Dansk (丹麦语)
+                        </combo_item>
+                        <combo_item
+                                         name="Deutsch(German)">
+                          Deutsch (德语)
+                        </combo_item>
+                        <combo_item
+                                         name="Spanish">
+                          Español (西班牙语)
+                        </combo_item>
+                        <combo_item
+                                         name="French">
+                          Français (法语)
+                        </combo_item>
+                        <combo_item
+                                         name="Italian">
+                          Italiano (意大利语)
+                        </combo_item>
+                        <combo_item
+                                         name="Hungarian">
+                          Magyar (匈牙利语)
+                        </combo_item>
+                        <combo_item
+                                         name="Dutch">
+                          Nederlands (荷兰语)
+                        </combo_item>
+                        <combo_item
+                                         name="Polish">
+                          Polski (波兰语)
+                        </combo_item>
+                        <combo_item
+                                         name="Portugese">
+                          Portugués (葡萄牙语)
+                        </combo_item>
+                        <combo_item
+                                         name="Russian">
+                          Русский (俄语)
+                        </combo_item>
+                        <combo_item
+                                         name="Turkish">
+                          Türkçe (土耳其语)
+                        </combo_item>
+                        <combo_item
+                                         name="Ukrainian"
+                                         value="uk">
+                          Українська (乌克兰语)
+                        </combo_item>
+                        <combo_item
+                                         name="Chinese"
+                                         value="zh">
+                          中文
+                        </combo_item>
+                        <combo_item
+                                         name="(Japanese)"
+                                         value="ja">
+                          日本語
+                        </combo_item>
+                        <combo_item
+                                         name="(Korean)"
+                                         value="ko">
+                          한국어 (韩语)
+                        </combo_item>
+                </combo_box>
+    </panel>
+
+ </tab_container>
+                <string name="log_in_to_change">
+                登陆后更改
+                </string>
+  <string
+                 name="default_email_used">
+    使用默认的电子邮件地址
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
new file mode 100644
index 0000000..691e052
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="聊天颜色"
+         name="colors">
+  <text
+                 name="text_box2">
+    聊天颜色:
+  </text>
+  <text
+                 name="effects_color_textbox">
+    我的选择光束颜色:
+  </text>
+  <color_swatch
+                 name="effect_color_swatch"
+                 tool_tip="点击这里来打开色彩选择器" />
+
+  <text
+                 name="client_tag_color_textbox">
+    客户端标签颜色:
+  </text>
+  <check_box label="用颜色区别客户端" name="client_name_color_check" />
+  <color_swatch
+                 label="你的聊天"
+                 name="user" />
+  <color_swatch
+                 label="他人的聊天"
+                 name="agent" />
+  <color_swatch
+                 label="即时消息"
+                 name="im" />
+  <color_swatch
+                 label="系统"
+                 name="system" />
+  <color_swatch
+                 label="脚本错误"
+                 name="script_error" />
+  <color_swatch
+                 label="物体的聊天"
+                 name="objects" />
+  <color_swatch
+                 label="物体即时消息"
+                 name="object_ims" />
+  <color_swatch
+                 label="物体对拥有者"
+                 name="owner" />
+  <color_swatch
+                 label="聊天气球"
+                 name="background" />
+  <color_swatch
+                 label="链接"
+                 name="links" />
+ 
+  <text
+                 name="text_box3">
+    高亮:
+  </text>
+ 
+  <check_box
+                 label="高亮好友的聊天"
+                 name="HighlightFriendsChat" />
+  <color_swatch
+                 label="好友"
+                 name="FriendsChatColor" />
+ 
+  <check_box
+                 label="高亮含有你的名字的本地聊天"
+                 name="HighlightOwnNameInChat" />
+  <check_box
+                 label="高亮含有你的名字的社团聊天"
+                 name="HighlightOwnNameInIM" />
+  <color_swatch
+                 label="你的名字"
+                 name="OwnNameChatColor" />
+ 
+  <line_editor label="高亮昵称 1:"
+                 name="nick01" />
+  <line_editor label="高亮昵称 2:"
+                 name="nick02" />
+  <line_editor label="高亮昵称 3:"
+                 name="nick03">
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_fonts.xml
new file mode 100644
index 0000000..ecb4e60
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_fonts.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="fonts_panel"
+         label="字体">
+ 
+  <text name="fontselect">
+    用户界面字体:
+  </text>
+  <text name="(requires restart)">
+    (需要重启动)
+  </text>
+ 
+  <spinner
+                 name="font_mult"
+                 label="字体放大倍数:"
+                 tool_tip="所有字体尺寸将被乘以这个数。" />
+ 
+  <check_box
+                 name="font_round"
+                 label="强制整数字体大小 (也许能解决字体模糊问题)" />
+        <text name="UI Size:">
+                界面尺寸:
+        </text>
+   <button
+                 label="重置"
+                 label_selected="重置"
+                 name="reset_ui_size" />
+        <check_box label="使用分辨率无关尺寸" name="ui_auto_scale"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 926231c..429bff3 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -1,30 +1,74 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般选项" name="general_panel">
-        <radio_group draw_border="false" name="default_start_location">
-                <radio_item name="MyHome" tool_tip="默认登录到我的家。">
-                        我的家
-                </radio_item>
-                <radio_item name="MyLastLocation" tool_tip="默认登录到我最后的位置。">
-                        我最后在的位置
-                </radio_item>
-        </radio_group>
-        <check_box label="在登陆界面上显示起始位置" name="show_location_checkbox"/>
+        <combo_box
+                 name="default_location_combo"
+                 allow_text_entry="true"
+                 max_chars="128">
+                <combo_item
+                         name="MyHome"
+                         value="My Home">
+                  我的家
+                </combo_item>
+                <combo_item
+                         name="MyLastLocation"
+                         value="My Last Location">
+                  我最后在的位置
+                </combo_item>
+                <combo_item
+                         name="Typeregionname"
+                         value="&lt;Type region name&gt;">
+                  &lt;输入地域名&gt;
+                </combo_item>
+        </combo_box>
+        <check_box label="在登陆界面上显示" name="show_location_checkbox"/>
+        <button
+                 name="grid_btn"
+                 label="网格管理器" />
         <combo_box name="fade_out_combobox">
                 <combo_item name="Never">
                         从不显示
                 </combo_item>
                 <combo_item name="Show Temporarily">
-                        暂������示
+                        短暂地显示
                 </combo_item>
                 <combo_item name="Always">
                         总是显示
                 </combo_item>
         </combo_box>
-        <check_box label="���身名字使���小号���体" name="small_avatar_names_checkbox"/>
+        <check_box label="放���������标��" name="large_avatar_names_checkbox"/>
         <check_box label="在我的屏幕上隐藏我的名字" name="show_my_name_checkbox"/>
+        <check_box
+                 label="粗体显示好友的姓名标签"
+                 name="highlight_friends_checkbox" />
+        <text
+                 name="Display_Names_textbox">
+                显示名称:
+        </text>
+        <radio_group
+                 name="displaynames">
+                <radio_item
+                         name="0">
+                经典名字
+                </radio_item>
+                <radio_item
+                         name="1">
+                显示名称
+                </radio_item>
+                <radio_item
+                         name="2">
+                两者都显示
+                </radio_item>
+        </radio_group>
+        <check_box
+                 label="显示好友的经典名字"
+                 name="legacy_friends_checkbox" />
         <text name="group_titles_textbox">
                 社团头衔:
         </text>
+        <text
+                 name="show_names_textbox">
+                姓名标签:
+        </text>
         <check_box label="隐藏所有社团头衔" name="show_all_title_checkbox"/>
         <check_box label="隐藏我的社团头衔" name="show_my_title_checkbox"/>
         <color_swatch label="" name="effect_color_swatch" tool_tip="点击这里来打开色彩选择器"/>
@@ -32,39 +76,75 @@
                 界面尺寸:
         </text>
         <check_box bottom="-236" label="使用分辨率无关尺寸" left="148" name="ui_auto_scale" width="256"/>
+  <button
+                 label="重置"
+                 label_selected="重置"
+                 name="reset_ui_size" />
+ <text
+                 name="afk_textbox">
+    空闲时离开:
+  </text>
         <spinner label="离开休息计时:" name="afk_timeout_spinner"/>
-        <check_box label="在付出或收到林登币 (L$) 时提醒我" name="notify_money_change_checkbox"/>
+        <check_box
+                 label="空闲时进入离开状态"
+                 name="afk_timeout_checkbox" />
+
+        <text
+                 name="Mini-Map Notify:">
+        迷你地图提醒:
+        </text>
         <text name="maturity_desired_label">
                 分级：
         </text>
         <text name="maturity_desired_prompt">
-                我希望���的���������问权限：
+                我希望���问以下���别��������：
         </text>
         <combo_box name="maturity_desired_combobox">
                 <combo_item name="Desired_Adult">
-                        PG，Mature和Adult
+                        PG、Mature 和 Adult
                 </combo_item>
                 <combo_item name="Desired_Mature">
-                        PG和Mature
+                        PG 和 Mature
                 </combo_item>
                 <combo_item name="Desired_PG">
-                        仅限PG
+                        仅限 PG
                 </combo_item>
         </combo_box>
         <text name="maturity_desired_textbox">
-                仅限PG
+                仅限 PG
         </text>
+        <text
+                name="time_textbox">
+        时钟:
+        </text>
+        <combo_box
+                 allow_text_entry="false"
+                 max_chars="20"
+                 name="time_combobox">
+                <combo_item
+                         name="12HourTime"
+                         value="PST 12">
+                        12小时 太平洋标准/夏令时
+                </combo_item>
+                <combo_item
+                         name="24HourTime"
+                         value="PST 24">
+                        24小时 太平洋标准/夏令时
+                </combo_item>
+                <combo_item
+                         name="UTCTime"
+                         value="UTC">
+                        协调世界时
+                </combo_item>
+        </combo_box>
         <text length="1" name="start_location_textbox" type="string">
                 起始位置:
         </text>
-        <text length="1" name="show_names_textbox" type="string">
-                显示名字:
-        </text>
         <text length="1" name="effects_color_textbox" type="string">
                 我的效果颜色:
         </text>
-        <text length="1" name="seconds_textbox" type="string">
-                ��
+        <text length="1" name="minutes_textbox" type="string">
+                分���
         </text>
         <text length="1" name="crash_report_textbox" type="string">
                 崩溃报告:
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index b2c2863..4a2c365 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="图像" name="Display panel">
+        <text name="Display_textbox">
+                显示模式:
+        </text>
         <button label="?" name="GraphicsPreferencesHelpButton"/>
         <check_box label="在窗口中运行" name="windowed mode"/>
         <text_editor name="FullScreenInfo">
@@ -10,19 +13,28 @@
         </text>
         <combo_box name="windowsize combo">
                 <combo_item name="640x480">
-                        640x480
+                        640 × 480
                 </combo_item>
                 <combo_item name="800x600">
-                        800x600
+                        800 × 600
                 </combo_item>
                 <combo_item name="720x480">
-                        720x480 (NTSC)
+                        720 × 480 (NTSC)
                 </combo_item>
                 <combo_item name="768x576">
-                        768x576 (PAL)
+                        768 × 576 (PAL)
                 </combo_item>
                 <combo_item name="1024x768">
-                        1024x768
+                        1024 × 768
+                </combo_item>
+                <combo_item name="1280x720">
+                        1280 × 720 (HDV720)
+                </combo_item>
+                <combo_item name="1440x1080">
+                        1440 × 1080 (HDV1080)
+                </combo_item>
+                <combo_item     name="1920x1080">
+                        1920 × 1080 (HD1080)
                 </combo_item>
         </combo_box>
         <text name="DisplayResLabel">
@@ -40,20 +52,20 @@
                         5:4 (1280x1024 液晶显示器)
                 </combo_item>
                 <combo_item name="8:5(Widescreen)">
-                        8:5 (宽屏)
+                        8:5 (宽屏幕)
                 </combo_item>
                 <combo_item name="16:9(Widescreen)">
                         16:9 (宽屏幕)
                 </combo_item>
         </combo_box>
         <check_box label="自动检测" name="aspect_auto_detect"/>
-        <text name="HigherText">
-                ���量和
+        <text name="textbox">
+                性���
         </text>
-        <text name="QualityText" width="95">
-                性���:
+        <text name="HigherText2">
+                图���质量
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false" left="115" length="1" mouse_opaque="true" name="FasterText" type="string" v_pad="0" width="80">
+        <text name="FasterText">
                 更快
         </text>
         <text name="ShadersPrefText">
@@ -68,9 +80,6 @@
         <text name="ShadersPrefText4">
                 最高
         </text>
-        <text name="HigherText2">
-                更高
-        </text>
         <text name="QualityText2">
                 质量
         </text>
@@ -87,26 +96,31 @@
         <text name="ReflectionDetailText">
                 反射细节:
         </text>
-        <radio_group name="ReflectionDetailRadio">
-                <radio_item name="0">
+        <combo_box name="ReflectionDetailCombo">
+                <combo_item name="0">
                         地面和树木
-                </radio_item>
-                <radio_item name="1">
+                </combo_item>
+                <combo_item name="1">
                         所有静态物体
-                </radio_item>
-                <radio_item name="2">
+                </combo_item>
+                <combo_item name="2">
                         所有化身和物体
-                </radio_item>
-                <radio_item name="3">
+                </combo_item>
+                <combo_item name="3">
                         一切东西
-                </radio_item>
-        </radio_group>
+                </combo_item>
+        </combo_box>
+
         <text name="AvatarRenderingText" width="128">
                 化身渲染:
         </text>
         <check_box label="化身替身" name="AvatarImpostors" width="256"/>
         <check_box label="硬件 Skinning" name="AvatarVertexProgram" width="256"/>
         <check_box label="化身衣物效果" name="AvatarCloth" width="256"/>
+        <slider name="AvatarMaxVisible" label="非替身最多 (名)：" />
+        <text name="LimitsText">
+                限制:
+        </text>
         <text name="DrawDistanceMeterText1" width="128">
                 m
         </text>
@@ -149,29 +163,30 @@
         <text name="LightingDetailText">
                 光照细节:
         </text>
-        <radio_group name="LightingDetailRadio">
-                <radio_item name="SunMoon">
+        <combo_box name="LightingDetailCombo">
+                <combo_item name="0">
                         仅有日月光效
-                </radio_item>
-                <radio_item name="LocalLights">
+                </combo_item>
+                <combo_item name="1">
                         附近的灯光
-                </radio_item>
-        </radio_group>
+                </combo_item>
+        </combo_box>
         <text name="TerrainDetailText">
                 地面细节:
         </text>
-        <radio_group name="TerrainDetailRadio">
-                <radio_item name="0">
+        <combo_box name="TerrainDetailCombo">
+                <combo_item name="0">
                         低
-                </radio_item>
-                <radio_item name="2">
+                </combo_item>
+                <combo_item name="1">
                         高
-                </radio_item>
-        </radio_group>
+                </combo_item>
+        </combo_box>
+
         <button label="建议设置" name="Defaults"/>
         <button label="硬件选项" label_selected="硬件选项" name="GraphicsHardwareButton"/>
         <string hidden="true" name="resolution_format">
-                [RES_X] x [RES_Y]
+                [RES_X] × [RES_Y]
         </string>
         <string hidden="true" name="aspect_ratio_text">
                 [NUM]:[DEN]
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
index 8fd8054..45d6e78 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="即时消息" name="im">
+<panel label="聊天记录和隐私" name="im">
+        <text name="Logging:">
+                聊天记录:
+        </text>
         <text type="string" length="1" name="text_box">
                 我的在线状态: 
         </text>
@@ -11,8 +14,6 @@
         <text name="log_in_to_change">
                 登陆后更改
         </text>
-        <check_box label="发送即时消息至电子邮件([EMAIL])" name="send_im_to_email" />
-        <check_box label="本地聊天中包含即时通信息" name="include_im_in_chat_console" />
         <check_box label="在即时消息中显示时间" name="show_timestamps_check" />
     <check_box
                  label="显示好友上线通知"
@@ -20,11 +21,21 @@
         <check_box label="保存即时通信记录到我的电脑上" name="log_instant_messages" />
         <check_box label="保存对话记录到我的电脑上" name="log_chat" />
         <check_box label="显示上次即时通信的结尾" name="log_show_history" />
-        <button label="更改路径" label_selected="更改路径" name="log_path_button" />
+        <text name="Log location:">
+        记录位置:
+        </text>
+        <button label="更改位置" name="log_path_button" />
+        <text name="Privacy:">
+                隐私:
+        </text>
         <text
                  name="text_box3">
                 忙碌模式的自动回复:
         </text>
+        <button
+                 label="即时消息自动回复选项"
+                 name="busy_adv_btn"
+                 tool_tip="即时消息自动回复选项" />
         <text
                  name="text_box4">
                 聊天记录选项:
@@ -48,5 +59,4 @@
                  label="显示时间时包括日期"
                  name="log_date_timestamp" />
 
-
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
index 19d060f..74e38b2 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="输入和摄像头" name="Input panel">
+<panel label="输入和摄像机" name="Input panel">
         <text length="1" name=" Mouselook Options:" type="string">
                 第一人称视角选项设置:
         </text>
@@ -11,7 +11,7 @@
                 自动飞翔选项:
         </text>
         <check_box label="起飞/着陆通过键盘上/下键控制" name="automatic_fly"/>
-        <text length="1" name=" Camera Options:" type="string">
+        <text length="1" name="Camera Options:" type="string">
                 摄像机选项:
         </text>
         <text name="camera_fov_label">
@@ -20,11 +20,52 @@
         <text name="Camera Follow Distance:">
                 摄像机跟随距离:
         </text>
-        <check_box label="编辑物体时使用自动视角" name="edit_camera_movement" tool_tip="当进入和离开编辑模式时，自动移动摄像头"/>
-        <check_box label="编辑外观时使用自动视角" name="appearance_camera_movement" tool_tip="在编辑外观时，摄像头自动定位"/>
+        <text
+                 name="Camera Transition Time:">
+                摄像机过渡时间:
+        </text>
+        <text
+                 name="Camera Smoothing:">
+                摄像机平滑:
+        </text>
+        <check_box label="编辑物体时使用自动视角" name="edit_camera_movement" tool_tip="当进入和离开编辑模式时，自动移动摄像机"/>
+        <check_box label="编辑外观时使用自动视角" name="appearance_camera_movement" tool_tip="在编辑外观时，摄像机自动定位"/>
+        <check_box
+                 label="禁用摄像机限制"
+                 name="Disable camera constraints"
+                 tool_tip="禁用摄像机限制，例如距离限制和地面限制" />
+        <check_box
+                 label="禁用最小放大距离"
+                 name="disable_min_zoom_check"
+                 tool_tip="聚焦元件或化身并拉近视角时，禁用最小距离" />
         <text name="text2">
                 化身显示选项:
         </text>
         <check_box label="第一人称视角中，显示自己的化身" name="first_person_avatar_visible"/>
         <button label="游戏杆设置" name="joystick_setup_button"/>
+        
+        <text name="double_click_action_label">
+                双击动作:
+        </text>
+        <combo_box
+                 name="double_click_action">
+                <combo_item     name="None">
+                        无
+                </combo_item>
+                <combo_item name="Go">
+                        <!--前往-->自动寻路
+                </combo_item>
+        </combo_box>
+
+        <text name="go_action_label">
+                自动寻路方式:
+        </text>
+        <combo_box name="go_action">
+                <combo_item     name="Move">
+                        移动
+                </combo_item>
+                <combo_item name="Teleport">
+                        瞬间移动
+                </combo_item>
+        </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
index ccaf9a6..14184cd 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
@@ -1,23 +1,252 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="网络" name="network">
+        <tab_container
+                 name="networktab2"
+                 tab_min_width="50">
+
+        <panel
+                         label="性能"
+                         name="bandwidth_panel">
         <text name="text_box">
                 最大带宽:
         </text>
+        <text name="Speed:">
+        </text>
         <text name="text_box2">
-                kbps (每秒kb数)
+                kbps (千位每秒)
+        </text>
+        <text name="Texture Fetching:">
+                材质下载:
         </text>
+        <check_box
+                                 label="使用 HTTP 获取材质 (实验性)"
+                                 name="http_texture_check" />
+        <check_box
+                                 label="通过逐渐增加描绘距离加速载入"
+                                 name="speed_rez_check" />
+                <spinner
+                                 tool_tip="描绘距离增加之间的将各"
+                                 label="步进间隔:"
+                                 name="speed_rez_interval_spinner" />
+                <text
+                                 name="speed_rez_seconds_text">
+                秒
+                </text>
+                <text
+                                 name="Disk Cache:">
+                磁盘高速缓存:
+                </text>
         <text name="cache_size_label_l">
-                磁盘高速缓������小:
+                大小:
         </text>
         <text name="text_box5">
                 兆字节
         </text>
-        <button label="清除缓存" name="clear_cache"/>
+        <button label="清除缓存" name="clear_disk_cache"/>
         <text name="cache_location_label">
                 磁盘缓存位置:
         </text>
-        <button label="设置" label_selected="设置" name="set_cache"/>
-        <button label="重置" label_selected="设置" name="reset_cache"/>
-        <check_box label="自定义连接端口" name="connection_port_enabled"/>
+        <button label="设置" label_selected="设置" name="set_disk_cache"/>
+        <button label="重置" label_selected="设置" name="reset_disk_cache"/>
+        </panel>
+
+
+        <!-- PROXY SETTINGS PANEL -->
+
+
+        <panel
+                         label="代理服务器设置"
+                         name="proxies">
+        <check_box
+                 label="启用 XMLRPC 代理服务器 (登入、土地、以及购买货币)"
+                 name="xmlrpc_proxy_enabled" />
+        <text
+                 name="xmlrpc_proxy_text_label">
+                地址:
+        </text>
+        <line_editor
+                 name="xmlrpc_proxy_editor"
+                 tool_tip="希望使用的代理服务器名称或 IP 地址" />
+        <spinner
+                 label="端口号:"
+                 name="xmlrpc_proxy_port" />
+
+        <!-- SOCKS 5 PROXY -->
+
+        <check_box
+                 label="启用 SOCKS 5 代理服务器"
+                 name="socks5_proxy_enabled" />
+        <text
+                 name="socks5_host_label">
+                SOCKS 5 主机:
+        </text>
+        <line_editor
+                 name="socks5_proxy_host"
+                 tool_tip="希望使用的 SOCKS 5 代理服务器名称或 IP 地址e" />
+        <spinner
+                 label="端口号:"
+                 name="socks5_proxy_port" />
+        <text
+                 name="socks5_auth_label">
+                SOCKS 5 身份验证:
+        </text>
+        <radio_group
+                 name="socks5_auth">
+                <radio_item
+                         name="None"
+                         tool_tip="不使用身份验证">
+                        无
+                </radio_item>
+                <radio_item
+                         name="UserPass"
+                         tool_tip="用户名 / 密码身份验证">
+                        用户名 / 密码
+                </radio_item>
+        </radio_group>
+        <text
+                 name="socks5_username_label">
+                用户名:
+        </text>
+        <line_editor
+                 name="socks5_proxy_username"
+                 tool_tip="Socks 5代理服务器的用户名" />
+
+        <text
+                 name="socks5_password_label">
+                密码:
+        </text>
+        <line_editor
+                 name="socks5_proxy_password"
+                 tool_tip="Socks 5代理服务器的密码" />
+
+        <text
+                 name="http_proxy_label">
+                HTTP 代理服务器:
+        </text>
+        <radio_group
+                 name="socks5_http_proxy_type">
+                <radio_item
+                         name="None"
+                         tool_tip="不使用代理服务器">
+                        不使用
+                </radio_item>
+                <radio_item
+                         name="Socks"
+                         tool_tip="HTTP 连接使用 Socks 5 代理服务器">
+                        SOCKS 5
+                </radio_item>
+                <radio_item
+                         name="Web"
+                         tool_tip="HTTP 连接使用 Web 代理服务器">
+                        Web
+                </radio_item>
+        </radio_group>
+        <text name="port_label">
+                传出连接:
+        </text>
+        <check_box label="自定义传出连接端口" name="connection_port_enabled"
+                tool_tip="对传出连接使用自定义端口"/>
         <spinner label="端口号:" name="connection_port"/>
+        </panel>
+
+
+        <!-- WEB BROWSER PANEL -->
+
+
+        <panel
+                         label="Web 浏览器"
+                         name="web_browser">
+        <text name="internal_browser_label">
+                内建浏览器:
+        </text>
+        <button
+                 label="清除内部浏览器缓存"
+                 name="clear_web_cache" />
+        <text type="string" name="cookie_label" >
+                Cookie:
+        </text>
+        <check_box label="从网站接受 cookie"
+                         name="cookies_enabled" />
+        <button
+                 label="清除 Cookie"
+                 name="clear_ookies" />
+        <text name="proxy_label">
+                代理服务器:
+        </text>
+        <check_box
+                 label="启用网页代理服务器"
+                 name="web_proxy_enabled" />
+        <text name="proxy_text_label">
+                地址:
+        </text>
+        <line_editor
+                 name="web_proxy_editor"
+                 tool_tip="你想使用的代理服务器的名称或者 IP 地址" />
+        <spinner
+                         label="端口号:"
+                         name="web_proxy_port" />
+        <text name="open_links_label">
+                 打开链接:
+        </text>
+        <radio_group name="use_external_browser">
+                 <radio_item
+                         name="external"
+                         tool_tip="使用系统默认网络浏览器打开帮助、网页链接, 等等。\n若全屏显示则不推荐使用。">
+                        使用外部浏览器(Firefox, Safari, Internet Explorer)
+                </radio_item>
+                <radio_item
+                         name="internal"
+                         tool_tip="使用内部浏览器打开帮助、网页链接, 等等。这个浏览器会在 Imprudence 中打开一个新窗口。">
+                        使用内建浏览器
+                </radio_item>
+        </radio_group>
+        <text>
+                浏览器主页:
+        </text>
+        <line_editor name="home_page" tool_tip="首次打开第二人生浏览器时的浏览页面" />
+        <text>
+                代理服务器配置:
+        </text>
+        <check_box label="内部浏览器使用代理服务器" name="proxy_enabled"
+                 tool_tip="请为因特网网络浏览器指定代理服务器配置。" />
+        <text>
+                代理服务器:
+        </text>
+        <line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
+        <text>
+                端口：
+        </text>
+        <line_editor name="proxy_port" />
+        <text>
+                对以下内容不使用代理:
+        </text>
+        <line_editor name="proxy_exclusions"
+                 tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
+        <check_box label="在元件上显示网页 (实验性功能, 需要重启)"
+                 name="web_pages_on_prims_check" />
+        <text>
+                安全地址：
+（登陆察看）
+        </text>
+        <button label="添加" name="add_trusted" />
+        <line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
+        <button label="移除" name="rem_trusted" />
+        <text name="search_url_label">
+                全部 (Web) 搜索标签 URL:
+        </text>
+        <line_editor
+                 name="world_search_editor"
+                 tool_tip="您想使用的世界搜索引擎" />
+        <button
+                 label="重置"
+                 tool_tip="重置为默认值"
+                 name="world_search_reset_default" />
+        <button
+                 label="清除"
+                 tool_tip="清除字段"
+                 name="world_search_clear" />
+        </panel>
+        </tab_container>
+
+</panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
index eeeaf87..48a3e4c 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
@@ -4,15 +4,15 @@
          name="popups"
          title="弹出窗口">
         <text name="dont_show_label">
-                不显示这些弹出窗���:
+                不显示这些���示:
         </text>
         <scroll_list
                  name="disabled_popups" />
         <button
-                 label="启用该弹出窗���"
+                 label="启用该���示"
                  name="enable_popup" />
         <text name="show_label">
-                显示这些弹出窗���:
+                显示这些���示:
         </text>
         <scroll_list
                  name="enabled_popups" />
@@ -26,14 +26,33 @@
         <check_box
                  label="接受后自动打开"
                  name="show_new_inventory" />
-        <check_box label="在库存中自动显示新接收的物��" 
+        <check_box label="在库存中自动显示新接收的物���" 
              name="show_in_inventory" />
         <button  width="225"
-                 label="显示所有的“下���不再显示”对话框..."
+                 label="显示所有的���示"
                  name="reset_dialogs_btn"
                  tool_tip="启用所有可选的弹出窗口及“首次使用”提示。" />
         <button  width="225"
-                 label="隐藏所有的“下���不再显示”对话框..."
+                 label="隐藏所有的���示"
                  name="skip_dialogs_btn"
                  tool_tip="禁用所有可选的弹出窗口及“首次使用”提示。" />
+  <text  name="radar_text">
+    聊天通知:
+  </text>
+  <text
+                 name="When an avatar enters:">
+    当其他化身:
+  </text>
+        <check_box
+                 label="进入聊天范围时"
+                 name="mini_map_notify_chat" />
+        <check_box
+                 label="进入区域时"
+                 name="mini_map_notify_sim" />
+    <check_box
+                 label="显示好友上线通知"
+                 name="friends_online_notify_checkbox" />
+<check_box
+                 label="收到或付出 [CURRENCY] 时提示"
+                 name="notify_money_change_checkbox" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
index 70e0bc2..69b214c 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="皮肤" name="Skins panel">
         <text name="muting_text">
-                选择皮肤 (需要重启动)：
+                选择皮肤：
         </text>
-  <radio_group  name="skin_selection">
-    <radio_item name="default">默认</radio_item>
-    <radio_item name="silver">Silver</radio_item>
-  </radio_group>
+        <text
+                 name="requires_restart_text">
+                (需要重启动; 信息与作者资料请参见皮肤文件夹)
+        </text>
+        <radio_group  name="skin_selection">
+                <radio_item name="default">默认</radio_item>
+        </radio_group>
+        <text
+                 name="skin_current_text">
+        其他皮肤:
+        </text>
+        <button
+                name="save_skin"
+                label="保存" />
 </panel>
 
 
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
index a41be19..9691aa6 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" height="408" hidden="false" label="语音聊天" left="102" mouse_opaque="true" name="chat" width="517">
+<panel label="语音聊天" name="voice_chat">
         <text_editor name="voice_unavailable">
                 语音聊天不可用。
         </text_editor>
@@ -13,14 +13,14 @@
                 </radio_item>
         </radio_group>
         <text name="push_to_talk_heading">
-                即按即��
+                按键通��
         </text>
         <text_editor name="voice_chat_description" width="465">
-                即按即说允许你控制什么时候传送声音。在切换模式中，按下并释放即按即说键来切换麦克风开关。不在切换模式的时候，麦克风仅在即按即说键按下时才有效。
+                按键通话允许你控制什么时候传送声音。在切换模式中，按下并释放即按即说键来切换麦克风开关。不在切换模式的时候，麦克风仅在即按即说键按下时才有效。
         </text_editor>
-        <check_box label="以切换模式使用即按即��" name="push_to_talk_toggle_check"/>
+        <check_box label="以切换模式使用按键通��" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label" type="string">
-                即按即��切换键:
+                按键通��切换键:
         </text>
         <line_editor name="modifier_combo"/>
         <button label="设置按键" name="set_voice_hotkey_button"/>
@@ -34,4 +34,5 @@
         <text_editor bottom_delta="-45" height="48" name="device_settings_text">
                 *注意*: 运行设备选项或语音设置向导将临时将您从语音聊天断开，并且所作的更改将立即生效。
         </text_editor>
+        <button label="重新连接到语音聊天" name="reset_voice" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
index e965534..ca07b20 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
@@ -2,20 +2,17 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
      name="web" width="517">
-        <text name="cache_size_label_l">
-                浏览器缓存:
-        </text>
         <button 
-             label="现在清除"
+             label="清除内部浏览器缓存"
              name="clear_cache" />
         <text type="string" name="cookie_label" >
                 Cookie:
         </text>
         <check_box label="从网站接受 cookie"
-             name="cookies_enabled" /> 
-        <button 
-             label="现在清除" 
-             name="clear_cookies" />
+             name="cookies_enabled" />
+        <button
+             label="清除 Cookie"
+             name="clear_ookies" />
         <text name="proxy_label">
                 代理服务器:
         </text>
@@ -39,7 +36,7 @@
                 </radio_item>
                 <radio_item
                          name="internal"
-                         tool_tip="使用内部浏览器打开帮助、网页链接, 等等。这个浏览器会在第二人生中打开一个新窗口。">
+                         tool_tip="使用内部浏览器打开帮助、网页链接, 等等。这个浏览器会在 Imprudence 中打开一个新窗口。">
                         使用内建浏览器
                 </radio_item>
         </radio_group>
@@ -85,4 +82,19 @@
         <button label="添加" name="add_trusted" />
         <line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
         <button label="移除" name="rem_trusted" />
+        <text name="cache_size_label_l">
+                全部 (Web) 搜索标签 URL:
+        </text>
+        <line_editor
+                 name="world_search_editor"
+                 tool_tip="您想使用的世界搜索引擎" />
+        <button
+                 label="重置"
+                 tool_tip="重置为默认值"
+                 name="world_search_reset_default" />
+        <button
+                 label="清除"
+                 tool_tip="清除字段"
+                 name="world_search_clear" />
+        
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_radar.xml b/linden/indra/newview/skins/default/xui/zh/panel_radar.xml
new file mode 100644
index 0000000..db4fc89
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_radar.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Note: panel rect (size) is specified in floater_mini_map.xml --><panel
+         name="RadarPanel"
+         label="Radar">
+        <string name="no_one_near">
+                范围内无化身
+        </string>
+        <string name="is_muted">
+                (已屏蔽)
+        </string>
+        <string name="is_typing">
+                (打字中)
+        </string>
+        <string name="entering_chat_range">
+                [NAME] 进入了聊天范围 ([DISTANCE]m)
+        </string>
+        <string name="entering_sim_range">
+                [NAME] 进入了当前区域 ([DISTANCE]m)
+        </string>
+        <string name="avatars_in_singular">
+                [COUNT] 名化身于
+        </string>
+        <string name="avatars_in_plural">
+                [COUNT] 名化身于
+        </string>
+        <string name="unknown_avatar">
+                (未知)
+        </string>
+        <text name="avatar_count" left="5">
+                0 名化身于
+        </text>
+        <text name="meters" left_delta="100">
+                m内
+        </text>
+        <tab_container name="radar_tab_container">
+                <panel
+                         name="avatar_tab"
+                         label="化身">
+                        <button
+                                 name="im_btn"
+                                 label="聊天/呼叫"
+                                 tool_tip="打开即时通信会话" />
+                        <button
+                                 name="profile_btn"
+                                 label="档案"
+                                 tool_tip="显示图片、社团和其他信息" />
+                        <button
+                                 name="offer_teleport_btn"
+                                 label="邀请瞬移"
+                                 tool_tip="邀请此人瞬间移动到你的位置" />
+                        <button
+                                 name="teleport_btn"
+                                 label="瞬移到..."
+                                 tool_tip="瞬间移动到他人的位置" />
+                        <button
+                                 name="track_btn"
+                                 label="追踪"
+                                 tool_tip="创建信标追踪可以在地图上显示的好友" />
+                        <button
+                                 name="invite_btn"
+                                 label="邀请..."
+                                 tool_tip="邀请加入社团" />
+                        <button
+                                 name="add_btn"
+                                 label="添加..."
+                                 tool_tip="邀请其他居民成为你的好友" />
+                </panel>
+                <panel
+                         name="estate_tab"
+                         label="地产">
+                        <button
+                                 name="cam_btn"
+                                 label="聚焦..." />
+                        <button
+                                 name="freeze_btn"
+                                 label="冻结..." />
+                        <button
+                                 name="eject_btn"
+                                 label="驱逐..." />
+                        <button
+                                 name="ban_btn"
+                                 label="封禁..." />
+                        <button
+                                 name="mute_btn"
+                                 label="屏蔽..." />
+                        <button
+                                 name="unmute_btn"
+                                 label="解除屏蔽..." />
+                        <button
+                                 name="ar_btn"
+                                 label="报告..." />
+                </panel>
+        </tab_container>
+
+        <scroll_list name="RadarList">
+                <column
+                         name="avatar_name"
+                         label="名称" />
+                <column
+                         name="avatar_distance"
+                         label="距离" />
+        </scroll_list>
+</panel>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
index 186d27e..146c1f9 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -36,6 +36,7 @@
         <button label="?" name="agent_limit_help"/>
         <spinner label="额外物体因数" name="object_bonus_spin"/>
         <button label="?" name="object_bonus_help"/>
+    <spinner label="最小账户年龄" name="minimum_agent_age"/>
         <text label="成人内容" name="access_text">
                 分级：
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_open_region_settings.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_open_region_settings.xml
new file mode 100644
index 0000000..0c63782
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_open_region_settings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="区域设置"
+         name="RegionSettings">
+        <spinner
+                 label="默认描绘距离"
+                 name="draw_distance" />
+  <check_box
+                 label="强制描绘距离"
+                 name="force_draw_distance" />
+  <spinner
+                 label="最大拖动距离"
+                 name="max_drag_distance" />
+  <spinner
+                 label="最大元件尺寸"
+                 name="max_prim_scale" />
+  <spinner
+                 label="最小元件尺寸"
+                 name="min_prim_scale" />
+  <spinner
+                 label="最大物理元件尺寸"
+                 name="max_phys_prim_scale" />
+  <spinner
+                 label="最大窟窿尺寸"
+                 name="max_hollow_size" />
+  <spinner
+                 label="最小窟窿尺寸"
+                 name="min_hole_size" />
+  <spinner
+                 label="最大链接数"
+                 name="max_link_count" />
+  <spinner
+                 label="最大物理链接数"
+                 name="max_link_count_phys" />
+  <spinner
+                 label="最大库存物品转让数"
+                 name="max_inventory_items_transfer" />
+  <spinner
+                 label="显示标签"
+                 name="show_tags" />
+  <spinner
+                 label="最大社团数"
+                 name="max_groups" />
+  <check_box
+                 label="渲染水面"
+                 name="render_water" />
+        <check_box
+                 label="允许迷你地图"
+                 name="allow_minimap" />
+        <check_box
+                 label="允许物理元件"
+                 name="allow_physical_prims" />
+        <check_box
+                 label="启用未成年模式"
+                 name="enable_teen_mode" />
+  <check_box
+                 label="启用建造尺寸限制"
+                 name="enforce_max_build" />
+        <check_box
+                 label="允许地块 WindLight 设置"
+                 name="allow_parcel_windlight" />
+  <button
+                 label="应用"
+                 name="apply_ors_btn" />
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
index 0dce0f2..7e39b42 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="active_speakers_panel">
         <string name="moderator_label">
-                (管理员)
+                (主持人)
         </string>
         <layout_stack name="panels">
                 <layout_panel name="moderation_mode_panel">
                         <combo_box name="moderation_mode">
                                 <combo_item name="OpenVoice">
-                                        声音 缺省 开
+                                        语音默认开放
                                 </combo_item>
                                 <combo_item name="ModeratedVoice">
-                                        声音 缺省 关
+                                        语音默认关闭
                                 </combo_item>
                         </combo_box>
                 </layout_panel>
@@ -34,7 +34,7 @@
                                 允许语音聊天
                         </check_box>
                         <check_box name="moderator_allow_text">
-                                允许文本聊天
+                                允许文字聊天
                         </check_box>
                 </layout_panel>
         </layout_stack>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 0f65852..d79feb0 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -21,8 +21,8 @@
         <button label="" label_selected="" name="restrictpush" tool_tip="不允许推动"/>
         <button label="" label_selected="" name="status_no_voice" tool_tip="此处语音不可用"/>
         <button label="" label_selected="" name="buyland" tool_tip="购买这块土地"/>
-        <line_editor label="搜索" name="search_editor" tool_tip="搜索 Second Life"/>
-        <button label="" label_selected="" name="search_btn" tool_tip="搜索 Second Life"/>
+        <line_editor label="搜索" name="search_editor" tool_tip="搜索世界"/>
+        <button label="" label_selected="" name="search_btn" tool_tip="搜索世界"/>
         <string name="packet_loss_tooltip">
                 封包丢失率
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
index e9c381d..154d6f5 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
@@ -4,7 +4,7 @@
                 恢复停靠窗口
         </string>
         <layout_stack name="toolbar_stack">
-                <button label="即时通" name="im_btn" tool_tip="用即时通联系你的朋友。" />
+                <button label="即时消息" name="im_btn" tool_tip="用即时消息联系你的朋友。" />
                 <button label="" name="chat_btn" tool_tip="显示聊天栏。(回车键)" />
                 <flyout_button label="交流" name="communicate_btn"
                      tool_tip="查找并与你的好友和社团交流。" />
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
index 6f98195..c082004 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
@@ -11,7 +11,7 @@
                         从化身的位置听语音聊天。
                 </radio_item>
         </radio_group>
-        <check_box label="仅好友可向我发起语������求" name="friends_only_check"/>
+        <check_box label="仅好友可向我发起语音呼叫请求" name="friends_only_check"/>
         <check_box label="以切换模式使用即按即说" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label" word_wrap="true">
                 即按即说切换键:
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_windlight_controls.xml
new file mode 100644
index 0000000..3ecb259
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_windlight_controls.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="windlight_controls">
+  <button
+                 label="编辑器"
+                 name="Environment"
+                 tool_tip="点击这里调节世界环境" />
+  <flyout_button
+                 label="天空"
+                 name="Presets"
+                 tool_tip="Windlight 预设">
+  </flyout_button>
+  <button
+                 toggle="true"
+                 label=""
+                 name="Popup"
+                 tool_tip="点击这里调节描绘距离" />
+</panel>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/strings.xml b/linden/indra/newview/skins/default/xui/zh/strings.xml
index 3eb0014..5b541cd 100644
--- a/linden/indra/newview/skins/default/xui/zh/strings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings.xml
@@ -6,12 +6,29 @@
 <strings>
 
         <!-- Imprudence-specific strings -->
+  <string name="landmark_created">你创建了一个地标位于</string>
+  <string name="new_home_page">你的新主页是</string>
+  <string name="server_version_changed_chat">你进入的区域正在运行不同的模拟器版本:[SERVER_VERSION_INFO]</string>
+  <string name="hippo_label_free">free</string>
+  <string name="hippo_label_week">周</string>
         <string name="StatBarDaysOfWeek">
                 星期日:星期一:星期二:星期三:星期四:星期五:星期六
         </string>
         <string name="StatBarMonthsOfYear">
                 一月:二月:三月:四月:五月:六月:七月:八月:九月:十月:十一月:十二月
         </string>
+  <string name="TitleBarMultiple">
+    [FIRST_NAME] [LAST_NAME] 于 [GRID_NAME]
+  </string>
+  <string name="copy_obj_key_info">
+    复制了键为了:
+  </string>
+  <string name="TeleportOfferMaturity">
+    [NAME] 邀请你瞬间移动到 [DESTINATION]
+  </string>
+  <string name="TeleportLureMaturity">
+    [NAME] 邀请你瞬间移动到 [DESTINATION]
+  </string>
         
         <string name="LoginInProgress">
                 正在登录。 [APP_NAME] 可能会看上去没有反应。 请稍候。
@@ -110,7 +127,7 @@
                 可任意复制
         </string>
         <string name="TooltipForSaleL$">
-                待售: L$[AMOUNT]
+                待售: [CURRENCY][AMOUNT]
         </string>
         <string name="TooltipForSaleMsg">
                 待售: [MESSAGE]
@@ -281,7 +298,7 @@
                 摇手指
         </string>
         <string name="anim_fist_pump">
-                Fist Pump
+                冲拳
         </string>
         <string name="anim_yoga_float">
                 浮空瑜伽
@@ -350,10 +367,10 @@
                 RPS 剪刀
         </string>
         <string name="anim_express_repulsed">
-                Repulsed
+                排斥
         </string>
         <string name="anim_kick_roundhouse_r">
-                Roundhouse Kick
+                扫堂腿
         </string>
         <string name="anim_express_sad">
                 伤心