merge

289 files changed, 4419 insertions, 1119 deletions

diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index fa92a3a75b..cfafbf0470 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
 
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 7;
-const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_PATCH = 4;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Developer";
diff --git a/indra/llmessage/tests/commtest.h b/indra/llmessage/tests/commtest.h
index 0fef596df2..0d149b5258 100644
--- a/indra/llmessage/tests/commtest.h
+++ b/indra/llmessage/tests/commtest.h
@@ -34,6 +34,7 @@
 #include "llsd.h"
 #include "llhost.h"
 #include "stringize.h"
+#include <map>
 #include <string>
 #include <stdexcept>
 #include <boost/lexical_cast.hpp>
@@ -43,6 +44,58 @@ struct CommtestError: public std::runtime_error
     CommtestError(const std::string& what): std::runtime_error(what) {}
 };
 
+static bool query_verbose()
+{
+    const char* cbose = getenv("INTEGRATION_TEST_VERBOSE");
+    if (! cbose)
+    {
+        cbose = "1";
+    }
+    std::string strbose(cbose);
+    return (! (strbose == "0" || strbose == "off" ||
+               strbose == "false" || strbose == "quiet"));
+}
+
+bool verbose()
+{
+    // This should only be initialized once.
+    static bool vflag = query_verbose();
+    return vflag;
+}
+
+static int query_port(const std::string& var)
+{
+    const char* cport = getenv(var.c_str());
+    if (! cport)
+    {
+        throw CommtestError(STRINGIZE("missing environment variable" << var));
+    }
+    // This will throw, too, if the value of PORT isn't numeric.
+    int port(boost::lexical_cast<int>(cport));
+    if (verbose())
+    {
+        std::cout << "getport('" << var << "') = " << port << std::endl;
+    }
+    return port;
+}
+
+static int getport(const std::string& var)
+{
+    typedef std::map<std::string, int> portsmap;
+    static portsmap ports;
+    // We can do this with a single map lookup with map::insert(). Either it
+    // returns an existing entry and 'false' (not newly inserted), or it
+    // inserts the specified value and 'true'.
+    std::pair<portsmap::iterator, bool> inserted(ports.insert(portsmap::value_type(var, 0)));
+    if (inserted.second)
+    {
+        // We haven't yet seen this var. Remember its value.
+        inserted.first->second = query_port(var);
+    }
+    // Return the (existing or new) iterator's value.
+    return inserted.first->second;
+}
+
 /**
  * This struct is shared by a couple of standalone comm tests (ADD_COMM_BUILD_TEST).
  */
@@ -71,13 +124,10 @@ struct commtest_data
 
     static int getport(const std::string& var)
     {
-        const char* port = getenv(var.c_str());
-        if (! port)
-        {
-            throw CommtestError("missing $PORT environment variable");
-        }
-        // This will throw, too, if the value of PORT isn't numeric.
-        return boost::lexical_cast<int>(port);
+        // We have a couple consumers of commtest_data::getport(). But we've
+        // since moved it out to the global namespace. So this is just a
+        // facade.
+        return ::getport(var);
     }
 
     bool outcome(const LLSD& _result, bool _success)
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py
index cea5032111..9886d49ccc 100644
--- a/indra/llmessage/tests/test_llsdmessage_peer.py
+++ b/indra/llmessage/tests/test_llsdmessage_peer.py
@@ -38,7 +38,7 @@ mydir = os.path.dirname(__file__)       # expected to be .../indra/llmessage/tes
 sys.path.insert(0, os.path.join(mydir, os.pardir, os.pardir, "lib", "python"))
 from indra.util.fastest_elementtree import parse as xml_parse
 from indra.base import llsd
-from testrunner import freeport, run, debug
+from testrunner import freeport, run, debug, VERBOSE
 
 class TestHTTPRequestHandler(BaseHTTPRequestHandler):
     """This subclass of BaseHTTPRequestHandler is to receive and echo
@@ -72,10 +72,10 @@ class TestHTTPRequestHandler(BaseHTTPRequestHandler):
 ##         # assuming that the underlying XML parser reads its input file
 ##         # incrementally. Unfortunately I haven't been able to make it work.
 ##         tree = xml_parse(self.rfile)
-##         debug("Finished raw parse\n")
-##         debug("parsed XML tree %s\n" % tree)
-##         debug("parsed root node %s\n" % tree.getroot())
-##         debug("root node tag %s\n" % tree.getroot().tag)
+##         debug("Finished raw parse")
+##         debug("parsed XML tree %s", tree)
+##         debug("parsed root node %s", tree.getroot())
+##         debug("root node tag %s", tree.getroot().tag)
 ##         return llsd.to_python(tree.getroot())
 
     def do_GET(self):
@@ -88,8 +88,10 @@ class TestHTTPRequestHandler(BaseHTTPRequestHandler):
         self.answer(self.read_xml())
 
     def answer(self, data):
+        debug("%s.answer(%s): self.path = %r", self.__class__.__name__, data, self.path)
         if "fail" not in self.path:
             response = llsd.format_xml(data.get("reply", llsd.LLSD("success")))
+            debug("success: %s", response)
             self.send_response(200)
             self.send_header("Content-type", "application/llsd+xml")
             self.send_header("Content-Length", str(len(response)))
@@ -106,16 +108,21 @@ class TestHTTPRequestHandler(BaseHTTPRequestHandler):
                                                   ("fail requested",
                                                    "Your request specified failure status %s "
                                                    "without providing a reason" % status))[1])
+            debug("fail requested: %s: %r", status, reason)
             self.send_error(status, reason)
 
-    def log_request(self, code, size=None):
-        # For present purposes, we don't want the request splattered onto
-        # stderr, as it would upset devs watching the test run
-        pass
+    if not VERBOSE:
+        # When VERBOSE is set, skip both these overrides because they exist to
+        # suppress output.
 
-    def log_error(self, format, *args):
-        # Suppress error output as well
-        pass
+        def log_request(self, code, size=None):
+            # For present purposes, we don't want the request splattered onto
+            # stderr, as it would upset devs watching the test run
+            pass
+
+        def log_error(self, format, *args):
+            # Suppress error output as well
+            pass
 
 if __name__ == "__main__":
     # Instantiate an HTTPServer(TestHTTPRequestHandler) on the first free port
@@ -130,4 +137,5 @@ if __name__ == "__main__":
     # command-line parsing -- and anyway, for C++ integration tests, that's
     # performed in TUT code rather than our own.
     os.environ["PORT"] = str(port)
+    debug("$PORT = %s", port)
     sys.exit(run(server=Thread(name="httpd", target=httpd.serve_forever), *sys.argv[1:]))
diff --git a/indra/llmessage/tests/testrunner.py b/indra/llmessage/tests/testrunner.py
index 8ff13e0426..f329ec2a0e 100644
--- a/indra/llmessage/tests/testrunner.py
+++ b/indra/llmessage/tests/testrunner.py
@@ -29,14 +29,21 @@ $/LicenseInfo$
 
 import os
 import sys
+import re
 import errno
 import socket
 
-def debug(*args):
-    sys.stdout.writelines(args)
-    sys.stdout.flush()
-# comment out the line below to enable debug output
-debug = lambda *args: None
+VERBOSE = os.environ.get("INTEGRATION_TEST_VERBOSE", "1") # default to verbose
+# Support usage such as INTEGRATION_TEST_VERBOSE=off -- distressing to user if
+# that construct actually turns on verbosity...
+VERBOSE = not re.match(r"(0|off|false|quiet)$", VERBOSE, re.IGNORECASE)
+
+if VERBOSE:
+    def debug(fmt, *args):
+        print fmt % args
+        sys.stdout.flush()
+else:
+    debug = lambda *args: None
 
 def freeport(portlist, expr):
     """
@@ -78,44 +85,53 @@ def freeport(portlist, expr):
     # pass 'port' to client code
     # call server.serve_forever()
     """
-    # If portlist is completely empty, let StopIteration propagate: that's an
-    # error because we can't return meaningful values. We have no 'port',
-    # therefore no 'expr(port)'.
-    portiter = iter(portlist)
-    port = portiter.next()
-
-    while True:
-        try:
-            # If this value of port works, return as promised.
-            return expr(port), port
-
-        except socket.error, err:
-            # Anything other than 'Address already in use', propagate
-            if err.args[0] != errno.EADDRINUSE:
-                raise
-
-            # Here we want the next port from portiter. But on StopIteration,
-            # we want to raise the original exception rather than
-            # StopIteration. So save the original exc_info().
-            type, value, tb = sys.exc_info()
+    try:
+        # If portlist is completely empty, let StopIteration propagate: that's an
+        # error because we can't return meaningful values. We have no 'port',
+        # therefore no 'expr(port)'.
+        portiter = iter(portlist)
+        port = portiter.next()
+
+        while True:
             try:
+                # If this value of port works, return as promised.
+                value = expr(port)
+
+            except socket.error, err:
+                # Anything other than 'Address already in use', propagate
+                if err.args[0] != errno.EADDRINUSE:
+                    raise
+
+                # Here we want the next port from portiter. But on StopIteration,
+                # we want to raise the original exception rather than
+                # StopIteration. So save the original exc_info().
+                type, value, tb = sys.exc_info()
                 try:
-                    port = portiter.next()
-                except StopIteration:
-                    raise type, value, tb
-            finally:
-                # Clean up local traceback, see docs for sys.exc_info()
-                del tb
-
-        # Recap of the control flow above:
-        # If expr(port) doesn't raise, return as promised.
-        # If expr(port) raises anything but EADDRINUSE, propagate that
-        # exception.
-        # If portiter.next() raises StopIteration -- that is, if the port
-        # value we just passed to expr(port) was the last available -- reraise
-        # the EADDRINUSE exception.
-        # If we've actually arrived at this point, portiter.next() delivered a
-        # new port value. Loop back to pass that to expr(port).
+                    try:
+                        port = portiter.next()
+                    except StopIteration:
+                        raise type, value, tb
+                finally:
+                    # Clean up local traceback, see docs for sys.exc_info()
+                    del tb
+
+            else:
+                debug("freeport() returning %s on port %s", value, port)
+                return value, port
+
+            # Recap of the control flow above:
+            # If expr(port) doesn't raise, return as promised.
+            # If expr(port) raises anything but EADDRINUSE, propagate that
+            # exception.
+            # If portiter.next() raises StopIteration -- that is, if the port
+            # value we just passed to expr(port) was the last available -- reraise
+            # the EADDRINUSE exception.
+            # If we've actually arrived at this point, portiter.next() delivered a
+            # new port value. Loop back to pass that to expr(port).
+
+    except Exception, err:
+        debug("*** freeport() raising %s: %s", err.__class__.__name__, err)
+        raise
 
 def run(*args, **kwds):
     """All positional arguments collectively form a command line, executed as
@@ -144,8 +160,7 @@ def run(*args, **kwds):
     # - [no p] don't use the PATH because we specifically want to invoke the
     #   executable passed as our first arg,
     # - [no e] child should inherit this process's environment.
-    debug("Running %s...\n" % (" ".join(args)))
-    sys.stdout.flush()
+    debug("Running %s...", " ".join(args))
     rc = os.spawnv(os.P_WAIT, args[0], args)
-    debug("%s returned %s\n" % (args[0], rc))
+    debug("%s returned %s", args[0], rc)
     return rc
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index e78924a1ab..46e1eca126 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -312,17 +312,17 @@ Kun større parceller kan vises i søgning.
 			</text>
 			<check_box label="Redigere terræn" name="edit land check" tool_tip="Hvis dette er valg, kan enhver redigere dit land. Det er bedst ikke at vælge her, da det altid er muligt for dig som ejer at ændre terræn på dit eget land."/>
 			<check_box label="Flyve" name="check fly" tool_tip="Hvis valgt, kan beboere flyve på dit land. Hvis ikke valgt kan beboere kun flyve ind på dit land og over dit land."/>
-			<text left="194" name="allow_label2">
+			<text name="allow_label2">
 				Lave objekter:
 			</text>
 			<check_box label="Alle beboere" name="edit objects check"/>
 			<check_box label="Gruppe" name="edit group objects check"/>
-			<text left="170" name="allow_label3">
+			<text name="allow_label3">
 				Anbringe objekter:
 			</text>
 			<check_box label="Alle beboere" name="all object entry check"/>
 			<check_box label="Gruppe" name="group object entry check"/>
-			<text left="200" name="allow_label4">
+			<text name="allow_label4">
 				Køre scripts:
 			</text>
 			<check_box label="Alle beboere" name="check other scripts"/>
diff --git a/indra/newview/skins/default/xui/da/floater_env_settings.xml b/indra/newview/skins/default/xui/da/floater_env_settings.xml
index 8d9c05500b..a6fbc05734 100644
--- a/indra/newview/skins/default/xui/da/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_env_settings.xml
@@ -4,7 +4,8 @@
 		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
 	</floater.string>
 	<text name="EnvTimeText">
-		Tid på dagen
+		Tid på 
+dagen
 	</text>
 	<text name="EnvTimeText2">
 		00:00
@@ -15,11 +16,13 @@
 	</text>
 	<slider label="" name="EnvCloudSlider"/>
 	<text name="EnvWaterColorText">
-		Farve på vand
+		Farve på 
+vand
 	</text>
 	<color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger"/>
 	<text name="EnvWaterFogText">
-		Tåge på vand
+		Tåge på 
+vand
 	</text>
 	<slider label="" name="EnvWaterFogSlider"/>
 	<button label="Benyt tid fra estate" name="EnvUseEstateTimeButton"/>
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 2d8459479a..f1e42232c8 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -103,17 +103,17 @@
 				Preis: [PRICE] L$ ([PRICE_PER_SQM]L$/m²)
 			</text>
 			<text name="SalePending"/>
-			<button bottom="-222" label="Land verkaufen" label_selected="Land verkaufen..." name="Sell Land..."/>
+			<button label="Land verkaufen" label_selected="Land verkaufen..." name="Sell Land..."/>
 			<text name="For sale to">
 				Zum Verkauf an: [BUYER]
 			</text>
-			<text left_delta="-50" name="Sell with landowners objects in parcel." width="240">
+			<text name="Sell with landowners objects in parcel.">
 				Objekte sind im Verkauf eingeschlossen
 			</text>
-			<text name="Selling with no objects in parcel." width="260">
+			<text name="Selling with no objects in parcel.">
 				Objekte sind im Verkauf nicht eingeschlossen
 			</text>
-			<button bottom="-222" label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen" name="Cancel Land Sale"/>
+			<button label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen" name="Cancel Land Sale"/>
 			<text name="Claimed:">
 				Gekauft am:
 			</text>
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 38b305db7e..52de9ddd47 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -177,7 +177,8 @@
      font="SansSerif"
      height="16"
      left="30"
-     name="sell_objects_label">
+     name="sell_objects_label"
+     width="266">
         3. Sell the objects with the land?
     </text>
     <text
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index bb845e1ee0..125eb79d04 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -56,26 +56,32 @@ Gracias a estos Residentes por ayudarnos a estar seguros de que, con todo, esta
 		<panel label="Licencias" name="licenses_panel">
 			<text_editor name="credits_editor">
 				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.
-  
-  All rights reserved.  See licenses.txt for details.
+APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
+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.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University y David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (c) 2005, Google Inc.
+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.
+PCRE Copyright (c) 1997-2008 University of Cambridge
+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 y Mark Adler.
+google-perftools Copyright (c) 2005, Google Inc.
 
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+El visor de Second Life utiliza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (y los propietarios de las licencias). Reservados todos los derechos. Consulta www.havok.com si deseas obtener más información.
+
+Reservados todos los derechos.  Consulta las licencias en .txt si deseas obtener más información.
+
+Codificación de sonido del chat de voz: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index c3f4310103..1c4b965f46 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -107,13 +107,13 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 			<text name="For sale to">
 				En venta a: [BUYER]
 			</text>
-			<text name="Sell with landowners objects in parcel." width="216">
-				Los objetos se incluyen en la venta.
+			<text name="Sell with landowners objects in parcel.">
+				Objetos incluidos en la venta
 			</text>
-			<text name="Selling with no objects in parcel." width="216">
+			<text name="Selling with no objects in parcel.">
 				Los objetos no se incluyen en la venta.
 			</text>
-			<button bottom="-245" font="SansSerifSmall" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" left="275" name="Cancel Land Sale"/>
+			<button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
 			<text name="Claimed:">
 				Reclamada:
 			</text>
@@ -133,7 +133,7 @@ Vaya al menú Mundo &gt; Acerca del terreno o seleccione otra parcela para ver s
 				0
 			</text>
 			<button label="Comprar terreno" left="130" name="Buy Land..." width="125"/>
-			<button label="Información del script" name="Scripts..."/>
+			<button label="Información de scripts" name="Scripts..."/>
 			<button label="Comprar para el grupo" name="Buy For Group..."/>
 			<button label="Comprar un pase" left="130" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno." width="125"/>
 			<button label="Abandonar el terreno" name="Abandon Land..."/>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 98604ad5f4..3563d4bd0f 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="COMPRAR LOS CONTENIDOS">
 	<text name="contains_text">
-		[NAME] contiene:
+		&lt;nolink&gt;[NOMBRE]&lt;/nolink&gt; contiene:
 	</text>
 	<text name="buy_text">
 		¿Comprar por [AMOUNT] L$ a [NAME]?
diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml
new file mode 100644
index 0000000000..7e9a00797a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="Importar escena">
+	<text name="mesh count">
+		Redes: [RECUENTO]
+	</text>
+	<text name="texture count">
+		Texturas: [RECUENTO]
+	</text>
+	<text name="status">
+		Estado: [ESTADO]
+	</text>
+	<button label="Cancelar" name="cancel"/>
+	<button label="OK" name="ok"/>
+	<string name="status_idle">
+		Inactivo
+	</string>
+	<string name="status_uploading">
+		Cargando [NOMBRE]
+	</string>
+	<string name="status_creating">
+		Creando objeto [NOMBRE]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index c9d639d8cf..6004034504 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
 	<check_box label="Ropa" name="check_clothing"/>
 	<check_box label="Gestos" name="check_gesture"/>
 	<check_box label="Hitos" name="check_landmark"/>
+	<check_box label="Redes" name="check_mesh"/>
 	<check_box label="Notas" name="check_notecard"/>
 	<check_box label="Objetos" name="check_object"/>
 	<check_box label="Scripts" name="check_script"/>
@@ -14,11 +15,11 @@
 	<button label="Todos" label_selected="Todo" name="All"/>
 	<button label="Ninguno" label_selected="Nada" name="None"/>
 	<check_box label="Mostrar siempre las carpetas" name="check_show_empty"/>
-	<check_box label="Desde el fin de sesión" name="check_since_logoff" bottom_delta="-36"/>
+	<check_box bottom_delta="-36" label="Desde el fin de sesión" name="check_since_logoff"/>
 	<text name="- OR -">
 		- o -
 	</text>
 	<spinner label="horas atrás" name="spin_hours_ago"/>
 	<spinner label="días atrás" name="spin_days_ago"/>
-	<button label="Cerrar" label_selected="Cerrar" name="Close" bottom_delta="-30"/>
+	<button bottom_delta="-30" label="Cerrar" label_selected="Cerrar" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
new file mode 100644
index 0000000000..6208db75f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="Cargar modelo">
+	<string name="status_idle">
+		Inactivo
+	</string>
+	<string name="status_reading_file">
+		Cargando...
+	</string>
+	<string name="status_generating_meshes">
+		Generando redes...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Error: El número de intersección es superior a 65534. Cancelado.
+	</string>
+	<string name="high">
+		Alto
+	</string>
+	<string name="medium">
+		Media
+	</string>
+	<string name="low">
+		Bajo
+	</string>
+	<string name="lowest">
+		Mínimo
+	</string>
+	<string name="mesh_status_good">
+		Factúralo.
+	</string>
+	<string name="mesh_status_na">
+		N/A
+	</string>
+	<string name="mesh_status_none">
+		Ninguno
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Los niveles de detalle poseen un número distinto de caras a las que se pueden aplicar texturas.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Los niveles de detalle poseen un número distinto de ejemplos de red.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		El nivel de detalle posee demasiadas intersecciones.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Falta un nivel de detalle requerido.
+	</string>
+	<string name="layer_all">
+		Todo
+	</string>
+	<string name="decomposing">
+		Analizando...
+	</string>
+	<string name="simplifying">
+		Simplificando...
+	</string>
+	<text name="name_label">
+		Nombre:
+	</text>
+	<text name="lod_label">
+		Vista previa:
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="Nivel de detalle disponible en la vista previa">
+		<combo_item name="high">
+			Nivel de detalle: Alto
+		</combo_item>
+		<combo_item name="medium">
+			Nivel de detalle: Media
+		</combo_item>
+		<combo_item name="low">
+			Nivel de detalle: Bajo
+		</combo_item>
+		<combo_item name="lowest">
+			Nivel de detalle: Mínimo
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			Coste de recursos: [COSTE]
+		</text>
+		<text name="physics cost">
+			Coste físico: [COSTE]
+		</text>
+		<text name="upload fee">
+			Cuota de carga: N/A
+		</text>
+	</panel>
+	<text name="status">
+		[ESTADO]
+	</text>
+	<button label="Valores predeterminados" name="reset_btn" tool_tip="Restablecer valores predeterminados"/>
+	<button label="Subir" name="ok_btn" tool_tip="Cargar al simulador"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="Nivel de detalle" name="lod_panel">
+			<text name="lod_table_header">
+				Seleccionar nivel de detalle:
+			</text>
+			<text name="high_label" value="Alto"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="Media"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="Bajo"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="Mínimo"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				Nivel de detalle: [DETALLE]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="Cargar desde el archivo" name="lod_from_file"/>
+				<radio_item label="Generar automáticamente" name="lod_auto_generate"/>
+				<radio_item label="Ninguno" name="lod_none"/>
+			</radio_group>
+			<button label="Examinar..." name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					Límite de triángulo
+				</combo_item>
+				<combo_item name="error_threshold">
+					Margen de error
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				Crear operador:
+			</text>
+			<text name="queue_mode_text">
+				Modo de cola:
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					Cerrar bordes
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					Cerrar la mitad de los bordes
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					Egoísta
+				</combo_item>
+				<combo_item name="lazy">
+					Vago
+				</combo_item>
+				<combo_item name="independent">
+					Independiente
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				Modo de borde:
+			</text>
+			<text name="share_tolderance_text">
+				Tolerancia de uso compartido:
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					Desbloquear
+				</combo_item>
+				<combo_item name="border_lock">
+					Lock
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				Ángulo de marca:
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="Física" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="Archivo:" name="physics_load_from_file"/>
+					<radio_item label="Utilizar nivel de detalle:" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="Nivel de detalle para forma física">
+					<combo_item name="physics_lowest">
+						Mínimo
+					</combo_item>
+					<combo_item name="physics_low">
+						Bajo
+					</combo_item>
+					<combo_item name="physics_medium">
+						Media
+					</combo_item>
+					<combo_item name="physics_high">
+						Alto
+					</combo_item>
+				</combo_box>
+				<button label="Examinar..." name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="Leve:" name="Smooth"/>
+				<check_box label="Cerrar agujeros (lento)" name="Close Holes (Slow)"/>
+				<button label="Analizar" name="Decompose"/>
+				<button label="Cancelar" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="Pases:" name="Combine Quality"/>
+				<slider label="Escala de detalle:" name="Detail Scale"/>
+				<slider label="Retener:" name="Retain%"/>
+				<button label="Simplificar" name="Simplify"/>
+				<button label="Cancelar" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="Ampliación de vista previa:" name="physics_explode"/>
+				<text name="physics_triangles">
+					Triángulos: [TRIÁNGULOS]
+				</text>
+				<text name="physics_points">
+					Intersecciones: [PUNTOS]
+				</text>
+				<text name="physics_hulls">
+					Aspecto exterior: [ASPECTO EXTERIOR]
+				</text>
+			</panel>
+		</panel>
+		<panel label="Modificadores" name="modifiers_panel">
+			<spinner name="import_scale" value="1.0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] m
+			</text>
+			<check_box label="Texturas" name="upload_textures"/>
+			<check_box label="Peso de la piel" name="upload_skin"/>
+			<check_box label="Posturas de las articulaciones" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0.0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_model_wizard.xml b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
new file mode 100644
index 0000000000..019c2d3829
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="CARGAR ASISTENTE DE MODELO">
+	<button label="5. Subir" name="upload_btn"/>
+	<button label="4. Revisar" name="review_btn"/>
+	<button label="3. Física" name="physics2_btn"/>
+	<button label="3. Física" name="physics_btn"/>
+	<button label="2. Optimizar" name="optimize_btn"/>
+	<button label="1. Seleccionar archivo" name="choose_file_btn"/>
+	<panel name="choose_file_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Cargar modelo
+			</text>
+		</panel>
+		<text name="description">
+			Este asistente te ayudará a importar modelos de redes en Second Life.  En primer lugar, especifica un archivo que contenga el modelo que desees importar.  Second Life es compatible con los archivos de COLLADA (.dae).
+		</text>
+		<panel name="content">
+			<text name="Cache location">
+				Nombre del archivo:
+			</text>
+			<button label="Examinar..." label_selected="Examinar..." name="browse"/>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="optimize_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Optimizar
+			</text>
+		</panel>
+		<text name="description">
+			Este asistente ha optimizado tu modelo con el fin de mejorar el rendimiento. Puedes ajustar los resultados del proceso de optimización a continuación o hacer clic en Siguiente para continuar.
+		</text>
+		<panel name="content">
+			<text name="high_detail_text">
+				Generar nivel de detalle: Alto
+			</text>
+			<text name="medium_detail_text">
+				Generar nivel de detalle: Media
+			</text>
+			<text name="low_detail_text">
+				Generar nivel de detalle: Bajo
+			</text>
+			<text name="lowest_detail_text">
+				Generar nivel de detalle: Mínimo
+			</text>
+		</panel>
+		<panel name="content2">
+			<text name="lod_label">
+				Vista previa de modelo:
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Nivel de detalle disponible en la vista previa">
+				<combo_item name="high">
+					Alto
+				</combo_item>
+				<combo_item name="medium">
+					Media
+				</combo_item>
+				<combo_item name="low">
+					Bajo
+				</combo_item>
+				<combo_item name="lowest">
+					Mínimo
+				</combo_item>
+			</combo_box>
+			<text name="streaming cost">
+				Coste de recursos:    [COSTE]
+			</text>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Física
+			</text>
+		</panel>
+		<text name="description">
+			El asistente creará una forma física, que determinará la manera en la que el objeto interactúa con otros objetos y avatares. Selecciona con el controlador deslizante el nivel de detalle más adecuado en función del uso del objeto:
+		</text>
+		<panel name="content">
+			<text name="streaming cost">
+				Coste de recursos:       [COSTE]
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics2_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Física
+			</text>
+		</panel>
+		<text name="description">
+			Obtén una vista previa de la forma física a continuación y haz clic en Siguiente para continuar.  Para modificar la forma física, haz clic en el botón Atrás.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Vista previa de modelo:
+			</text>
+			<combo_box name="preview_lod_combo3" tool_tip="Nivel de detalle disponible en la vista previa">
+				<combo_item name="high">
+					Alto
+				</combo_item>
+				<combo_item name="medium">
+					Media
+				</combo_item>
+				<combo_item name="low">
+					Bajo
+				</combo_item>
+				<combo_item name="lowest">
+					Mínimo
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+			<text name="streaming cost">
+				Coste de recursos:       [COSTE]
+			</text>
+		</panel>
+	</panel>
+	<panel name="review_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Revisar
+			</text>
+		</panel>
+		<text name="description">
+			Revisa los detalles que aparecen más abajo y, a continuación, haz clic. Selecciona la opción de carga para cargar el modelo. Se realizará el cargo en tu saldo de L$ cuando hagas clic en Cargar.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Vista previa de modelo:
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Nivel de detalle disponible en la vista previa">
+				<combo_item name="high">
+					Alto
+				</combo_item>
+				<combo_item name="medium">
+					Media
+				</combo_item>
+				<combo_item name="low">
+					Bajo
+				</combo_item>
+				<combo_item name="lowest">
+					Mínimo
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+		<text name="streaming cost">
+			Coste de recursos:         [COSTE]
+		</text>
+		<text name="physics cost">
+			Coste físico:        [COSTE]
+		</text>
+	</panel>
+	<panel name="upload_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Carga completa.
+			</text>
+		</panel>
+		<text name="description">
+			¡Felicidades! Tu modelo se ha cargado correctamente.  Encontrarás el modelo en la carpeta Objetos del inventario.
+		</text>
+	</panel>
+	<button label="&lt;&lt; Atrás" name="back"/>
+	<button label="Siguiente &gt;&gt;" name="next"/>
+	<button label="Subir" name="upload" tool_tip="Cargar al simulador"/>
+	<button label="Cancelar" name="cancel"/>
+	<button label="Cerrar" name="close"/>
+	<spinner name="import_scale" value="1.0"/>
+	<string name="status_idle">
+		Inactivo
+	</string>
+	<string name="status_reading_file">
+		Cargando...
+	</string>
+	<string name="status_generating_meshes">
+		Generando redes...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Error: El número de intersección es superior a 65534. Cancelado.
+	</string>
+	<string name="high">
+		Alto
+	</string>
+	<string name="medium">
+		Media
+	</string>
+	<string name="low">
+		Bajo
+	</string>
+	<string name="lowest">
+		Mínimo
+	</string>
+	<string name="mesh_status_good">
+		Factúralo.
+	</string>
+	<string name="mesh_status_na">
+		N/A
+	</string>
+	<string name="mesh_status_none">
+		Ninguno
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Los niveles de detalle poseen un número distinto de caras a las que se pueden aplicar texturas.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Los niveles de detalle poseen un número distinto de ejemplos de red.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		El nivel de detalle posee demasiadas intersecciones.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Falta un nivel de detalle requerido.
+	</string>
+	<string name="layer_all">
+		Todo
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
new file mode 100644
index 0000000000..8d6cdc86c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="PUBLICAR UN ANUNCIO CLASIFICADO">
+	<text name="explanation_text">
+		Tu anuncio clasificado se mostrará durante una semana a partir del día en que se publicó.
+
+La posición de tu anuncio en la lista de clasificados depende de cuánto elijas pagar.
+
+Los anuncios mejor pagados van al principio de la lista, y aparecen más arriba en las búsquedas.
+	</text>
+	<text name="price_text">
+		Precio por el anuncio:
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="OK" name="set_price_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
new file mode 100644
index 0000000000..a5ffbd517a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="Dispositivos de sonido">
+	<text name="voice_label">
+		Chat de voz
+	</text>
+	<check_box label="Activados" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 13be47f700..9d29bc40bf 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -125,6 +125,18 @@
 	<text left="134" name="prim_count">
 		Primitivas: [COUNT]
 	</text>
+	<text name="linked_set_count">
+		Conjuntos con enlaces: [RECUENTO]
+	</text>
+	<text name="linked_set_cost" tool_tip="Coste de los conjuntos con enlaces actualmente seleccionados como [prims], [complejidad física]">
+		Coste: [COSTE] / [FÍSICO]
+	</text>
+	<text name="object_count">
+		Objetos: [RECUENTO]
+	</text>
+	<text name="object_cost" tool_tip="Coste de los objetos actualmente seleccionados como [prims] / [complejidad física]">
+		Coste: [COSTE] / [FÍSICO]
+	</text>
 	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="General" name="General">
 			<panel.string name="text deed continued">
@@ -269,15 +281,6 @@
 				<combo_box.item label="Cono truncado" name="Ring"/>
 				<combo_box.item label="Sculpted" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="Piedra" name="Stone"/>
-				<combo_box.item label="Metal" name="Metal"/>
-				<combo_box.item label="Vidrio" name="Glass"/>
-				<combo_box.item label="Madera" name="Wood"/>
-				<combo_box.item label="Carne" name="Flesh"/>
-				<combo_box.item label="Plástico" name="Plastic"/>
-				<combo_box.item label="Goma" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				Corte (inicio/fin)
 			</text>
@@ -350,9 +353,19 @@
 				<combo_box.item label="Toroide" name="Torus"/>
 				<combo_box.item label="Plano" name="Plane"/>
 				<combo_box.item label="Cilindro" name="Cylinder"/>
+				<combo_box.item label="Red" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Caracter." name="Features">
+			<panel.string name="None">
+				Ninguno
+			</panel.string>
+			<panel.string name="Prim">
+				Prim
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Apariencia convexa
+			</panel.string>
 			<text name="select_single">
 				Selecciona un sólo prim para editarlo.
 			</text>
@@ -377,6 +390,23 @@
 			<spinner label="Visión" name="Light Focus"/>
 			<spinner label="Atenuación" name="Light Falloff"/>
 			<spinner label="Ambiental" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				Tipo de forma física:
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Selecciona el tipo de forma física"/>
+			<combo_box name="material">
+				<combo_box.item label="Piedra" name="Stone"/>
+				<combo_box.item label="Metal" name="Metal"/>
+				<combo_box.item label="Cristal" name="Glass"/>
+				<combo_box.item label="Madera" name="Wood"/>
+				<combo_box.item label="Carne" name="Flesh"/>
+				<combo_box.item label="Plástico" name="Plastic"/>
+				<combo_box.item label="Goma" name="Rubber"/>
+			</combo_box>
+			<spinner label="Gravedad" name="Physics Gravity"/>
+			<spinner label="Fricción" name="Physics Friction"/>
+			<spinner label="Densidad" name="Physics Density"/>
+			<spinner label="Reemplazo" name="Physics Restitution"/>
 		</panel>
 		<panel label="Textura" name="Texture">
 			<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml
index 615a1a09b7..f17cfe4ceb 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/>
 		<menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/>
 		<menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Modelo..." name="Upload Model"/>
+		<menu_item_call label="Asistente de modelo..." name="Upload Model Wizard"/>
 		<menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/>
 		<menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..0d4f1314c9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="Mostrar bordes" name="show_edges"/>
+	<menu_item_check label="Mostrar aspectos físicos" name="show_physics"/>
+	<menu_item_check label="Mostrar texturas" name="show_textures"/>
+	<menu_item_check label="Mostrar peso de la piel" name="show_skin_weight"/>
+	<menu_item_check label="Mostrar posturas de las articulaciones" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 1c45d36813..0824e386d5 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -120,6 +120,8 @@
 			<menu_item_call label="Imagen ([COST] L$)..." name="Upload Image"/>
 			<menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/>
+			<menu_item_call label="Modelo..." name="Upload Model"/>
+			<menu_item_call label="Asistente de modelo..." name="Upload Model Wizard"/>
 			<menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Deshacer" name="Undo"/>
@@ -159,7 +161,7 @@
 			<menu_item_check label="Alfa" name="Alpha"/>
 			<menu_item_check label="Árbol" name="Tree"/>
 			<menu_item_check label="Avatares" name="Character"/>
-			<menu_item_check label="Superficie del terreno" name="SurfacePath"/>
+			<menu_item_check label="Parche de superficie" name="Surface Patch"/>
 			<menu_item_check label="Cielo" name="Sky"/>
 			<menu_item_check label="Agua" name="Water"/>
 			<menu_item_check label="Terreno" name="Ground"/>
@@ -217,6 +219,7 @@
 			<menu_item_check label="Texture Category Console" name="Texture Category"/>
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
 			<menu_item_check label="Memory" name="Memory"/>
+			<menu_item_check label="Datos de la escena" name="Scene Statistics"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Camera" name="Camera"/>
 			<menu_item_check label="Wind" name="Wind"/>
@@ -224,6 +227,7 @@
 		</menu>
 		<menu label="Show Info" name="Display Info">
 			<menu_item_check label="Show Time" name="Show Time"/>
+			<menu_item_check label="Mostrar coste de carga" name="Show Upload Cost"/>
 			<menu_item_check label="Show Render Info" name="Show Render Info"/>
 			<menu_item_check label="Mostrar información de textura" name="Show Texture Info"/>
 			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
@@ -246,7 +250,12 @@
 			<menu_item_check label="Frame Test" name="Frame Test"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
+			<menu_item_check label="Normales" name="Normals"/>
+			<menu_item_check label="Formas del físico" name="Physics Shapes"/>
 			<menu_item_check label="Actualizar el tipo" name="Update Type"/>
+			<menu_item_check label="Información sobre el nivel de detalle" name="LOD Info"/>
+			<menu_item_check label="Crear cola" name="Build Queue"/>
+			<menu_item_check label="Esculpir" name="Sculpt"/>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
@@ -312,6 +321,7 @@
 			<menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/>
 		</menu>
 		<menu_item_check label="HTTP Textures" name="HTTP Textures"/>
+		<menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
 		<menu_item_check label="Console Window on next Run" name="Console Window"/>
 		<menu_item_call label="Request Admin Status" name="Request Admin Options"/>
 		<menu_item_call label="Leave Admin Status" name="Leave Admin Options"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index ce9273ab50..9674f73241 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2166,6 +2166,12 @@ Esto puede influir en tu contraseña.
 	<notification name="RezItemNoPermissions">
 		No tienes permisos suficientes para renderizar el objeto.
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		No se pueden enviar mensajes instantáneos entre propiedades principales.
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		No se puede transferir el inventario entre propiedades principales.
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		En este momento no se puede cargar la nota.
 	</notification>
@@ -2738,6 +2744,10 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
 		Un moderador ha silenciado tu voz.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		Esta carga te costará [PRECIO] L$. ¿Deseas continuar?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Subir"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		¿Estás seguro de que quieres borrar tu historial de teleportes?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -2749,6 +2759,9 @@ Se mostrará cuando haya suficiente espacio.
 	<notification name="ShareNotification">
 		Selecciona los residentes con quienes deseas compartir.
 	</notification>
+	<notification name="MeshUploadError">
+		No se ha cargado [ETIQUETA]: [MENSAJE] [IDENTIFICADOR] [IDENTIFICADOR_FALTA_VALIDEZ]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		¿Estás seguro de que quieres compartir los elementos siguientes?
 
@@ -2765,6 +2778,19 @@ Con los siguientes residentes:
 	<notification name="DeedToGroupFail">
 		Error de transferencia a grupo.
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		La parcela [NOMBRE_PARCELA] no se puede abandonar en este momento.
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		Ya está disponible la parcela [NOMBRE_PARCELA] de [ÁREA] m².
+
+Dispondrás de [PERÍODO_DE_RECLAMACIÓN] horas para reclamar la cantidad de 0 L$ antes de que se ponga en venta.
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		Ya está disponible la parcela [NOMBRE_PARCELA] de [ÁREA] m².
+
+Ya está en venta.
+	</notification>
 	<notification name="AvatarRezNotification">
 		( [EXISTENCE] segundos vivo)
 El avatar &apos;[NAME]&apos; tardó [TIME] segundos en dejar de aparecer como nube.
@@ -2902,6 +2928,10 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 		La creación y edición de grupos sólo está disponible en el modo Avanzado. ¿Quieres salir y cambiar de modo? El selector de modo se encuentra en la pantalla de inicio de sesión.
 		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
 	</notification>
+	<notification label="" name="NoPlaceInfo">
+		La opción de consulta del perfil del lugar solo está disponible en el modo Avanzado. ¿Quieres salir y cambiar de modo? El selector de modo se encuentra en la pantalla de inicio de sesión.
+		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
+	</notification>
 	<notification label="" name="NoPicks">
 		La creación y edición de Destacados sólo está disponible en el modo Avanzado. ¿Quieres salir y cambiar de modo? El selector de modo se encuentra en la pantalla de inicio de sesión.
 		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
@@ -2922,9 +2952,18 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 		El pago a otros residentes sólo está disponible en el modo Avanzado. ¿Quieres cerrar sesión y cambiar de modo?
 		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- La velocidad de tu CPU no cumple los requerimientos mínimos.
-	</global>
+	<notification label="" name="NoInventory">
+		La opción de consulta del inventario solo está disponible en el modo Avanzado. ¿Quieres cerrar sesión y cambiar de modo?
+		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		El editor de apariencia solo está disponible en el modo Avanzado. ¿Quieres cerrar sesión y cambiar de modo?
+		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		Las búsquedas solo están disponibles en el modo Avanzado. ¿Quieres cerrar sesión y cambiar de modo?
+		<usetemplate name="okcancelbuttons" notext="No salir" yestext="Salir"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Parece que no tienes el hardware apropiado para [APP_NAME]. [APP_NAME] requiere una tarjeta gráfica OpenGL que admita texturas múltiples (&apos;multitexture support&apos;). Si la tienes, comprueba que tienes los últimos &apos;drivers&apos; para tu tarjeta gráfica, así como los últimos parches y &apos;service packs&apos; para tu sistema operativo.
 
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
index 7c2c9f505e..96e63e6fa0 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -14,5 +14,5 @@
 	<check_box label="Permitir el acceso de varios usuarios" name="allow_multiple_viewer_check"/>
 	<check_box label="Mostrar la selección de cuadrícula al iniciar sesión" name="show_grid_selection_check"/>
 	<check_box label="Mostrar el menú Avanzado" name="show_advanced_menu_check"/>
-	<check_box label="Mostrar el menú Desarrollador" name="show_develop_menu_check"/>
+	<check_box label="Mostrar el menú Develop" name="show_develop_menu_check"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index f7bc1f6aad..d8fd43469d 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -31,7 +31,7 @@
 	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
 	<check_box name="translate_chat_checkbox"/>
 	<text name="translate_chb_label">
-		Utiliza la herramienta de traducción automática mientras utilizas el chat (mediante Google)
+		Usar en el chat el traductor automático de Google
 	</text>
 	<text name="translate_language_text">
 		Traducir el chat al:
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
index a7fb2d9af8..e6e4c13203 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		Errores
 	</text>
+	<text name="text_box10">
+		Directo
+	</text>
 	<text name="text_box7">
 		Propietario
 	</text>
@@ -29,7 +32,7 @@
 		URLs
 	</text>
 	<text name="bubble_chat">
-		Color de fondo de las etiquetas de nombre (también se aplica a los bocadillos del chat):
+		Color de fondo de la etiqueta del nombre (afectará también a los bocadillos del chat):
 	</text>
 	<color_swatch name="background" tool_tip="Elige el color de las etiquetas de nombre"/>
 	<slider label="Opacidad:" name="bubble_chat_opacity" tool_tip="Elige la opacidad de las etiquetas de nombre"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index ac40587033..281b871fed 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="verdadero" label="Agua transparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/>
+		<check_box initial_value="verdadero" label="Luces locales" name="LocalLights"/>
 		<check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
 		<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="verdadero" label="Luces y sombras" name="UseLightShaders"/>
+		<check_box initial_value="verdadero" label="Oclusión del ambiente" name="UseSSAO"/>
+		<check_box initial_value="verdadero" label="Profundidad del campo" name="UseDoF"/>
+		<text name="shadows_label">
+			Sombras:
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="Ninguno" name="0"/>
+			<combo_box.item label="Sol/luna" name="1"/>
+			<combo_box.item label="Sol/luna + proyectores" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			Reflejos en el agua:
 		</text>
@@ -86,7 +98,7 @@
 		<check_box initial_value="true" label="Avatares simulados" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Renderizado por hardware" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="Ropas del avatar" name="AvatarCloth"/>
-		<text name="TerrainDetailText" left="402">
+		<text left="402" name="TerrainDetailText">
 			Detalle del terreno:
 		</text>
 		<radio_group name="TerrainDetailRadio">
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index fe7f51c74e..453d1fe43c 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
 	<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
 	<check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
+	<check_box label="Permitir objetos de red" name="mesh_rez_enabled_check" tool_tip="Permitir que los usuarios creen objetos de red en esta región"/>
 	<spinner label="Nº máximo de avatares" label_width="120" name="agent_limit_spin" width="180"/>
 	<spinner label="Plus de objetos" label_width="120" name="object_bonus_spin" width="180"/>
 	<text label="Calificación" name="access_text">
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
new file mode 100644
index 0000000000..acf5c68cda
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Configuración del dispositivo" name="device_settings_panel">
+	<panel.string name="default_text">
+		Por defecto
+	</panel.string>
+	<text name="Input">
+		Entrada
+	</text>
+	<text name="My volume label">
+		Mi volumen:
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia el volumen usando este deslizable"/>
+	<text name="wait_text">
+		Por favor, espera
+	</text>
+	<text name="Output">
+		Salida
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index a869c079ef..3731b6b57c 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -118,6 +118,139 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/index.php?lang=es-ES
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
+http://secondlife.com/download.
+
+Si deseas obtener más información, consulta las preguntas frecuentes que aparecen a continuación:
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		Actualización opcional del visor disponible: [VERSIÓN]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		Actualización necesaria del visor: [VERSIÓN]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		El agente ya ha iniciado sesión.
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		Lo sentimos. No ha sido posible iniciar sesión.
+Comprueba si has introducido correctamente
+    * El nombre de usuario (como juangarcia12 o estrella.polar)
+    * Contraseña
+Asimismo, asegúrate de que la tecla Mayús esté desactivada.
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		Como precaución de seguridad, se ha modificado tu contraseña.
+Dirígete a la página de tu cuenta en http://secondlife.com/password
+y responde a la pregunta de seguridad para restablecer la contraseña.
+Lamentamos las molestias.
+	</string>
+	<string name="LoginFailedPasswordReset">
+		Hemos realizado unos cambios en nuestro sistema, por lo que deberás restablecer la contraseña.
+Dirígete a la página de tu cuenta en http://secondlife.com/password
+y responde a la pregunta de seguridad para restablecer la contraseña.
+Lamentamos las molestias.
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Life no está disponible temporalmente debido a tareas de mantenimiento.
+Actualmente, solo se permite iniciar sesión a los empleados.
+Consulta www.secondlife.com/status si deseas obtener actualizaciones.
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		Se ha restringido de manera temporal el inicio de sesión en Second Life con el fin de garantizar una experiencia óptima a nuestros residentes.
+	 	
+Aquellos usuarios que dispongan de cuentas gratuitas no podrán acceder a Second Life durante este período de tiempo, ya que el propósito de esta medida es obtener espacio suficiente para los residentes que hayan pagado por acceder a Second Life.
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		No se puede acceder a Second Life desde este ordenador.
+Si crees que se trata de un error, ponte en contacto con
+support@secondlife.com.
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		No se podrá acceder a tu cuenta hasta las
+[HORA] (horario de la costa del Pacífico).
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		En este momento no podemos completar la solicitud.
+Si deseas obtener asistencia, ponte en contacto con el departamento de soporte de Second Life a través de la página http://secondlife.com/support.
+Si no puedes cambiar la contraseña, llama al número (866) 476-9763.
+	</string>
+	<string name="LoginFailedTransformError">
+		Se han detectado datos incorrectos en el inicio de sesión.
+Ponte en contacto con support@secondlife.com.
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		Se están realizando tareas rutinarias de mantenimiento en tu cuenta.
+No se podrá acceder a tu cuenta hasta las
+[HORA] (horario de la costa del Pacífico).
+Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		La solicitud de cierre de sesión ha obtenido como resultado un error del simulador.
+	</string>
+	<string name="LoginFailedPendingLogout">
+		El sistema está cerrando tu sesión en estos momentos.
+Tu cuenta no estará disponible hasta las
+[HORA] (horario de la costa del Pacífico).
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		No se ha podido crear una sesión válida.
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		No se ha podido establecer la conexión con un simulador.
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		Tu cuenta solo puede acceder a Second Life
+entre las [INICIO] y las [FIN] (horario de la costa del Pacífico).
+Inténtalo de nuevo durante ese horario.
+Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		Parámetros incorrectos.
+Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		El parámetro correspondiente al nombre debe contener caracteres alfanuméricos.
+Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		El parámetro correspondiente al apellido debe contener caracteres alfanuméricos.
+Si crees que se trata de un error, ponte en contacto con support@secondlife.com.
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		La región se está desconectando.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		El agente no se encuentra en la región.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		A esta región ya se ha accedido en otra sesión.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		Se ha salido de la región en la sesión anterior.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		La región aún está cerrando la sesión anterior.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LogoutSucceeded">
+		Se ha salido de la región en la última sesión.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		La región ha comenzado el proceso de cierre de sesión.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		El sistema ha comenzado a cerrar la última sesión.
+Intenta iniciar sesión de nuevo en unos instantes.
+	</string>
 	<string name="AgentLostConnection">
 		Esta región puede estar teniendo problemas. Por favor, comprueba tu conexión a Internet.
 	</string>
@@ -426,6 +559,9 @@
 	<string name="symbolic folder link">
 		enlace de la carpeta
 	</string>
+	<string name="mesh">
+		red
+	</string>
 	<string name="AvatarAway">
 		Ausente
 	</string>
@@ -1153,6 +1289,9 @@
 	<string name="InvFolder Accessories">
 		Accesorios
 	</string>
+	<string name="InvFolder Meshes">
+		Redes
+	</string>
 	<string name="InvFolder Friends">
 		Amigos
 	</string>
@@ -3663,6 +3802,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="session_initialization_timed_out_error">
 		Se ha agotado el tiempo del inicio de sesión
 	</string>
+	<string name="Home position set.">
+		Posición inicial establecida.
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index f963a40cd3..e3e3169161 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -56,27 +56,32 @@ Tous nos remerciements aux résidents suivants pour avoir testé cette version (
 		<panel label="Licences" name="licenses_panel">
 			<text_editor name="credits_editor">
 				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)
-  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 et Mark Adler.
-  google-perftools Copyright (c) 2005, Google Inc.
-  
-  Tous droits réservés.  Voir licenses.txt pour plus de détails.
+APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
+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.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University et David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (c) 2005, Google Inc.
+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.
+PCRE Copyright (c) 1997-2008 University of Cambridge
+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 et Mark Adler.
+google-perftools Copyright (c) 2005, Google Inc.
 
-  Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 
-  Annex C)
+Le client Second Life utilise Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (et ses concédants de licence). Tous droits réservés. Pour plus de détails, consultez le site Web www.havok.com.
+
+Tous droits réservés. Voir licenses.txt pour plus d&apos;informations.
+
+Codage audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index 7aa142b13e..0436dc8a91 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="ACHETER DES CONTENUS">
 	<text name="contains_text">
-		[NAME] contient :
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; contient :
 	</text>
 	<text name="buy_text">
 		Acheter [AMOUNT] L$ à [NAME] ?
diff --git a/indra/newview/skins/default/xui/fr/floater_import_collada.xml b/indra/newview/skins/default/xui/fr/floater_import_collada.xml
new file mode 100644
index 0000000000..03804c4bd5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="Importation de scène">
+	<text name="mesh count">
+		Maillages : [COUNT]
+	</text>
+	<text name="texture count">
+		Textures : [COUNT]
+	</text>
+	<text name="status">
+		État : [STATUS]
+	</text>
+	<button label="Annuler" name="cancel"/>
+	<button label="OK" name="ok"/>
+	<string name="status_idle">
+		Inactif
+	</string>
+	<string name="status_uploading">
+		Chargement de [NAME]
+	</string>
+	<string name="status_creating">
+		Création de l&apos;objet [NAME]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 1ee85a77ce..7567817f3a 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
 	<check_box label="Habits" name="check_clothing"/>
 	<check_box label="Gestes" name="check_gesture"/>
 	<check_box label="Repères" name="check_landmark"/>
+	<check_box label="Maillages" name="check_mesh"/>
 	<check_box label="Notes" name="check_notecard"/>
 	<check_box label="Objets" name="check_object"/>
 	<check_box label="Scripts" name="check_script"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
new file mode 100644
index 0000000000..213847bbd0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="Chargement du modèle">
+	<string name="status_idle">
+		Inactif
+	</string>
+	<string name="status_reading_file">
+		Chargement...
+	</string>
+	<string name="status_generating_meshes">
+		Génération des maillages...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Erreur : valeur de sommet supérieure à 65534. Opération abandonnée.
+	</string>
+	<string name="high">
+		Élevé
+	</string>
+	<string name="medium">
+		Moyen
+	</string>
+	<string name="low">
+		Faible
+	</string>
+	<string name="lowest">
+		Le plus faible
+	</string>
+	<string name="mesh_status_good">
+		Bon à publier !
+	</string>
+	<string name="mesh_status_na">
+		N/A
+	</string>
+	<string name="mesh_status_none">
+		Aucun
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Un nombre différent de faces d&apos;application de texture est associé aux niveaux de détail.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Un nombre différent d&apos;instances de maillage est associé aux niveaux de détail.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Trop de sommets pour le niveau de détail.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Niveau de détail requis manquant.
+	</string>
+	<string name="layer_all">
+		Tout
+	</string>
+	<string name="decomposing">
+		Analyse...
+	</string>
+	<string name="simplifying">
+		Simplification...
+	</string>
+	<text name="name_label">
+		Nom :
+	</text>
+	<text name="lod_label">
+		Aperçu :
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+		<combo_item name="high">
+			Niveau de détail : Élevé
+		</combo_item>
+		<combo_item name="medium">
+			Niveau de détail : Moyen
+		</combo_item>
+		<combo_item name="low">
+			Niveau de détail : Faible
+		</combo_item>
+		<combo_item name="lowest">
+			Niveau de détail : Le plus faible
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			Coût de la ressource : [COST]
+		</text>
+		<text name="physics cost">
+			Coût des propriétés physiques : [COST]
+		</text>
+		<text name="upload fee">
+			Frais de chargement : N/A
+		</text>
+	</panel>
+	<text name="status">
+		[STATUS]
+	</text>
+	<button label="Valeurs par défaut" name="reset_btn" tool_tip="Rétablir les valeurs par défaut."/>
+	<button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/>
+	<button label="Annuler" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="Niveau de détail" name="lod_panel">
+			<text name="lod_table_header">
+				Sélectionner le niveau de détail :
+			</text>
+			<text name="high_label" value="Élevé"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="Moyen"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="Faible"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="Le plus faible"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				Niveau de détail : [DETAIL]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="Charger depuis un fichier" name="lod_from_file"/>
+				<radio_item label="Générer automatiquement" name="lod_auto_generate"/>
+				<radio_item label="Aucun" name="lod_none"/>
+			</radio_group>
+			<button label="Parcourir..." name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					Limite du triangle
+				</combo_item>
+				<combo_item name="error_threshold">
+					Seuil d&apos;erreur
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				Opér. construction :
+			</text>
+			<text name="queue_mode_text">
+				Mode fil d&apos;attente :
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					Fusion (nouveau sommet)
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					Fusion (un des sommets)
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					Glouton
+				</combo_item>
+				<combo_item name="lazy">
+					Paresseux
+				</combo_item>
+				<combo_item name="independent">
+					Indépendant
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				Mode bord :
+			</text>
+			<text name="share_tolderance_text">
+				Tolérance partage :
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					Déverrouiller
+				</combo_item>
+				<combo_item name="border_lock">
+					Verrouiller
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				Angle pli :
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="Propriétés physiques" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="Fichier :" name="physics_load_from_file"/>
+					<radio_item label="Utiliser le niveau de détail :" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="Niveau de détail à utiliser pour la forme physique.">
+					<combo_item name="physics_lowest">
+						Le plus faible
+					</combo_item>
+					<combo_item name="physics_low">
+						Faible
+					</combo_item>
+					<combo_item name="physics_medium">
+						Moyen
+					</combo_item>
+					<combo_item name="physics_high">
+						Élevé
+					</combo_item>
+				</combo_box>
+				<button label="Parcourir..." name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="Lissage :" name="Smooth"/>
+				<check_box label="Fermer les trous (lent)" name="Close Holes (Slow)"/>
+				<button label="Analyser" name="Decompose"/>
+				<button label="Annuler" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="Passes :" name="Combine Quality"/>
+				<slider label="Échelle de détail :" name="Detail Scale"/>
+				<slider label="Retenue :" name="Retain%"/>
+				<button label="Simplifier" name="Simplify"/>
+				<button label="Annuler" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="Décomposition de l&apos;aperçu :" name="physics_explode"/>
+				<text name="physics_triangles">
+					Triangles : [TRIANGLES]
+				</text>
+				<text name="physics_points">
+					Sommets : [POINTS]
+				</text>
+				<text name="physics_hulls">
+					Enveloppes : [HULLS]
+				</text>
+			</panel>
+		</panel>
+		<panel label="Modificateurs" name="modifiers_panel">
+			<spinner name="import_scale" value="1.0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] m
+			</text>
+			<check_box label="Textures" name="upload_textures"/>
+			<check_box label="Pondération de la peau" name="upload_skin"/>
+			<check_box label="Position des articulations" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0.0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
new file mode 100644
index 0000000000..bb64361959
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="ASSISTANT DE CHARGEMENT DE MODÈLE">
+	<button label="5. Chargement" name="upload_btn"/>
+	<button label="4. Vérification" name="review_btn"/>
+	<button label="3. Propriétés physiques" name="physics2_btn"/>
+	<button label="3. Propriétés physiques" name="physics_btn"/>
+	<button label="2. Optimisation" name="optimize_btn"/>
+	<button label="1. Sélection du fichier" name="choose_file_btn"/>
+	<panel name="choose_file_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Charger le modèle
+			</text>
+		</panel>
+		<text name="description">
+			Cet Assistant vous aidera à importer des modèles de maillage dans Second Life. Commencez par spécifier un fichier contenant le modèle à importer. Second Life prend en charge les fichiers COLLADA (.dae).
+		</text>
+		<panel name="content">
+			<text name="Cache location">
+				Nom du fichier :
+			</text>
+			<button label="Parcourir..." label_selected="Parcourir..." name="browse"/>
+			<text name="dimensions">
+				X :         Y :         Z :
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="optimize_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Optimisation
+			</text>
+		</panel>
+		<text name="description">
+			Cet Assistant a optimisé votre modèle afin d&apos;améliorer les performances. Vous pouvez ajuster les résultats du processus d&apos;optimisation ci-dessous ou cliquer sur Suiv. pour continuer.
+		</text>
+		<panel name="content">
+			<text name="high_detail_text">
+				Générer le niveau de détail : Élevé
+			</text>
+			<text name="medium_detail_text">
+				Générer le niveau de détail : Moyen
+			</text>
+			<text name="low_detail_text">
+				Générer le niveau de détail : Faible
+			</text>
+			<text name="lowest_detail_text">
+				Générer le niveau de détail : Le plus faible
+			</text>
+		</panel>
+		<panel name="content2">
+			<text name="lod_label">
+				Aperçu du modèle :
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="high">
+					Élevé
+				</combo_item>
+				<combo_item name="medium">
+					Moyen
+				</combo_item>
+				<combo_item name="low">
+					Faible
+				</combo_item>
+				<combo_item name="lowest">
+					Le plus faible
+				</combo_item>
+			</combo_box>
+			<text name="streaming cost">
+				Coût de la ressource :    [COST]
+			</text>
+			<text name="dimensions">
+				X :         Y :         Z :
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Propriétés physiques
+			</text>
+		</panel>
+		<text name="description">
+			Cet Assistant créera une forme physique déterminant le mode d&apos;interaction de l&apos;objet avec les autres objets et avatars. Réglez le curseur sur le niveau de détail le plus approprié à l&apos;utilisation de l&apos;objet :
+		</text>
+		<panel name="content">
+			<text name="streaming cost">
+				Coût de la ressource :       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics2_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Propriétés physiques
+			</text>
+		</panel>
+		<text name="description">
+			Prévisualisez la forme physique ci-dessous, puis cliquez sur Suiv. pour continuer. Le bouton Préc. permet de modifier cette forme, le cas échéant.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Aperçu du modèle :
+			</text>
+			<combo_box name="preview_lod_combo3" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="high">
+					Élevé
+				</combo_item>
+				<combo_item name="medium">
+					Moyen
+				</combo_item>
+				<combo_item name="low">
+					Faible
+				</combo_item>
+				<combo_item name="lowest">
+					Le plus faible
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X :         Y :         Z :
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+			<text name="streaming cost">
+				Coût de la ressource :       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="review_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Vérification
+			</text>
+		</panel>
+		<text name="description">
+			Vérifiez les détails ci-dessous, puis cliquez sur Charger pour charger le modèle. Votre solde en L$ sera alors débité.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Aperçu du modèle :
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="high">
+					Élevé
+				</combo_item>
+				<combo_item name="medium">
+					Moyen
+				</combo_item>
+				<combo_item name="low">
+					Faible
+				</combo_item>
+				<combo_item name="lowest">
+					Le plus faible
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X :         Y :         Z :
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+		<text name="streaming cost">
+			Coût de la ressource :         [COST]
+		</text>
+		<text name="physics cost">
+			Coût des propriétés physiques :        [COST]
+		</text>
+	</panel>
+	<panel name="upload_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Chargement terminé !
+			</text>
+		</panel>
+		<text name="description">
+			Félicitations ! Votre modèle a été chargé. Il se trouve dans le dossier Objets de votre inventaire.
+		</text>
+	</panel>
+	<button label="&lt;&lt; Préc." name="back"/>
+	<button label="Suiv. &gt;&gt;" name="next"/>
+	<button label="Charger" name="upload" tool_tip="Charger dans le simulateur."/>
+	<button label="Annuler" name="cancel"/>
+	<button label="Fermer" name="close"/>
+	<spinner name="import_scale" value="1.0"/>
+	<string name="status_idle">
+		Inactif
+	</string>
+	<string name="status_reading_file">
+		Chargement...
+	</string>
+	<string name="status_generating_meshes">
+		Génération des maillages...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Erreur : valeur de sommet supérieure à 65534. Opération abandonnée.
+	</string>
+	<string name="high">
+		Élevé
+	</string>
+	<string name="medium">
+		Moyen
+	</string>
+	<string name="low">
+		Faible
+	</string>
+	<string name="lowest">
+		Le plus faible
+	</string>
+	<string name="mesh_status_good">
+		Bon à publier !
+	</string>
+	<string name="mesh_status_na">
+		N/A
+	</string>
+	<string name="mesh_status_none">
+		Aucun
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Un nombre différent de faces d&apos;application de texture est associé aux niveaux de détail.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Un nombre différent d&apos;instances de maillage est associé aux niveaux de détail.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Trop de sommets pour le niveau de détail.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Niveau de détail requis manquant.
+	</string>
+	<string name="layer_all">
+		Tout
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
new file mode 100644
index 0000000000..a6e598dd2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="PUBLIER UNE PETITE ANNONCE">
+	<text name="explanation_text">
+		Votre petite annonce sera visible pendant une semaine à partir du jour de sa publication.
+
+La position de votre annonce dans les listes dépend du montant que vous décidez de payer.
+
+Si vous choisissez de payer plus cher, votre publicité sera plus visible dans les résultats de recherche.
+	</text>
+	<text name="price_text">
+		Coût de l&apos;annonce :
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="OK" name="set_price_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index b835cc6d87..c5fb0ea0d4 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -14,7 +14,7 @@
 			<text name="info_size">
 				[AREA] m²
 			</text>
-			<text bottom_delta="-60" name="info_action">
+			<text name="info_action">
 				Pour vendre cette parcelle :
 			</text>
 			<text name="price_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
new file mode 100644
index 0000000000..9e2e4333aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="Périphériques audio">
+	<text name="voice_label">
+		Chat vocal
+	</text>
+	<check_box label="Activé" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index fd72e6ac15..09d77a8d34 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -125,6 +125,18 @@
 	<text name="prim_count">
 		Prims : [COUNT]
 	</text>
+	<text name="linked_set_count">
+		Groupes liés : [COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="Coût des groupes liés actuellement sélectionnés en tant que [prims],[physics complexity].">
+		Coût : [COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		Objets : [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="Coût des objets actuellement sélectionnés en tant que [prims] / [physics complexity].">
+		Coût : [COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
 			<panel.string name="text deed continued">
@@ -269,15 +281,6 @@
 				<combo_box.item label="Anneau" name="Ring"/>
 				<combo_box.item label="Sculptie" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="Pierre" name="Stone"/>
-				<combo_box.item label="Métal" name="Metal"/>
-				<combo_box.item label="Verre" name="Glass"/>
-				<combo_box.item label="Bois" name="Wood"/>
-				<combo_box.item label="Chair" name="Flesh"/>
-				<combo_box.item label="Plastique" name="Plastic"/>
-				<combo_box.item label="Caoutchouc" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				Découpe du tracé (déb./fin)
 			</text>
@@ -350,9 +353,19 @@
 				<combo_box.item label="Tore" name="Torus"/>
 				<combo_box.item label="Plan" name="Plane"/>
 				<combo_box.item label="Cylindre" name="Cylinder"/>
+				<combo_box.item label="Maillage" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Attributs" name="Features">
+			<panel.string name="None">
+				Aucun
+			</panel.string>
+			<panel.string name="Prim">
+				Prim
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Enveloppe convexe
+			</panel.string>
 			<text name="select_single">
 				Choisir une prim pour changer les attributs.
 			</text>
@@ -377,6 +390,23 @@
 			<spinner label="Point central" name="Light Focus"/>
 			<spinner label="Atténuation" name="Light Falloff"/>
 			<spinner label="Ambiance" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				Type de forme physique :
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Choisir un type de forme physique."/>
+			<combo_box name="material">
+				<combo_box.item label="Pierre" name="Stone"/>
+				<combo_box.item label="Métal" name="Metal"/>
+				<combo_box.item label="Verre" name="Glass"/>
+				<combo_box.item label="Bois" name="Wood"/>
+				<combo_box.item label="Chair" name="Flesh"/>
+				<combo_box.item label="Plastique" name="Plastic"/>
+				<combo_box.item label="Caoutchouc" name="Rubber"/>
+			</combo_box>
+			<spinner label="Gravité" name="Physics Gravity"/>
+			<spinner label="Friction" name="Physics Friction"/>
+			<spinner label="Densité" name="Physics Density"/>
+			<spinner label="Restitution" name="Physics Restitution"/>
 		</panel>
 		<panel label="Texture" name="Texture">
 			<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
index 5d2b554dc3..1076af44d9 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
 		<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
 		<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Modèle..." name="Upload Model"/>
+		<menu_item_call label="Assistant Modèle..." name="Upload Model Wizard"/>
 		<menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
 		<menu_item_call label="Définir les droits de chargement par défaut" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..af6bfcd028
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="Afficher les arêtes" name="show_edges"/>
+	<menu_item_check label="Afficher les propriétés physiques" name="show_physics"/>
+	<menu_item_check label="Afficher les textures" name="show_textures"/>
+	<menu_item_check label="Afficher la pondération de la peau" name="show_skin_weight"/>
+	<menu_item_check label="Afficher la position des articulations" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 1dd6da9d6f..d614cfe00c 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -120,6 +120,8 @@
 			<menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
 			<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+			<menu_item_call label="Modèle..." name="Upload Model"/>
+			<menu_item_call label="Assistant Modèle..." name="Upload Model Wizard"/>
 			<menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Annuler" name="Undo"/>
@@ -159,6 +161,7 @@
 			<menu_item_check label="Alpha" name="Alpha"/>
 			<menu_item_check label="Arbre" name="Tree"/>
 			<menu_item_check label="Avatars" name="Character"/>
+			<menu_item_check label="Patch de surface" name="Surface Patch"/>
 			<menu_item_check label="Ciel" name="Sky"/>
 			<menu_item_check label="Eau" name="Water"/>
 			<menu_item_check label="Sol" name="Ground"/>
@@ -217,6 +220,7 @@
 			<menu_item_check label="Console des catégories de textures" name="Texture Category"/>
 			<menu_item_check label="Chronos" name="Fast Timers"/>
 			<menu_item_check label="Mémoire" name="Memory"/>
+			<menu_item_check label="Statistiques de la scène" name="Scene Statistics"/>
 			<menu_item_call label="Infos de région vers la console de débogage" name="Region Info to Debug Console"/>
 			<menu_item_call label="Infos de groupe vers la console de débogage" name="Group Info to Debug Console"/>
 			<menu_item_call label="Infos de capacités vers la console de débogage" name="Capabilities Info to Debug Console"/>
@@ -227,6 +231,7 @@
 		</menu>
 		<menu label="Afficher les infos" name="Display Info">
 			<menu_item_check label="Afficher l&apos;heure" name="Show Time"/>
+			<menu_item_check label="Afficher le coût du chargement" name="Show Upload Cost"/>
 			<menu_item_check label="Afficher les infos de rendu" name="Show Render Info"/>
 			<menu_item_check label="Afficher les infos de texture" name="Show Texture Info"/>
 			<menu_item_check label="Afficher les matrices" name="Show Matrices"/>
@@ -252,8 +257,10 @@
 		</menu>
 		<menu label="Métadonnées de rendu" name="Render Metadata">
 			<menu_item_check label="Cadres" name="Bounding Boxes"/>
+			<menu_item_check label="Normales" name="Normals"/>
 			<menu_item_check label="Octree" name="Octree"/>
 			<menu_item_check label="Shadow Frusta" name="Shadow Frusta"/>
+			<menu_item_check label="Formes physiques" name="Physics Shapes"/>
 			<menu_item_check label="Occlusion" name="Occlusion"/>
 			<menu_item_check label="Lots de rendu" name="Render Batches"/>
 			<menu_item_check label="Type de mise à jour" name="Update Type"/>
@@ -261,9 +268,12 @@
 			<menu_item_check label="Priorité de la texture" name="Texture Priority"/>
 			<menu_item_check label="Zone de texture" name="Texture Area"/>
 			<menu_item_check label="Zone de face" name="Face Area"/>
+			<menu_item_check label="Infos sur le niveau de détail" name="LOD Info"/>
+			<menu_item_check label="File d&apos;attente pour la construction" name="Build Queue"/>
 			<menu_item_check label="Lumières" name="Lights"/>
 			<menu_item_check label="Squelette de collision" name="Collision Skeleton"/>
 			<menu_item_check label="Rayons" name="Raycast"/>
+			<menu_item_check label="Sculpture" name="Sculpt"/>
 		</menu>
 		<menu label="Rendu" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
@@ -271,7 +281,6 @@
 			<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
 			<menu_item_check label="Filaire" name="Wireframe"/>
 			<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
-			<menu_item_check label="Objets de mémoire vidéo" name="Framebuffer Objects"/>
 			<menu_item_check label="Éclairage et ombres" name="Lighting and Shadows"/>
 			<menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/>
@@ -370,6 +379,7 @@
 			<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="Textures HTTP" name="HTTP Textures"/>
+		<menu_item_check label="Inventaire HTTP" name="HTTP Inventory"/>
 		<menu_item_call label="Compresser les images" name="Compress Images"/>
 		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
 		<menu_item_check label="Console Window on next Run" name="Console Window"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 78890caabb..6bfab25087 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2157,6 +2157,12 @@ Cela risque d&apos;impacter votre mot de passe.
 	<notification name="RezItemNoPermissions">
 		Droits insuffisants pour rezzer l&apos;objet.
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		Impossible d&apos;envoyer d&apos;IM entre domaines parents.
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		Impossible de transférer l&apos;inventaire entre domaines parents.
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		Impossible de lire les données de la note actuellement.
 	</notification>
@@ -2734,6 +2740,10 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
 		Le modérateur ignore vos paroles.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		Ce chargement coûtera [PRICE] L$. Continuer ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Charger"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		Voulez-vous vraiment supprimer votre historique des téléportations ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -2745,6 +2755,9 @@ Le bouton sera affiché quand il y aura suffisamment de place.
 	<notification name="ShareNotification">
 		Sélectionnez les résidents avec lesquels partager l&apos;élément.
 	</notification>
+	<notification name="MeshUploadError">
+		Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Voulez-vous vraiment partager les articles suivants :
 
@@ -2761,6 +2774,19 @@ avec les résidents suivants :
 	<notification name="DeedToGroupFail">
 		Échec de cession au groupe.
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		Impossible d&apos;abandonner la parcelle [PARCEL_NAME] actuellement.
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		La parcelle [PARCEL_NAME] de [AREA] m² a été libérée.
+
+Vous disposerez d&apos;un délai de récupération à 0 L$ de [RECLAIM_PERIOD] heures avant qu&apos;elle soit mise en vente pour tous.
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		La parcelle [PARCEL_NAME] de [AREA] m² a été libérée.
+
+Elle est désormais disponible à l&apos;achat auprès de tous.
+	</notification>
 	<notification name="AvatarRezNotification">
 		([EXISTENCE] secondes d&apos;existence)
 Nuage de l&apos;avatar [NAME] disparu au bout de [TIME] secondes.
@@ -2901,6 +2927,10 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
 		Pour créer et modifier des groupes, vous devez utiliser le mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ? Le sélecteur de mode se trouve sur l&apos;écran de connexion.
 		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
 	</notification>
+	<notification label="" name="NoPlaceInfo">
+		L&apos;affichage du profil du lieu est uniquement disponible en mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ? Le sélecteur de mode se trouve sur l&apos;écran de connexion.
+		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
+	</notification>
 	<notification label="" name="NoPicks">
 		Pour créer et modifier des favoris, vous devez utiliser le mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ? Le sélecteur de mode se trouve sur l&apos;écran de connexion.
 		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2921,9 +2951,18 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
 		Pour pouvoir payer d&apos;autres résidents, vous devez utiliser le mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ?
 		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- Votre processeur ne remplit pas les conditions minimum requises.
-	</global>
+	<notification label="" name="NoInventory">
+		L&apos;affichage de l&apos;inventaire est uniquement disponible en mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ?
+		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		L&apos;Éditeur d&apos;apparence est uniquement disponible en mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ?
+		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		La recherche est uniquement disponible en mode Avancé. Voulez-vous quitter l&apos;application afin de changer de mode ?
+		<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Vous semblez ne pas avoir le matériel requis pour utiliser [APP_NAME]. [APP_NAME] requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les pilotes les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d&apos;exploitation.
 
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
index abdffd232a..e50fd2b6f3 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		Erreurs
 	</text>
+	<text name="text_box10">
+		Direct
+	</text>
 	<text name="text_box7">
 		Propriétaire
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 025a72a1d2..5bf2ef72f5 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="true" label="Eau transparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/>
+		<check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
 		<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
 		<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="Éclairage et ombres" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
+		<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
+		<text name="shadows_label">
+			Ombres :
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="Aucune" name="0"/>
+			<combo_box.item label="Soleil/Lune" name="1"/>
+			<combo_box.item label="Soleil/Lune + Projecteurs" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			Reflets dans l&apos;eau :
 		</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index ada4583648..b5795bebe2 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="Autoriser la revente" name="allow_land_resell_check"/>
 	<check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/>
 	<check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
+	<check_box label="Autoriser les objets de maillage" name="mesh_rez_enabled_check" tool_tip="Laisser les gens rezzer des objets de maillage dans cette région."/>
 	<spinner label="Nombre maximum d&apos;avatars" label_width="160" name="agent_limit_spin" width="240"/>
 	<spinner label="Bonus objet" label_width="160" name="object_bonus_spin" width="240"/>
 	<text label="Maturité" name="access_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
new file mode 100644
index 0000000000..a9802312dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Paramètres du périphérique" name="device_settings_panel">
+	<panel.string name="default_text">
+		Valeur par défaut
+	</panel.string>
+	<text name="Input">
+		Entrée
+	</text>
+	<text name="My volume label">
+		Mon volume :
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Régler le volume avec le curseur."/>
+	<text name="wait_text">
+		Veuillez patienter
+	</text>
+	<text name="Output">
+		Sortie
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 7e3e9b320d..3ec85551da 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -130,6 +130,139 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/index.php?lang=fr-FR
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
+http://secondlife.com/download
+
+Pour plus d&apos;informations, consultez la page FAQ ci-dessous :
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		Mise à jour facultative du client disponible : [VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		Mise à jour du client requise : [VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		L&apos;agent est déjà connecté.
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		Désolé ! La connexion a échoué.
+Veuillez vérifier que les éléments ci-dessous ont été correctement saisis :
+    * Nom d&apos;utilisateur (par exemple, bobsmith12 ou steller.sunshine)
+    * Mot de passe
+Assurez-vous également que la touche Verr. maj n&apos;est pas activée.
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		Votre mot de passe a été modifié pour des raisons de sécurité.
+Veuillez accéder à votre compte à la page http://secondlife.com/password
+et répondre à la question de sécurité afin de réinitialiser votre mot de passe.
+Nous vous prions de nous excuser pour la gêne occasionnée.
+	</string>
+	<string name="LoginFailedPasswordReset">
+		Vous allez devoir réinitialiser votre mot de passe suite à quelques changements effectués sur notre système.
+Pour cela, accédez à votre compte à la page http://secondlife.com/password
+et répondez à la question de sécurité. Votre mot de passe sera réinitialisé.
+Nous vous prions de nous excuser pour la gêne occasionnée.
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Life est temporairement fermé pour des raisons de maintenance.
+Seuls les employés peuvent actuellement y accéder.
+Consultez la page www.secondlife.com/status pour plus d&apos;informations.
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		Les connexions à Second Life sont temporairement limitées afin de s&apos;assurer que l&apos;expérience des utilisateurs présents dans le monde virtuel soit optimale.
+	 	
+Les personnes disposant de comptes gratuits ne pourront pas accéder à Second Life pendant ce temps afin de permettre à celles qui ont payé pour pouvoir utiliser Second Life puissent le faire.
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		Impossible d&apos;accéder à Second Life depuis cet ordinateur.
+Si vous pensez qu&apos;il s&apos;agit d&apos;une erreur, contactez
+l&apos;Assistance à l&apos;adresse suivante : support@secondlife.com.
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		Votre compte est inaccessible jusqu&apos;à
+[TIME], heure du Pacifique.
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		Nous n&apos;avons pas réussi à traiter votre demande.
+Pour obtenir de l&apos;aide, veuillez contacter l&apos;Assistance Second Life à la page suivante : http://secondlife.com/support.
+Si vous ne parvenez pas à changer de mot de passe, veuillez appeler le (866) 476-9763.
+	</string>
+	<string name="LoginFailedTransformError">
+		Incohérence des données lors de la connexion.
+Veuillez contacter support@secondlife.com.
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		Des opérations de maintenance mineures sont actuellement effectuées sur votre compte.
+Votre compte est inaccessible jusqu&apos;à
+[TIME], heure du Pacifique.
+Si vous pensez qu&apos;il s&apos;agit d&apos;une erreur, contactez l&apos;Assistance à l&apos;adresse suivante : support@secondlife.com
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		Le simulateur a renvoyé une erreur en réponse à la demande de déconnexion.
+	</string>
+	<string name="LoginFailedPendingLogout">
+		Le système est en train de vous déconnecter.
+Votre compte sera indisponible jusqu&apos;à
+[TIME], heure du Pacifique.
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		Impossible de créer de session valide.
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		Impossible de se connecter à un simulateur.
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		Votre compte permet uniquement d&apos;accéder à Second Life
+entre [START] et [END], heure du Pacifique.
+Veuillez réessayer au cours de la période indiquée.
+Si vous pensez qu&apos;il s&apos;agit d&apos;une erreur, contactez l&apos;Assistance à l&apos;adresse suivante : support@secondlife.com
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		Paramètres incorrects.
+Si vous pensez qu&apos;il s&apos;agit d&apos;une erreur, contactez l&apos;Assistance à l&apos;adresse suivante : support@secondlife.com
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		Le paramètre Prénom doit être alphanumérique.
+Si vous pensez qu&apos;il s&apos;agit d&apos;une erreur, contactez l&apos;Assistance à l&apos;adresse suivante : support@secondlife.com
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		Le paramètre Nom doit être alphanumérique.
+Si vous pensez qu&apos;il s&apos;agit d&apos;une erreur, contactez l&apos;Assistance à l&apos;adresse suivante : support@secondlife.com
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		La région est en train d&apos;être mise hors ligne.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		Agent absent de la région.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		Une autre session était en cours d&apos;ouverture au sein de la région.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		La session précédente était en cours de fermeture au sein de la région.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		Fermeture de la session précédente toujours en cours pour la région.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LogoutSucceeded">
+		Dernière session fermée au sein de la région.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		Processus de déconnexion commencé pour la région.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		Le système a commencé à fermer votre dernière session.
+Veuillez réessayer de vous connecter dans une minute.
+	</string>
 	<string name="AgentLostConnection">
 		Il y a peut-être des problèmes techniques dans cette région.  Veuillez vérifier votre connexion Internet.
 	</string>
@@ -441,6 +574,9 @@
 	<string name="symbolic folder link">
 		lien du dossier
 	</string>
+	<string name="mesh">
+		maillage
+	</string>
 	<string name="AvatarEditingAppearance">
 		(Apparence en cours de modification)
 	</string>
@@ -1180,6 +1316,9 @@
 	<string name="InvFolder Accessories">
 		Accessoires
 	</string>
+	<string name="InvFolder Meshes">
+		Maillages
+	</string>
 	<string name="InvFolder Friends">
 		Amis
 	</string>
@@ -3762,6 +3901,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="session_initialization_timed_out_error">
 		Expiration du délai d&apos;initialisation de la session
 	</string>
+	<string name="Home position set.">
+		Emplacement du domicile défini.
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 140f7bdc14..214ae96373 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -56,26 +56,32 @@ Si ringraziano i seguenti residenti per aver contribuito a rendere questa versio
 		<panel label="Licenze" name="licenses_panel">
 			<text_editor name="credits_editor">
 				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.
-  
-  Tutti i diritti riservati.  Leggi licenses.txt per maggiori dettagli.
+APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
+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.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (c) 2005, Google Inc.
+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.
+PCRE Copyright (c) 1997-2008 University of Cambridge
+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.
 
-  Chat vocale Codifica audio: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com.
+
+Tutti i diritti riservati.  Per informazioni dettagliate, vedere licenses.txt.
+
+Codifica audio chat vocale: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index b713bb8143..a96433d7aa 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -75,64 +75,64 @@ Vai al menu Mondo &gt; Informazioni sul terreno oppure seleziona un altro appezz
 			<text name="LandType">
 				Tipo:
 			</text>
-			<text left="119" name="LandTypeText">
+			<text name="LandTypeText">
 				Mainland / Homestead
 			</text>
 			<text name="ContentRating" width="115">
 				Categoria di accesso:
 			</text>
-			<text left="119" name="ContentRatingText">
+			<text name="ContentRatingText">
 				Adulti
 			</text>
 			<text name="Owner:">
 				Proprietario:
 			</text>
-			<text left="119" name="OwnerText" width="227"/>
+			<text name="OwnerText" width="227"/>
 			<text name="Group:">
 				Gruppo:
 			</text>
-			<text left="119" name="GroupText" width="227"/>
+			<text name="GroupText" width="227"/>
 			<button label="Imposta" name="Set..."/>
-			<check_box label="Permetti cessione al gruppo" left="119" name="check deed" tool_tip="Un funzionario del gruppo può cedere questa terra al gruppo stesso cosicchè essa sarà  supportata  dalle terre del gruppo."/>
+			<check_box label="Permetti cessione al gruppo" name="check deed" tool_tip="Un funzionario del gruppo può cedere questa terra al gruppo stesso cosicchè essa sarà  supportata  dalle terre del gruppo."/>
 			<button label="Cedi" name="Deed..." tool_tip="Puoi solo offrire terra se sei un funzionario del gruppo selezionato."/>
-			<check_box label="Il proprietario fa un contributo con la cessione" left="119" name="check contrib" tool_tip="Quando la terra è ceduta al gruppo, il proprietario precedente contribuisce con abbastanza allocazione di terra per supportarlo."/>
+			<check_box label="Il proprietario fa un contributo con la cessione" name="check contrib" tool_tip="Quando la terra è ceduta al gruppo, il proprietario precedente contribuisce con abbastanza allocazione di terra per supportarlo."/>
 			<text name="For Sale:">
 				In vendita:
 			</text>
-			<text left="119" name="Not for sale.">
+			<text name="Not for sale.">
 				Non in vendita.
 			</text>
-			<text left="119" name="For Sale: Price L$[PRICE].">
+			<text name="For Sale: Price L$[PRICE].">
 				Prezzo: [PRICE]L$ ([PRICE_PER_SQM]L$/m²).
 			</text>
-			<text left="119" name="SalePending" width="321"/>
+			<text name="SalePending" width="321"/>
 			<button bottom="-242" label="Vendi la terra..." label_selected="Vendi la terra..." name="Sell Land..."/>
-			<text left="119" name="For sale to">
+			<text name="For sale to">
 				In vendita a: [BUYER]
 			</text>
-			<text left="119" name="Sell with landowners objects in parcel." width="240">
+			<text name="Sell with landowners objects in parcel.">
 				Gli oggetti sono inclusi nella vendita.
 			</text>
-			<text left="119" name="Selling with no objects in parcel." width="240">
+			<text name="Selling with no objects in parcel.">
 				Gli oggetti non sono inclusi nella vendita.
 			</text>
-			<button bottom="-242" font="SansSerifSmall" label="Annulla la vendita del terreno" label_selected="Annulla la vendita del terreno" left="275" name="Cancel Land Sale" width="165"/>
+			<button font="SansSerifSmall" label="Annulla la vendita del terreno" label_selected="Annulla la vendita del terreno" name="Cancel Land Sale"/>
 			<text name="Claimed:" width="115">
 				Presa in possesso il:
 			</text>
-			<text left="119" name="DateClaimText">
+			<text name="DateClaimText">
 				Tue Aug 15 13:47:25 2006
 			</text>
 			<text name="PriceLabel">
 				Area:
 			</text>
-			<text left="119" name="PriceText" width="140">
+			<text name="PriceText" width="140">
 				4048 m²
 			</text>
 			<text name="Traffic:">
 				Traffico:
 			</text>
-			<text left="119" name="DwellText" width="140">
+			<text name="DwellText" width="140">
 				0
 			</text>
 			<button label="Acquista il terreno..." label_selected="Acquista il terreno..." left="130" name="Buy Land..." width="125"/>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
index a54751e629..84ed85e362 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="COMPRA I CONTENUTI">
 	<text name="contains_text">
-		[NAME] contiene:
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; contiene:
 	</text>
 	<text name="buy_text">
 		Compra per [AMOUNT]L$ da [NAME]?
diff --git a/indra/newview/skins/default/xui/it/floater_import_collada.xml b/indra/newview/skins/default/xui/it/floater_import_collada.xml
new file mode 100644
index 0000000000..eb4d0c0fdb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="Importa scena">
+	<text name="mesh count">
+		Reticoli: [COUNT]
+	</text>
+	<text name="texture count">
+		Texture: [COUNT]
+	</text>
+	<text name="status">
+		Stato: [STATUS]
+	</text>
+	<button label="Annulla" name="cancel"/>
+	<button label="OK" name="ok"/>
+	<string name="status_idle">
+		Pausa
+	</string>
+	<string name="status_uploading">
+		Caricamento in corso [NAME]
+	</string>
+	<string name="status_creating">
+		Creazione oggetto [NAME]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
index 49130285f2..cf790ee62e 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
 	<check_box label="Abiti" name="check_clothing"/>
 	<check_box label="Gesture" name="check_gesture"/>
 	<check_box label="Landmark" name="check_landmark"/>
+	<check_box label="Reticoli" name="check_mesh"/>
 	<check_box label="Notecard" name="check_notecard"/>
 	<check_box label="Oggetti" name="check_object"/>
 	<check_box label="Script" name="check_script"/>
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
new file mode 100644
index 0000000000..a17b8b36c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="Carica modello">
+	<string name="status_idle">
+		Pausa
+	</string>
+	<string name="status_reading_file">
+		Caricamento in corso...
+	</string>
+	<string name="status_generating_meshes">
+		Generazione reticoli...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Errore: numero di vertici maggiore di 65534, annullato.
+	</string>
+	<string name="high">
+		Alto
+	</string>
+	<string name="medium">
+		Medio
+	</string>
+	<string name="low">
+		Basso
+	</string>
+	<string name="lowest">
+		Bassissimo
+	</string>
+	<string name="mesh_status_good">
+		Invia!
+	</string>
+	<string name="mesh_status_na">
+		N/D
+	</string>
+	<string name="mesh_status_none">
+		Nessuno
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Ai vari livelli del dettaglio corrispondono numeri diversi di faccette con texture.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Ai vari livelli del dettaglio corrispondono numeri diversi istanze di reticoli.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Troppi vertici per il livello di dettaglio.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Livello di dettaglio minimo mancante.
+	</string>
+	<string name="layer_all">
+		Tutto
+	</string>
+	<string name="decomposing">
+		Analisi in corso...
+	</string>
+	<string name="simplifying">
+		Semplificazione in corso...
+	</string>
+	<text name="name_label">
+		Nome:
+	</text>
+	<text name="lod_label">
+		Anteprima:
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
+		<combo_item name="high">
+			Livello di dettaglio: Alto
+		</combo_item>
+		<combo_item name="medium">
+			Livello di dettaglio: Medio
+		</combo_item>
+		<combo_item name="low">
+			Livello di dettaglio: Basso
+		</combo_item>
+		<combo_item name="lowest">
+			Livello di dettaglio: Bassissimo
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			Costo risorsa: [COST]
+		</text>
+		<text name="physics cost">
+			Costo fisica: [COST]
+		</text>
+		<text name="upload fee">
+			Costo caricamento: N/D
+		</text>
+	</panel>
+	<text name="status">
+		[STATUS]
+	</text>
+	<button label="Predefiniti" name="reset_btn" tool_tip="Ripristina predefiniti"/>
+	<button label="Carica sul server" name="ok_btn" tool_tip="Carica al simulatore"/>
+	<button label="Annulla" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="Livello di dettaglio" name="lod_panel">
+			<text name="lod_table_header">
+				Seleziona livello di dettaglio:
+			</text>
+			<text name="high_label" value="Alto"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="Medio"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="Basso"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="Bassissimo"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				Livello di dettaglio: [DETAIL]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="Carica da file" name="lod_from_file"/>
+				<radio_item label="Genera automaticamente" name="lod_auto_generate"/>
+				<radio_item label="Nessuno" name="lod_none"/>
+			</radio_group>
+			<button label="Sfoglia..." name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					Limite triangoli
+				</combo_item>
+				<combo_item name="error_threshold">
+					Limite errori
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				Operatore costruzione:
+			</text>
+			<text name="queue_mode_text">
+				Modalità di coda:
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					Collassa bordo
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					Collassa mezzo bordo
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					Ingordo
+				</combo_item>
+				<combo_item name="lazy">
+					Pigro
+				</combo_item>
+				<combo_item name="independent">
+					Indipendente
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				Modalità bordo:
+			</text>
+			<text name="share_tolderance_text">
+				Tolleranza condivisione:
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					Sblocca
+				</combo_item>
+				<combo_item name="border_lock">
+					Blocca
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				Angolo piega:
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="Fisica" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="File:" name="physics_load_from_file"/>
+					<radio_item label="Usa livello di dettaglio:" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="Livello di dettaglio per forma fisica">
+					<combo_item name="physics_lowest">
+						Bassissimo
+					</combo_item>
+					<combo_item name="physics_low">
+						Basso
+					</combo_item>
+					<combo_item name="physics_medium">
+						Medio
+					</combo_item>
+					<combo_item name="physics_high">
+						Alto
+					</combo_item>
+				</combo_box>
+				<button label="Sfoglia..." name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="Liscia:" name="Smooth"/>
+				<check_box label="Chiudi fori (lento)" name="Close Holes (Slow)"/>
+				<button label="Analizza" name="Decompose"/>
+				<button label="Annulla" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="Passaggi:" name="Combine Quality"/>
+				<slider label="Scala dettagli:" name="Detail Scale"/>
+				<slider label="Mantieni:" name="Retain%"/>
+				<button label="Semplifica" name="Simplify"/>
+				<button label="Annulla" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="Ampiezza anteprima:" name="physics_explode"/>
+				<text name="physics_triangles">
+					Triangoli: [TRIANGLES]
+				</text>
+				<text name="physics_points">
+					Vertici: [POINTS]
+				</text>
+				<text name="physics_hulls">
+					Inviluppi: [HULLS]
+				</text>
+			</panel>
+		</panel>
+		<panel label="Modificatori" name="modifiers_panel">
+			<spinner name="import_scale" value="1.0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] m
+			</text>
+			<check_box label="Texture" name="upload_textures"/>
+			<check_box label="Peso pelle" name="upload_skin"/>
+			<check_box label="Posizioni giunti" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0.0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_model_wizard.xml b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
new file mode 100644
index 0000000000..b17f731089
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="PROCEDURA GUIDATA CARICA MODELLO">
+	<button label="5. Carica sul server" name="upload_btn"/>
+	<button label="4. Rivedi" name="review_btn"/>
+	<button label="3. Fisica" name="physics2_btn"/>
+	<button label="3. Fisica" name="physics_btn"/>
+	<button label="2. Ottimizza" name="optimize_btn"/>
+	<button label="1. Seleziona file" name="choose_file_btn"/>
+	<panel name="choose_file_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Carica modello
+			</text>
+		</panel>
+		<text name="description">
+			Questa procedura guidata permette di importare modelli di reticoli in Second Life.  Specificare prima un  file che contiene il modello da importare.  Second Life supporta file COLLADA (.dae).
+		</text>
+		<panel name="content">
+			<text name="Cache location">
+				Nome file:
+			</text>
+			<button label="Sfoglia..." label_selected="Sfoglia..." name="browse"/>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="optimize_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Ottimizza
+			</text>
+		</panel>
+		<text name="description">
+			Questa procedura guidata ha ottimizzato il modello per migliorare le prestazioni. Si possono variare i risultati dell&apos;ottimizzazione in basso o fare clic su Avanti per continuare.
+		</text>
+		<panel name="content">
+			<text name="high_detail_text">
+				Genera livello di dettaglio: Alto
+			</text>
+			<text name="medium_detail_text">
+				Genera livello di dettaglio: Medio
+			</text>
+			<text name="low_detail_text">
+				Genera livello di dettaglio: Basso
+			</text>
+			<text name="lowest_detail_text">
+				Genera livello di dettaglio: Bassissimo
+			</text>
+		</panel>
+		<panel name="content2">
+			<text name="lod_label">
+				Anteprima modello:
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="high">
+					Alto
+				</combo_item>
+				<combo_item name="medium">
+					Medio
+				</combo_item>
+				<combo_item name="low">
+					Basso
+				</combo_item>
+				<combo_item name="lowest">
+					Bassissimo
+				</combo_item>
+			</combo_box>
+			<text name="streaming cost">
+				Costo risorsa:    [COST]
+			</text>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Fisica
+			</text>
+		</panel>
+		<text name="description">
+			La procedura guidata permette di creare una forma fisica che determina come l&apos;oggetto interagisce con altri oggetti e avatar. Impostare il comando a scorrimento sul livello di dettaglio appropriato per l&apos;uso dell&apos;oggetto:
+		</text>
+		<panel name="content">
+			<text name="streaming cost">
+				Costo risorsa:       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics2_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Fisica
+			</text>
+		</panel>
+		<text name="description">
+			Visualizza in anteprima la forma fisica in basso, quindi fai clic su Avanti per continuare.  Per modificare la forma fisica, fare clic su Indietro.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Anteprima modello:
+			</text>
+			<combo_box name="preview_lod_combo3" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="high">
+					Alto
+				</combo_item>
+				<combo_item name="medium">
+					Medio
+				</combo_item>
+				<combo_item name="low">
+					Basso
+				</combo_item>
+				<combo_item name="lowest">
+					Bassissimo
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+			<text name="streaming cost">
+				Costo risorsa:       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="review_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Rivedi
+			</text>
+		</panel>
+		<text name="description">
+			Rivedere i dettagli in basso, quindi fare clic su Carica per caricare il modello. Il tuo saldo in L$ verrà addebitato quando fai clic su Carica.
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				Anteprima modello:
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="high">
+					Alto
+				</combo_item>
+				<combo_item name="medium">
+					Medio
+				</combo_item>
+				<combo_item name="low">
+					Basso
+				</combo_item>
+				<combo_item name="lowest">
+					Bassissimo
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+		<text name="streaming cost">
+			Costo risorsa:         [COST]
+		</text>
+		<text name="physics cost">
+			Costo fisica:        [COST]
+		</text>
+	</panel>
+	<panel name="upload_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				Caricamento completato.
+			</text>
+		</panel>
+		<text name="description">
+			Congratulazioni. Il modello è stato caricato correttamente  e ora puoi trovarlo nella cartella Oggetti nel tuo inventario.
+		</text>
+	</panel>
+	<button label="&lt;&lt; Indietro" name="back"/>
+	<button label="Avanti &gt;&gt;" name="next"/>
+	<button label="Carica" name="upload" tool_tip="Carica al simulatore"/>
+	<button label="Annulla" name="cancel"/>
+	<button label="Chiudi" name="close"/>
+	<spinner name="import_scale" value="1.0"/>
+	<string name="status_idle">
+		Pausa
+	</string>
+	<string name="status_reading_file">
+		Caricamento in corso...
+	</string>
+	<string name="status_generating_meshes">
+		Generazione reticoli...
+	</string>
+	<string name="status_vertex_number_overflow">
+		Errore: numero di vertici maggiore di 65534, annullato.
+	</string>
+	<string name="high">
+		Alto
+	</string>
+	<string name="medium">
+		Medio
+	</string>
+	<string name="low">
+		Basso
+	</string>
+	<string name="lowest">
+		Bassissimo
+	</string>
+	<string name="mesh_status_good">
+		Invia!
+	</string>
+	<string name="mesh_status_na">
+		N/D
+	</string>
+	<string name="mesh_status_none">
+		Nessuno
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		Ai vari livelli del dettaglio corrispondono numeri diversi di faccette con texture.
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		Ai vari livelli del dettaglio corrispondono numeri diversi istanze di reticoli.
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		Troppi vertici per il livello di dettaglio.
+	</string>
+	<string name="mesh_status_missing_lod">
+		Livello di dettaglio minimo mancante.
+	</string>
+	<string name="layer_all">
+		Tutto
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
new file mode 100644
index 0000000000..06c838a981
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="PUBBLICA L&apos;ANNUNCIO PUBBLICITARIO">
+	<text name="explanation_text">
+		La tua inserzione sarà visibile per una settimana dal giorno della sua pubblicazione.
+
+La posizione del tuo annuncio nella lista delle inserzioni è determinata dalla somma pagata.
+
+Le inserzioni con un pagamento più alto saranno più visibili nella lista dei risultati della ricerca.
+	</text>
+	<text name="price_text">
+		Prezzo per inserzione:
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="OK" name="set_price_btn"/>
+	<button label="Annulla" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
new file mode 100644
index 0000000000..df4b8f4878
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="Dispositivi sonori">
+	<text name="voice_label">
+		Chat vocale
+	</text>
+	<check_box label="Abilitato" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index 52b5566006..23e01a3943 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -126,6 +126,18 @@
 	<text name="prim_count">
 		Prim: [COUNT]
 	</text>
+	<text name="linked_set_count">
+		Set collegati: [COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="Costo dei set collegati attualmente selezionati come [prim],[complessità fisica]">
+		Costo: [COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		Oggetti: [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="Costo degli oggetti attualmente selezionati come [prim] / [complessità fisica]">
+		Costo: [COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Generale" name="General">
 			<panel.string name="text deed continued">
@@ -276,15 +288,6 @@
 				<combo_box.item label="Anello" name="Ring"/>
 				<combo_box.item label="Sculpted" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="Pietra" name="Stone"/>
-				<combo_box.item label="Metallo" name="Metal"/>
-				<combo_box.item label="Vetro" name="Glass"/>
-				<combo_box.item label="Legno" name="Wood"/>
-				<combo_box.item label="Carne" name="Flesh"/>
-				<combo_box.item label="Plastica" name="Plastic"/>
-				<combo_box.item label="Gomma" name="Rubber"/>
-			</combo_box>
 			<text left_delta="-10" name="text cut" width="170">
 				Riduci una sezione (inizio/fine)
 			</text>
@@ -357,9 +360,19 @@
 				<combo_box.item label="Toroidale" name="Torus"/>
 				<combo_box.item label="Piana" name="Plane"/>
 				<combo_box.item label="Cilindrica" name="Cylinder"/>
+				<combo_box.item label="Reticolo" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Caratteristiche" name="Features">
+			<panel.string name="None">
+				Nessuno
+			</panel.string>
+			<panel.string name="Prim">
+				Prim
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Inviluppo convesso
+			</panel.string>
 			<text name="select_single">
 				Seleziona solo un prim per modificarne le caratteristiche.
 			</text>
@@ -384,6 +397,23 @@
 			<spinner label="Centro focale" name="Light Focus"/>
 			<spinner label="Attenuazione" name="Light Falloff"/>
 			<spinner label="Atmosfera" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				Tipo di forma fisica:
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Selezionare il tipo di forma fisica"/>
+			<combo_box name="material">
+				<combo_box.item label="Pietra" name="Stone"/>
+				<combo_box.item label="Metallo" name="Metal"/>
+				<combo_box.item label="Vetro" name="Glass"/>
+				<combo_box.item label="Legno" name="Wood"/>
+				<combo_box.item label="Carne" name="Flesh"/>
+				<combo_box.item label="Plastica" name="Plastic"/>
+				<combo_box.item label="Gomma" name="Rubber"/>
+			</combo_box>
+			<spinner label="Gravità" name="Physics Gravity"/>
+			<spinner label="Frizione" name="Physics Friction"/>
+			<spinner label="Densità" name="Physics Density"/>
+			<spinner label="Restituzione" name="Physics Restitution"/>
 		</panel>
 		<panel label="Texture" name="Texture">
 			<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
index a2535ce48d..62da61cd6b 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<menu_item_call label="Immagine ([COST]L$)..." name="Upload Image"/>
 		<menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/>
 		<menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/>
+		<menu_item_call label="Modella..." name="Upload Model"/>
+		<menu_item_call label="Procedura guidata modellazione..." name="Upload Model Wizard"/>
 		<menu_item_call label="In blocco ([COST]L$ per file)..." name="Bulk Upload"/>
 		<menu_item_call label="Definisci diritti di caricamento predefiniti" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..5012e6450f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="Mostra bordi" name="show_edges"/>
+	<menu_item_check label="Mostra fisica" name="show_physics"/>
+	<menu_item_check label="Mostra texture" name="show_textures"/>
+	<menu_item_check label="Mostra peso pelle" name="show_skin_weight"/>
+	<menu_item_check label="Mostra posizioni giunti" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 6599810a67..e4df0630d9 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -120,6 +120,8 @@
 			<menu_item_call label="Immagine ([COST] L$)..." name="Upload Image"/>
 			<menu_item_call label="Suono ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animazione ([COST] L$)..." name="Upload Animation"/>
+			<menu_item_call label="Modella..." name="Upload Model"/>
+			<menu_item_call label="Procedura guidata modellazione..." name="Upload Model Wizard"/>
 			<menu_item_call label="In blocco ([COST] L$ per file)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Annulla" name="Undo"/>
@@ -159,7 +161,7 @@
 			<menu_item_check label="Alpha (Trasparenza)" name="Alpha"/>
 			<menu_item_check label="Albero" name="Tree"/>
 			<menu_item_check label="Avatar" name="Character"/>
-			<menu_item_check label="Superficie" name="SurfacePath"/>
+			<menu_item_check label="Superficie chiusa" name="Surface Patch"/>
 			<menu_item_check label="Cielo" name="Sky"/>
 			<menu_item_check label="Acqua" name="Water"/>
 			<menu_item_check label="Suolo" name="Ground"/>
@@ -217,6 +219,7 @@
 			<menu_item_check label="Console categoria texture" name="Texture Category"/>
 			<menu_item_check label="Timer veloci" name="Fast Timers"/>
 			<menu_item_check label="Memoria" name="Memory"/>
+			<menu_item_check label="Statistiche scena" name="Scene Statistics"/>
 			<menu_item_call label="Informazioni regione sulla console di debug" name="Region Info to Debug Console"/>
 			<menu_item_check label="Fotocamera" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
@@ -224,6 +227,7 @@
 		</menu>
 		<menu label="Mostra informazioni" name="Display Info">
 			<menu_item_check label="Mostra orario" name="Show Time"/>
+			<menu_item_check label="Mostra costo di caricamento" name="Show Upload Cost"/>
 			<menu_item_check label="Mostra informazioni di rendering" name="Show Render Info"/>
 			<menu_item_check label="Mostra info sulla texture" name="Show Texture Info"/>
 			<menu_item_check label="Mostra colore sotto il cursore" name="Show Color Under Cursor"/>
@@ -246,7 +250,12 @@
 			<menu_item_check label="Test frame" name="Frame Test"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
+			<menu_item_check label="Normali" name="Normals"/>
+			<menu_item_check label="Forme fisica" name="Physics Shapes"/>
 			<menu_item_check label="Aggiorna tipo" name="Update Type"/>
+			<menu_item_check label="Info livello dettaglio" name="LOD Info"/>
+			<menu_item_check label="Crea coda" name="Build Queue"/>
+			<menu_item_check label="Scolpisci" name="Sculpt"/>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
@@ -312,6 +321,7 @@
 			<menu_item_call label="Debug texture dell&apos;avatar" name="Debug Avatar Textures"/>
 		</menu>
 		<menu_item_check label="Texture HTTP" name="HTTP Textures"/>
+		<menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
 		<menu_item_check label="Finestra Console al prossimo lancio" name="Console Window"/>
 		<menu_item_call label="Richiedi diritti Admin" name="Request Admin Options"/>
 		<menu_item_call label="Lascia stato Admin" name="Leave Admin Options"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 6619260670..f50051c004 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2163,6 +2163,12 @@ Questo potrebbe incidere sulla tua password.
 	<notification name="RezItemNoPermissions">
 		Permessi insufficienti per creare un oggetto.
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		Impossibile inviare IM tra proprietà principali diverse.
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		Impossibile trasferire l&apos;inventario tra proprietà principali diverse.
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		Impossibile caricare la notecard in questo momento.
 	</notification>
@@ -2736,6 +2742,10 @@ Per sicurezza, verranno bloccati per alcuni secondi.
 		La tua voce è stata interrotta dal moderatore.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		Questo caricamento costerà L$[PRICE]. Continuare con il caricamento?
+		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Carica"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		Sei sicuro di volere cancellare la cronologia dei tuoi teleport?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -2747,6 +2757,9 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 	<notification name="ShareNotification">
 		Scegli i residenti con i quali condividere.
 	</notification>
+	<notification name="MeshUploadError">
+		[LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Sei sicuro di volere condividere gli oggetti
 
@@ -2763,6 +2776,19 @@ Con i seguenti residenti?
 	<notification name="DeedToGroupFail">
 		Cessione al gruppo non riuscita.
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		Il lotto [PARCEL_NAME] non può essere abbandonato in questo momento.
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		Il lotto di [AREA] m² &apos;[PARCEL_NAME]&apos; è stato rilasciato.
+
+Hai [RECLAIM_PERIOD] ore per riprendere possesso per L$0 prima che venga messo in vendita a chiunque altro.
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		Il lotto di [AREA] m² &apos;[PARCEL_NAME]&apos; è stato rilasciato.
+
+Ora è disponibile per l&apos;acquisto da parte di chiunque.
+	</notification>
 	<notification name="AvatarRezNotification">
 		( in esistenza da [EXISTENCE] secondi )
 Nuvola avatar &apos;[NAME]&apos; dileguata dopo [TIME] secondi.
@@ -2903,6 +2929,10 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
 		La creazione e la modifica dei gruppi sono disponibili solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
 		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
 	</notification>
+	<notification label="" name="NoPlaceInfo">
+		La visualizzazione del profilo del luogo è disponibile solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
 	<notification label="" name="NoPicks">
 		La creazione e la modifica dei luoghi preferiti sono disponibili solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
 		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
@@ -2923,9 +2953,18 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
 		Il pagamento ad altri residenti è disponibile solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
 		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- La velocità della tua CPU non soddisfa i requisiti minimi.
-	</global>
+	<notification label="" name="NoInventory">
+		La visualizzazione dell&apos;inventario è disponibile solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		L&apos;editor dell&apos;aspetto è disponibile solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		La ricerca è disponibile solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Non sembra che tu abbia i requisiti hardware adeguati per [APP_NAME]. [APP_NAME] richiede una scheda grafica OpenGL con supporto multitexture. Se ne hai una in dotazione, accertati di avere i driver, i service pack e i patch più recenti per la scheda grafica e per il sistema operativo.
 
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
index 167de5d028..016970d9a3 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		Errori
 	</text>
+	<text name="text_box10">
+		Diretto
+	</text>
 	<text name="text_box7">
 		Proprietario
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 7d21b8ccc7..1f2b97af45 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="vero" label="Acqua trasparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Piccoli rilievi e scintillii" name="BumpShiny"/>
+		<check_box initial_value="true" label="Luci locali" name="LocalLights"/>
 		<check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
 		<check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="Luci e ombre" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
+		<check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
+		<text name="shadows_label">
+			Ombre:
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="Nessuno" name="0"/>
+			<combo_box.item label="Sole/Luna" name="1"/>
+			<combo_box.item label="Sole/Luna + Proiettori" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			Riflessi nell’acqua:
 		</text>
diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml
index 6ca5dd878e..c550e005ae 100644
--- a/indra/newview/skins/default/xui/it/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="Abilita la rivendita del terreno" name="allow_land_resell_check"/>
 	<check_box label="Abilita unione/suddivisione del terreno" name="allow_parcel_changes_check"/>
 	<check_box label="Proibisci che il terreno appaia nelle ricerche" name="block_parcel_search_check" tool_tip="Permetti che le persone vedano questa regione e le sue suddivisioni nei risultati delle ricerche"/>
+	<check_box label="Consenti oggetti con reticolo" name="mesh_rez_enabled_check" tool_tip="Permetti alle persone di rezzare oggetti con reticolo su questa regione"/>
 	<spinner label="Limite massimo di avatar" label_width="135" name="agent_limit_spin" width="190"/>
 	<spinner label="Bonus di oggetti" label_width="135" name="object_bonus_spin" width="190"/>
 	<text label="Maturità" name="access_text" width="120">
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
new file mode 100644
index 0000000000..8e7f0c8dc5
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Impostazioni dispositivo" name="device_settings_panel">
+	<panel.string name="default_text">
+		Predefinito
+	</panel.string>
+	<text name="Input">
+		Input
+	</text>
+	<text name="My volume label">
+		Il mio volume:
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia il volume utilizzando questa barra"/>
+	<text name="wait_text">
+		Attendi
+	</text>
+	<text name="Output">
+		Output
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 1513ddb8a5..cbe8ef24c4 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -124,6 +124,139 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/index.php?lang=it-IT
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
+http://secondlife.com/download.
+
+Per maggiori informazioni, consulta le domande frequenti alla pagina seguente:
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		Disponibile aggiornamento facoltativo viewer: [VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		Aggernamento viewer richiesto: [VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		Questo agente ha già eseguito il login.
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		Siamo spiacenti. Il tentativo di accesso non è riuscito.
+Verifica di avere inserito correttamente
+    * Nome utente (come robby12 o Stella Soleggiato)
+    * Password
+Verifica anche che il blocco delle maiuscole non sia attivato.
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		Come misura precauzionale, la tua password è stata cambiata.
+Visita la pagina del tuo account a http://secondlife.com/password
+e rispondi alla domanda di sicurezza per reimpostare la password.
+Ci scusiamo per l&apos;inconveniente.
+	</string>
+	<string name="LoginFailedPasswordReset">
+		Abbiamo effettuato delle modifiche al sistema che richiedono di reimpostare la password.
+Visita la pagina del tuo account a http://secondlife.com/password
+e rispondi alla domanda di sicurezza per reimpostare la password.
+Ci scusiamo per l&apos;inconveniente.
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Life è chiuso temporaneamente per manutenzione.
+Al momento, solo i dipendenti possono eseguire l&apos;accesso.
+Visita www.secondlife.com/status per aggiornamenti.
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		L&apos;accesso a Second Life è temporaneamente limitato per garantire che chi è nel mondo virtuale abbia la migliore esperienza possibile.
+	 	
+Le persona con account gratuiti non potrenno accedere a Second Life durante questo periodo, per lasciare spazio alle persone che hanno pagato per Second Life.
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		Non si può accedere a Second Life da questo computer.
+Se ritieni che si tratta di un errore, contatta
+support@secondlife.com.
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		Il tuo account non è accessibile fino alle
+[TIME] fuso orario del Pacifico.
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		Non siamo attualmente in grado di completare la tua richiesta.
+Contatta l&apos;assistenza Second Life alla pagina http://secondlife.com/support.
+Se non sei in grado di cambiare la password, chiama (866) 476-9763.
+	</string>
+	<string name="LoginFailedTransformError">
+		Dati incompatibili rilevati durante l&apos;accesso.
+Contattare support@secondlife.com.
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		Il tuo account è in fase di leggera manutenzione.
+Il tuo account non è accessibile fino alle
+[TIME] fuso orario del Pacifico.
+Se ritieni che si tratta di un errore, contatta support@secondlife.com.
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		Errore del simulatore in seguito alla richiesta di logout.
+	</string>
+	<string name="LoginFailedPendingLogout">
+		Il sistema sta eseguendo il logout in questo momento.
+Il tuo account non sarà disponibile fino alle
+[TIME] fuso orario del Pacifico.
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		Non è possibile creare una sessione valida.
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		Non è possibile collegarsi a un simulatore.
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		Il tuo account può accedere a Second Life solo
+tra le [START] e le [END] fuso orario del Pacifico.
+Torna durante quell&apos;orario.
+Se ritieni che si tratta di un errore, contatta support@secondlife.com.
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		Parametri errati.
+Se ritieni che si tratta di un errore, contatta support@secondlife.com.
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		Il parametro Nome deve includere solo caratteri alfanumerici.
+Se ritieni che si tratta di un errore, contatta support@secondlife.com.
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		Il parametro Cognome deve includere solo caratteri alfanumerici.
+Se ritieni che si tratta di un errore, contatta support@secondlife.com.
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		La regione sta passando allo stato non in linea.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		L&apos;agente non è nella regione.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		La regione ha eseguito l&apos;accesso in un&apos;altre sessione.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		La regione stava eseguendo il logout della sessione precedente.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		La regione sta ancora eseguendo il logout della sessione precedente.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LogoutSucceeded">
+		La regione ha eseguito il logout dell&apos;ultima sessione.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		La regione ha iniziato la procedura di logout.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		Il sistema ha iniziato il logout dell&apos;ultima sessione.
+Prova ad accedere nuovamente tra un minuto.
+	</string>
 	<string name="AgentLostConnection">
 		Questa regione sta avendo problemi.  Verifica la tua connessione a Internet.
 	</string>
@@ -432,6 +565,9 @@
 	<string name="symbolic folder link">
 		link alla cartella
 	</string>
+	<string name="mesh">
+		reticolo
+	</string>
 	<string name="AvatarAway">
 		Assente
 	</string>
@@ -1159,6 +1295,9 @@
 	<string name="InvFolder Accessories">
 		Accessori
 	</string>
+	<string name="InvFolder Meshes">
+		Reticoli
+	</string>
 	<string name="InvFolder Friends">
 		Amici
 	</string>
@@ -3666,6 +3805,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="session_initialization_timed_out_error">
 		Sessione di inizializzazione scaduta
 	</string>
+	<string name="Home position set.">
+		Posizione di base impostata.
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 61fedede35..56708001c2 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -56,26 +56,32 @@ Qt Webkit バージョン： [QT_WEBKIT_VERSION]
 		<panel label="ライセンス" name="licenses_panel">
 			<text_editor name="credits_editor">
 				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)
-  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.
-  
-  無断転写、複製、転載を禁じます。  詳細はlicenses.txtを参照してください。
+APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
+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.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (c) 2005, Google Inc.
+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.
+PCRE Copyright (c) 1997-2008 University of Cambridge
+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.
 
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
+
+無断複写・複製・転載を禁じます。詳細については licenses.txt をご参照ください。
+
+ボイスチャットのオーディオコーディング：Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index ed17736eb3..7e4932c78f 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater min_width="340" name="floater_buy_contents" title="中身の購入" width="340">
 	<text name="contains_text" width="320">
-		[NAME] の中身：
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; に含まれるもの：
 	</text>
 	<scroll_list name="item_list" width="310"/>
 	<text name="buy_text" width="320">
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
new file mode 100644
index 0000000000..65edafb169
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="風景のインポート">
+	<text name="mesh count">
+		メッシュ： [COUNT]
+	</text>
+	<text name="texture count">
+		テクスチャ： [COUNT]
+	</text>
+	<text name="status">
+		ステータス： [STATUS]
+	</text>
+	<button label="取り消し" name="cancel"/>
+	<button label="OK" name="ok"/>
+	<string name="status_idle">
+		待機状態
+	</string>
+	<string name="status_uploading">
+		[NAME]をアップロード中
+	</string>
+	<string name="status_creating">
+		オブジェクト[NAME]を作成中
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 47a63e5e20..47d57da031 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
 	<check_box label="服" name="check_clothing"/>
 	<check_box label="ジェスチャー" name="check_gesture"/>
 	<check_box label="ランドマーク" name="check_landmark"/>
+	<check_box label="メッシュ" name="check_mesh"/>
 	<check_box label="ノートカード" name="check_notecard"/>
 	<check_box label="オブジェクト" name="check_object"/>
 	<check_box label="スクリプト" name="check_script"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
new file mode 100644
index 0000000000..5eb141a28c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="モデルをアップロード">
+	<string name="status_idle">
+		待機状態
+	</string>
+	<string name="status_reading_file">
+		ローディング...
+	</string>
+	<string name="status_generating_meshes">
+		メッシュを作成中
+	</string>
+	<string name="status_vertex_number_overflow">
+		エラー：頂点の数が65534を超過したので中止されました。
+	</string>
+	<string name="high">
+		高
+	</string>
+	<string name="medium">
+		中
+	</string>
+	<string name="low">
+		低
+	</string>
+	<string name="lowest">
+		最低
+	</string>
+	<string name="mesh_status_good">
+		発送
+	</string>
+	<string name="mesh_status_na">
+		該当なし
+	</string>
+	<string name="mesh_status_none">
+		なし
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		テクスチャ編集可能な面の数は描画詳細度に応じて異なります。
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		メッシュインスタンスの数は描画詳細度に応じて異なります。
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		描画詳細度に対して頂点の数が多すぎます。
+	</string>
+	<string name="mesh_status_missing_lod">
+		必要な描画詳細度が見つかりません。
+	</string>
+	<string name="layer_all">
+		全て
+	</string>
+	<string name="decomposing">
+		分析中
+	</string>
+	<string name="simplifying">
+		単純化
+	</string>
+	<text name="name_label">
+		名前：
+	</text>
+	<text name="lod_label">
+		プレビュー：
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
+		<combo_item name="high">
+			描画詳細度：高
+		</combo_item>
+		<combo_item name="medium">
+			描画詳細度：中
+		</combo_item>
+		<combo_item name="low">
+			描画詳細度：低
+		</combo_item>
+		<combo_item name="lowest">
+			描画詳細度：最低
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			リソース料金： [COST]
+		</text>
+		<text name="physics cost">
+			物理効果料金： [COST]
+		</text>
+		<text name="upload fee">
+			アップロード手数料：該当なし
+		</text>
+	</panel>
+	<text name="status">
+		[STATUS]
+	</text>
+	<button label="デフォルト" name="reset_btn" tool_tip="デフォルトにリセット"/>
+	<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
+	<button label="取り消し" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="描画詳細度" name="lod_panel">
+			<text name="lod_table_header">
+				描画詳細度を選択：
+			</text>
+			<text name="high_label" value="高"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="中"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="低"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="最低"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				描画詳細度： [DETAIL]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="ファイルからロード" name="lod_from_file"/>
+				<radio_item label="自動作成" name="lod_auto_generate"/>
+				<radio_item label="なし" name="lod_none"/>
+			</radio_group>
+			<button label="参照" name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					三角形の限度数
+				</combo_item>
+				<combo_item name="error_threshold">
+					エラーしきい値
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				制作演算子：
+			</text>
+			<text name="queue_mode_text">
+				キューモード：
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					稜の完全複合
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					稜の半複合
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					グリーディ
+				</combo_item>
+				<combo_item name="lazy">
+					レイジー
+				</combo_item>
+				<combo_item name="independent">
+					インディペンデント
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				境界線モード：
+			</text>
+			<text name="share_tolderance_text">
+				共有誤差：
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					ロック解除
+				</combo_item>
+				<combo_item name="border_lock">
+					ロック
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				折れ角度：
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="物理効果" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="ファイル：" name="physics_load_from_file"/>
+					<radio_item label="次の描画詳細度を使用：" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="実像に適用するLOD">
+					<combo_item name="physics_lowest">
+						最低
+					</combo_item>
+					<combo_item name="physics_low">
+						低
+					</combo_item>
+					<combo_item name="physics_medium">
+						中
+					</combo_item>
+					<combo_item name="physics_high">
+						高
+					</combo_item>
+				</combo_box>
+				<button label="参照" name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="滑らかさ：" name="Smooth"/>
+				<check_box label="穴を閉じる（スロー）" name="Close Holes (Slow)"/>
+				<button label="分析" name="Decompose"/>
+				<button label="取り消し" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="パス：" name="Combine Quality"/>
+				<slider label="詳細度：" name="Detail Scale"/>
+				<slider label="維持率：" name="Retain%"/>
+				<button label="単純化" name="Simplify"/>
+				<button label="取り消し" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="プレビュースプレッド：" name="physics_explode"/>
+				<text name="physics_triangles">
+					三角形： [TRIANGLES]
+				</text>
+				<text name="physics_points">
+					頂点： [POINTS]
+				</text>
+				<text name="physics_hulls">
+					外殻構造： [HULLS]
+				</text>
+			</panel>
+		</panel>
+		<panel label="修飾子" name="modifiers_panel">
+			<spinner name="import_scale" value="1.0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] m
+			</text>
+			<check_box label="テクスチャ" name="upload_textures"/>
+			<check_box label="スキンの重さ" name="upload_skin"/>
+			<check_box label="ジョイントポジション" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0.0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
new file mode 100644
index 0000000000..a785172f20
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="モデルウィザードをアップロード">
+	<button label="5. アップロード" name="upload_btn"/>
+	<button label="4. 確認" name="review_btn"/>
+	<button label="3. 物理効果" name="physics2_btn"/>
+	<button label="3. 物理効果" name="physics_btn"/>
+	<button label="2. 最適化" name="optimize_btn"/>
+	<button label="1. ファイルを選択" name="choose_file_btn"/>
+	<panel name="choose_file_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				モデルをアップロード
+			</text>
+		</panel>
+		<text name="description">
+			このウィザードを使うと、メッシュモデルを簡単にSecond Lifeにインポートできます。まず、インポートするモデルを含むファイルを指定します。Second Life は COLLADA (.dae) ファイルをサポートします。
+		</text>
+		<panel name="content">
+			<text name="Cache location">
+				ファイル名：
+			</text>
+			<button label="参照" label_selected="参照" name="browse"/>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="optimize_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				最適化
+			</text>
+		</panel>
+		<text name="description">
+			ウィザードがモデルを最適化し、パフォーマンスを改善しました。以下で最適化プロセスの結果を変更するか、「次へ」をクリックして続けます。
+		</text>
+		<panel name="content">
+			<text name="high_detail_text">
+				次の描画詳細度を作成：高
+			</text>
+			<text name="medium_detail_text">
+				次の描画詳細度を作成：中
+			</text>
+			<text name="low_detail_text">
+				次の描画詳細度を作成：低
+			</text>
+			<text name="lowest_detail_text">
+				次の描画詳細度を作成：最低
+			</text>
+		</panel>
+		<panel name="content2">
+			<text name="lod_label">
+				モデルのプレビュー：
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="プレビュー表示のLOD設定">
+				<combo_item name="high">
+					高
+				</combo_item>
+				<combo_item name="medium">
+					中
+				</combo_item>
+				<combo_item name="low">
+					低
+				</combo_item>
+				<combo_item name="lowest">
+					最低
+				</combo_item>
+			</combo_box>
+			<text name="streaming cost">
+				リソース料金：    [COST]
+			</text>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				物理効果
+			</text>
+		</panel>
+		<text name="description">
+			ウィザードが作成する実像によって、オブジェクトが他のオブジェクトやアバターとどのようにインタラクションするかが決まります。オブジェクトの用途に最適な描画詳細度にスライダーを設定してください：
+		</text>
+		<panel name="content">
+			<text name="streaming cost">
+				リソース料金：       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="physics2_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				物理効果
+			</text>
+		</panel>
+		<text name="description">
+			下の実像をプレビューし、「次へ」をクリックして続けます。実像を修正するには「戻る」ボタンをクリックします。
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				モデルのプレビュー：
+			</text>
+			<combo_box name="preview_lod_combo3" tool_tip="プレビュー表示のLOD設定">
+				<combo_item name="high">
+					高
+				</combo_item>
+				<combo_item name="medium">
+					中
+				</combo_item>
+				<combo_item name="low">
+					低
+				</combo_item>
+				<combo_item name="lowest">
+					最低
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+			<text name="streaming cost">
+				リソース料金：       [COST]
+			</text>
+		</panel>
+	</panel>
+	<panel name="review_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				確認
+			</text>
+		</panel>
+		<text name="description">
+			以下の詳細を確認してから、「アップロード」をクリックするとモデルがアップロードされます。「アップロード」をクリックした際に、料金があなたの L$ 残高から差し引かれます。
+		</text>
+		<panel name="content">
+			<text name="lod_label">
+				モデルのプレビュー：
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
+				<combo_item name="high">
+					高
+				</combo_item>
+				<combo_item name="medium">
+					中
+				</combo_item>
+				<combo_item name="low">
+					低
+				</combo_item>
+				<combo_item name="lowest">
+					最低
+				</combo_item>
+			</combo_box>
+			<text name="dimensions">
+				X:         Y:         Z:
+			</text>
+			<text name="dimension_dividers">
+				|               |
+			</text>
+		</panel>
+		<text name="streaming cost">
+			リソース料金：         [COST]
+		</text>
+		<text name="physics cost">
+			物理効果料金：        [COST]
+		</text>
+	</panel>
+	<panel name="upload_panel">
+		<panel name="header_panel">
+			<text name="header_text">
+				アップロード完了！
+			</text>
+		</panel>
+		<text name="description">
+			おめでとうございます！モデルがアップロードされました。アップロードされたモデルは、持ち物の「オブジェクト」フォルダにあります。
+		</text>
+	</panel>
+	<button label="&lt;&lt; 戻る" name="back"/>
+	<button label="次へ&gt;&gt;" name="next"/>
+	<button label="アップロード" name="upload" tool_tip="シミュレーターにアップロード"/>
+	<button label="取り消し" name="cancel"/>
+	<button label="閉じる" name="close"/>
+	<spinner name="import_scale" value="1.0"/>
+	<string name="status_idle">
+		待機状態
+	</string>
+	<string name="status_reading_file">
+		ローディング...
+	</string>
+	<string name="status_generating_meshes">
+		メッシュを作成中
+	</string>
+	<string name="status_vertex_number_overflow">
+		エラー：頂点の数が65534を超過したので中止されました。
+	</string>
+	<string name="high">
+		高
+	</string>
+	<string name="medium">
+		中
+	</string>
+	<string name="low">
+		低
+	</string>
+	<string name="lowest">
+		最低
+	</string>
+	<string name="mesh_status_good">
+		発送
+	</string>
+	<string name="mesh_status_na">
+		該当なし
+	</string>
+	<string name="mesh_status_none">
+		なし
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		テクスチャ編集可能な面の数は描画詳細度に応じて異なります。
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		メッシュインスタンスの数は描画詳細度に応じて異なります。
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		描画詳細度に対して頂点の数が多すぎます。
+	</string>
+	<string name="mesh_status_missing_lod">
+		必要な描画詳細度が見つかりません。
+	</string>
+	<string name="layer_all">
+		全て
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
new file mode 100644
index 0000000000..10a46247a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="クラシファイド広告の掲載">
+	<text name="explanation_text">
+		あなたのクラシファイド広告は、公開された日から1週間有効です。
+
+クラシファイドリストのあなたの広告の位置は、広告費をいくら支払うかで決まります。
+
+最高金額を支払った広告がリストのトップに載り、検索で上位に表示されます。
+	</text>
+	<text name="price_text">
+		広告費：
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="OK" name="set_price_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 1e884af5f2..aa368eef11 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater height="496" min_height="496" name="sell land" title="土地の販売">
+<floater name="sell land" title="土地の販売">
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text name="info_parcel_label">
@@ -14,7 +14,7 @@
 			<text name="info_size">
 				[AREA] 平方メートル
 			</text>
-			<text bottom_delta="-57" name="info_action">
+			<text name="info_action">
 				この区画を販売：
 			</text>
 			<text name="price_label">
@@ -29,13 +29,13 @@
 			<line_editor name="price">
 				0
 			</line_editor>
-			<text left_delta="106" name="price_per_m" width="230">
+			<text name="price_per_m">
 				（1平方メートルあたり L$[PER_METER]）
 			</text>
 			<text name="sell_to_label">
 				2. 特定の人に販売：
 			</text>
-			<text name="sell_to_text" right="-6">
+			<text name="sell_to_text">
 				販売先の指定なしか、特定の人に販売するかを選択してください。
 			</text>
 			<combo_box name="sell_to">
@@ -50,15 +50,15 @@
 			<text name="sell_objects_text">
 				区画上にある、土地所有者の譲渡可能なオブジェクトは、所有権が変更されます。
 			</text>
-			<radio_group bottom_delta="-76" height="72" name="sell_objects">
+			<radio_group name="sell_objects">
 				<radio_item label="いいえ、オブジェクトの所有権を保持します" name="no"/>
-				<radio_item bottom="-56" label="はい、オブジェクトと土地を一緒に販売します" name="yes"/>
+				<radio_item label="はい、オブジェクトと土地を一緒に販売します" name="yes"/>
 			</radio_group>
-			<button label="オブジェクトを表示" name="show_objects" width="138"/>
+			<button label="オブジェクトを表示" name="show_objects"/>
 			<text name="nag_message_label">
 				注意： 返品・交換はできません。
 			</text>
-			<button bottom="-489" label="土地を販売" name="sell_btn"/>
+			<button label="土地を販売" name="sell_btn"/>
 			<button label="キャンセル" name="cancel_btn"/>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
new file mode 100644
index 0000000000..28d2388bed
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="サウンドデバイス">
+	<text name="voice_label">
+		ボイスチャット
+	</text>
+	<check_box label="有効" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 211d1c3714..0b14f92ae7 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -125,6 +125,18 @@
 	<text name="prim_count">
 		プリム： [COUNT]
 	</text>
+	<text name="linked_set_count">
+		リンクセット：[COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="[prims] / [physics complexity] として現在選択されているリンクセットのコスト">
+		料金： [COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		オブジェクト： [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="[prims] / [physics complexity] として現在選択されているオブジェクトのコスト">
+		料金： [COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30">
 		<panel label="一般" name="General">
 			<panel.string name="text deed continued">
@@ -275,15 +287,6 @@
 				<combo_box.item label="リング" name="Ring"/>
 				<combo_box.item label="スカルプト" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="石材" name="Stone"/>
-				<combo_box.item label="金属" name="Metal"/>
-				<combo_box.item label="ガラス" name="Glass"/>
-				<combo_box.item label="木材" name="Wood"/>
-				<combo_box.item label="肌" name="Flesh"/>
-				<combo_box.item label="プラスチック" name="Plastic"/>
-				<combo_box.item label="ゴム" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				パスカット（始点と終点）
 			</text>
@@ -356,9 +359,19 @@
 				<combo_box.item label="トーラス" name="Torus"/>
 				<combo_box.item label="平面" name="Plane"/>
 				<combo_box.item label="シリンダー" name="Cylinder"/>
+				<combo_box.item label="メッシュ" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="特徴" name="Features">
+			<panel.string name="None">
+				なし
+			</panel.string>
+			<panel.string name="Prim">
+				プリム
+			</panel.string>
+			<panel.string name="Convex Hull">
+				凸状の外殻構造
+			</panel.string>
 			<text name="select_single">
 				プリムを 1 つだけ選択して編集してください
 			</text>
@@ -383,6 +396,23 @@
 			<spinner label="焦点" name="Light Focus"/>
 			<spinner label="弱まる" label_width="72" name="Light Falloff" width="135"/>
 			<spinner label="環境" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				実像の種類：
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="実像の種類を選択"/>
+			<combo_box name="material">
+				<combo_box.item label="石" name="Stone"/>
+				<combo_box.item label="金属" name="Metal"/>
+				<combo_box.item label="ガラス" name="Glass"/>
+				<combo_box.item label="木" name="Wood"/>
+				<combo_box.item label="肌" name="Flesh"/>
+				<combo_box.item label="プラスチック" name="Plastic"/>
+				<combo_box.item label="ゴム" name="Rubber"/>
+			</combo_box>
+			<spinner label="重力" name="Physics Gravity"/>
+			<spinner label="摩擦" name="Physics Friction"/>
+			<spinner label="密度" name="Physics Density"/>
+			<spinner label="復元" name="Physics Restitution"/>
 		</panel>
 		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index 6c754e5d08..ae5ddbb78f 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<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="モデル" name="Upload Model"/>
+		<menu_item_call label="モデルウィザード" name="Upload Model Wizard"/>
 		<menu_item_call label="一括 （ファイルにつき L$[COST] ）..." name="Bulk Upload"/>
 		<menu_item_call label="デフォルトのアップロード権限を設定" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..43f86e84bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="稜を表示" name="show_edges"/>
+	<menu_item_check label="物理効果を表示" name="show_physics"/>
+	<menu_item_check label="テクスチャを表示" name="show_textures"/>
+	<menu_item_check label="スキンの重さを表示" name="show_skin_weight"/>
+	<menu_item_check label="ジョイントポジションを表示" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index b8efc20049..ec9db02522 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -120,6 +120,8 @@
 			<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="モデル" name="Upload Model"/>
+			<menu_item_call label="モデルウィザード" name="Upload Model Wizard"/>
 			<menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="元に戻す" name="Undo"/>
@@ -159,7 +161,7 @@
 			<menu_item_check label="アルファ" name="Alpha"/>
 			<menu_item_check label="木" name="Tree"/>
 			<menu_item_check label="アバター" name="Character"/>
-			<menu_item_check label="地表" name="SurfacePath"/>
+			<menu_item_check label="サーフェスパッチ" name="Surface Patch"/>
 			<menu_item_check label="空" name="Sky"/>
 			<menu_item_check label="水" name="Water"/>
 			<menu_item_check label="地面" name="Ground"/>
@@ -218,6 +220,7 @@
 			<menu_item_check label="テクスチャカテゴリのコンソール" name="Texture Category"/>
 			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
 			<menu_item_check label="メモリ" name="Memory"/>
+			<menu_item_check label="風景の統計" name="Scene Statistics"/>
 			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
 			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
 			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
@@ -228,6 +231,7 @@
 		</menu>
 		<menu label="情報を表示" name="Display Info">
 			<menu_item_check label="時間を表示する" name="Show Time"/>
+			<menu_item_check label="アップロード代金を表示" name="Show Upload Cost"/>
 			<menu_item_check label="描画情報を表示する" name="Show Render Info"/>
 			<menu_item_check label="テクスチャ情報を表示" name="Show Texture Info"/>
 			<menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
@@ -253,8 +257,10 @@
 		</menu>
 		<menu label="メタデータのレンダー" name="Render Metadata">
 			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
+			<menu_item_check label="普通" name="Normals"/>
 			<menu_item_check label="オクトリー" name="Octree"/>
 			<menu_item_check label="シャドウ円錐" name="Shadow Frusta"/>
+			<menu_item_check label="実像" name="Physics Shapes"/>
 			<menu_item_check label="オクルージョン" name="Occlusion"/>
 			<menu_item_check label="バッチの描画" name="Render Batches"/>
 			<menu_item_check label="タイプを更新" name="Update Type"/>
@@ -262,9 +268,12 @@
 			<menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
 			<menu_item_check label="テクスチャの範囲" name="Texture Area"/>
 			<menu_item_check label="側面" name="Face Area"/>
+			<menu_item_check label="LOD 情報" name="LOD Info"/>
+			<menu_item_check label="制作キュー" name="Build Queue"/>
 			<menu_item_check label="光" name="Lights"/>
 			<menu_item_check label="骨組みの衝突判定" name="Collision Skeleton"/>
 			<menu_item_check label="レイキャスト" name="Raycast"/>
+			<menu_item_check label="スカルプト" name="Sculpt"/>
 		</menu>
 		<menu label="レンダリング" name="Rendering">
 			<menu_item_check label="軸" name="Axes"/>
@@ -272,7 +281,6 @@
 			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
 			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
 			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="フレームバッファオブジェクト" name="Framebuffer Objects"/>
 			<menu_item_check label="光と影" name="Lighting and Shadows"/>
 			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
@@ -371,6 +379,7 @@
 			<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
+		<menu_item_check label="HTTP 持ち物" name="HTTP Inventory"/>
 		<menu_item_call label="圧縮画像" name="Compress Images"/>
 		<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
 		<menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index f93e032ffc..d63ca84035 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2205,6 +2205,12 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="RezItemNoPermissions">
 		オブジェクトを Rez するには権限が不足しています。
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		親エステート間では IM を送信できません。
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		親エステート間で持ち物を移動することはできません。
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		ノートカードを読み込めません。あとで再度お試しください。
 	</notification>
@@ -2780,6 +2786,10 @@ M キーを押して変更します。
 		モデレーターがあなたのボイスをミュートしました。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		このアップロードは L$[PRICE] のコストがかかります。アップロードを続けますか？
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="アップロード"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		テレポート履歴を削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
@@ -2791,6 +2801,9 @@ M キーを押して変更します。
 	<notification name="ShareNotification">
 		共有する住人を選択します。
 	</notification>
+	<notification name="MeshUploadError">
+		[LABEL] をアップロードできませんでした： [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		次のアイテムを共有しますか？
 
@@ -2807,6 +2820,19 @@ M キーを押して変更します。
 	<notification name="DeedToGroupFail">
 		グループへの譲渡に失敗しました。
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		区画「[PARCEL_NAME]」は現在放棄できません。
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		[AREA] m² の区画「[PARCEL_NAME]」が公開されました。
+
+同区画が他の住人に売り出される前の [RECLAIM_PERIOD] 時間内であれば無償で土地を取り戻すことができます。
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		[AREA] m² の区画「[PARCEL_NAME]」が公開されました。
+
+一般に公開されたので、今なら誰でも購入可能です。
+	</notification>
 	<notification name="AvatarRezNotification">
 		（作成後[EXISTENCE]秒経過）
 &apos;[NAME]&apos;というアバターは[TIME]秒後に姿を現わしました。
@@ -2947,6 +2973,10 @@ M キーを押して変更します。
 		グループの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
 		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
 	</notification>
+	<notification label="" name="NoPlaceInfo">
+		場所のプロフィールの表示はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
 	<notification label="" name="NoPicks">
 		ピックの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
 		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
@@ -2967,9 +2997,18 @@ M キーを押して変更します。
 		他の住人への支払いはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
 		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- あなたの CPU の速度は必須動作環境の条件を満たしていません。
-	</global>
+	<notification label="" name="NoInventory">
+		持ち物の表示はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		容姿エディターはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		検索はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		[APP_NAME] に必要なハードウェアがないようです。 [APP_NAME] にはマルチテクスチャをサポートする OpenGL グラフィックカードが必要です。 お使いのグラフィックカードの最新ドライバがインストールされているかどうか、オペレーティングシステムのサービスパックとパッチが入っているかをご確認ください。
 
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index e1dea89ca0..9f6abf8fcb 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		エラー
 	</text>
+	<text name="text_box10">
+		ダイレクト
+	</text>
 	<text name="text_box7">
 		所有者
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index b4430fa39d..1786b4befc 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="true" label="透明な水" name="TransparentWater"/>
 		<check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
+		<check_box initial_value="true" label="近くの光" name="LocalLights"/>
 		<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
 		<check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="光と影" name="UseLightShaders"/>
+		<check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
+		<check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
+		<text name="shadows_label">
+			影：
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="なし" name="0"/>
+			<combo_box.item label="太陽/月" name="1"/>
+			<combo_box.item label="太陽/月・プロジェクタ" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			水の反射：
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 54ec24773f..65148cf1ee 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="土地の再販を許可" name="allow_land_resell_check"/>
 	<check_box label="土地の統合・分割を許可" name="allow_parcel_changes_check"/>
 	<check_box label="土地の検索表示をブロック" name="block_parcel_search_check" tool_tip="検索結果で、この地域と区画を表示するかどうかの設定です"/>
+	<check_box label="メッシュオブジェクトを許可" name="mesh_rez_enabled_check" tool_tip="このリージョンでメッシュオブジェクトの Rez を許可する"/>
 	<spinner label="アバター数上限" name="agent_limit_spin"/>
 	<spinner label="物体ボーナス" name="object_bonus_spin"/>
 	<text label="成人指定" name="access_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
new file mode 100644
index 0000000000..da103a2d60
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="機器の設定" name="device_settings_panel">
+	<panel.string name="default_text">
+		デフォルト
+	</panel.string>
+	<text name="Input">
+		入力
+	</text>
+	<text name="My volume label">
+		私の音量：
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使って音量を調節します"/>
+	<text name="wait_text">
+		しばらくお待ちください。
+	</text>
+	<text name="Output">
+		出力
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index cb248b8b4f..a6691fb764 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -130,6 +130,139 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/index.php?lang=ja-JP
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
+http://secondlife.com/download
+
+詳細については、FAQ を参照してください：
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		ビューワアップデート（オプション）があります： [VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		ビューワアップデート（必須）： [VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		このエージェントは既にログインされています。
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		申し訳ありませんが、ログインできませんでした。
+以下の情報が正しく入力されたことを確認してください：
+* ユーザー名（bobsmith12 または steller.sunshine など）
+* パスワード
+また、Caps Lock キーが有効になっていないこともお確かめください。
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		セキュリティ上の理由により、あなたのパスワードは変更されました。
+アカウントページ（http://secondlife.com/password）に移動し、
+秘密の質問に答えて、パスワードをリセットしてください。
+ご迷惑をおかけして申し訳ございません。
+	</string>
+	<string name="LoginFailedPasswordReset">
+		弊社はシステムを若干変更しました。お手数ですが、パスワードのリセットをお願いします。
+アカウントページ（http://secondlife.com/password）に移動し、
+秘密の質問に答えて、パスワードをリセットしてください。
+ご迷惑をおかけして申し訳ございません。
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		Second Life はメンテナンスのため、一時的にご利用いただけません。
+従業員以外にはログインをご遠慮いただいています。
+最新の状況については www.secondlife.com/status でお確かめください。
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		既にログインしているユーザーに最上のインワールド体験を提供するため、Second Life へのログインは一時的に制限されています。
+	 	
+申し訳ございませんが、有料アカウントのユーザーを優先するために、現時点のところ無料アカウントのユーザーには Second Life へのアクセスをご遠慮いただいています。
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		このパソコンからは Second Life にアクセスできません。
+システムのエラーだと思われる場合は、
+support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		あなたのアカウントは
+太平洋時間の [TIME] までご利用いただけません。
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		現在リクエストを完了することができません。
+Second Life のサポート（http://secondlife.com/support）にお問い合わせください。
+パスワードを変更できない場合には、(866) 476-9763 に電話でお問い合わせください。
+	</string>
+	<string name="LoginFailedTransformError">
+		ログイン時にデータの不一致が見つかりました。
+support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		現在アカウントのメインテナンスが行われています。
+あなたのアカウントは
+太平洋時間の [TIME] までご利用いただけません。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		ログアウトをリスクエストしたら、シミュレーターから「fault」が返されました。
+	</string>
+	<string name="LoginFailedPendingLogout">
+		システムによるログアウトが実行されました。
+あなたのアカウントは
+太平洋時間の [TIME] までご利用いただけません。
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		有効なセッションを生成できません。
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		シミュレーターに接続できませんでした。
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		あなたの Second Life アカウントにアクセスできるのは、
+太平洋時間の [START] ～ [END] の間に限られます。
+有効な時間帯に再度お試しください。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		パラメーターが正しくありません。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		ファーストネームのパラメーターは英数字です。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		ラストネームのパラメーターは英数字です。
+システムのエラーだと思われる場合は、support@secondlife.com にお問い合わせください。
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		リージョンはオフライン中です。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		エージェントがリージョンに不在です。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		このリージョンでは別のセッションがログインされていました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		このリージョンでは前のセッションがログアウトされました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		このリージョンでは現在も前のセッションのログアウトが処理されています。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutSucceeded">
+		リージョンでは前のセッションがログアウトされました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		リージョンではログアウトプロセスが開始されました。
+しばらくしてから再度お試しください。
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		あなたの前のセッションはシステムによってログアウトされています。
+しばらくしてから再度お試しください。
+	</string>
 	<string name="AgentLostConnection">
 		このリージョンに不都合が発生している可能性があります。  ご使用のインターネット接続をご確認ください。
 	</string>
@@ -441,6 +574,9 @@
 	<string name="symbolic folder link">
 		フォルダのリンク
 	</string>
+	<string name="mesh">
+		メッシュ
+	</string>
 	<string name="AvatarEditingAppearance">
 		（容姿の編集中）
 	</string>
@@ -1180,6 +1316,9 @@
 	<string name="InvFolder Accessories">
 		アクセサリ
 	</string>
+	<string name="InvFolder Meshes">
+		メッシュ
+	</string>
 	<string name="InvFolder Friends">
 		フレンド
 	</string>
@@ -3762,6 +3901,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="session_initialization_timed_out_error">
 		セッションの初期化がタイムアウトしました
 	</string>
+	<string name="Home position set.">
+		家の配置の設定。
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index d51ea1c0f8..f336e53e05 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -49,7 +49,7 @@
 			<text name="Sell with landowners objects in parcel.">
 				Objecten opgenomen in verkoop
 			</text>
-			<text name="Selling with no objects in parcel." width="196">
+			<text name="Selling with no objects in parcel.">
 				Objecten niet opgenomen in verkoop
 			</text>
 			<button label="Annuleer landverkoop" label_selected="Annuleer landverkoop" name="Cancel Land Sale"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
index 528e5a416b..2201c4b0ad 100644
--- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
@@ -44,7 +44,7 @@
 				<combo_box.item label="Wybrany Kupiec:" name="Specificuser:"/>
 			</combo_box>
 			<button label="Wybierz" name="sell_to_select_agent"/>
-			<text name="sell_objects_label">
+			<text name="sell_objects_label" font="SansSerifSmall">
 				3. Obiekty sprzedawane razem z posiadłością?
 			</text>
 			<text name="sell_objects_text">
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
index 0c285e6546..9ec3c480b7 100644
--- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
@@ -46,7 +46,7 @@
 				</text>
 				<check_box label="Modyfikuje" name="CheckOwnerModify"/>
 				<check_box label="Kopiuje" name="CheckOwnerCopy"/>
-				<check_box label="Oddaje/Sprzedaje" name="CheckOwnerTransfer"/>
+				<check_box label="Oddaje/&#10;Sprzedaje" name="CheckOwnerTransfer"/>
 				<text name="AnyoneLabel">
 					Każdy:
 				</text>
@@ -60,7 +60,7 @@
 				</text>
 				<check_box label="Modyfikuje" name="CheckNextOwnerModify"/>
 				<check_box label="Kopiuje" name="CheckNextOwnerCopy"/>
-				<check_box label="Sprzedaje/Oddaje" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/>
+				<check_box label="Sprzedaje/&#10;Oddaje" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/>
 			</panel>
 			<check_box label="Na sprzedaż" name="CheckPurchase"/>
 			<combo_box name="combobox sale copy">
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 7761c79864..e48cac7d1f 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -113,7 +113,7 @@ Vá para o menu Mundo &gt; Sobre o terreno ou selecione outro lote para mostrar
 			<text name="Selling with no objects in parcel.">
 				À venda (objetos não incluídos).
 			</text>
-			<button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" left="275" name="Cancel Land Sale" width="165"/>
+			<button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" name="Cancel Land Sale"/>
 			<text name="Claimed:">
 				Posse em:
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml
index c62fc8b5d1..0d110c0456 100644
--- a/indra/newview/skins/default/xui/zh/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/zh/floater_aaa.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Test Floater" title="TEST FLOATER">
+<floater name="Test Floater" title="測試浮動視窗">
 	<string name="test_the_vlt">
 		This string CHANGE2 is extracted.
 	</string>
 	<string name="testing_eli">
-		Just a test. changes.
+		這只是測試 - 變更。
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 825fe13e92..229297e39b 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="ABOUT [CAPITALIZED_APP_NAME]">
+<floater name="floater_about" title="關於 [CAPITALIZED_APP_NAME]">
 	<floater.string name="AboutHeader">
 		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index 4e5c4f96f0..c0c5494c91 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -42,10 +42,10 @@
 				You must approve your purchase to modify this land.
 			</panel.string>
 			<panel.string name="group_owned_text">
-				(Group Owned)
+				（社團所擁有）
 			</panel.string>
 			<panel.string name="profile_text">
-				Profile
+				檔案
 			</panel.string>
 			<panel.string name="info_text">
 				資訊
@@ -87,7 +87,7 @@
 				擁有者：
 			</text>
 			<text name="Group:">
-				Group:
+				社團：
 			</text>
 			<button label="設定" name="Set..."/>
 			<check_box label="Allow Deed to Group" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
@@ -274,7 +274,7 @@
 				<name_list.columns label="Most Recent" name="mostrecent"/>
 			</name_list>
 		</panel>
-		<panel label="OPTIONS" name="land_options_panel">
+		<panel label="選項" name="land_options_panel">
 			<panel.string name="search_enabled_tooltip">
 				Let people see this parcel in search results
 			</panel.string>
@@ -310,22 +310,22 @@ Only large parcels can be listed in search.
 				Allow other Residents to:
 			</text>
 			<check_box label="Edit Terrain" name="edit land check" tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."/>
-			<check_box label="Fly" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."/>
+			<check_box label="飛行" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."/>
 			<text name="allow_label2">
-				Build:
+				建造：
 			</text>
 			<check_box label="Everyone" name="edit objects check"/>
-			<check_box label="Group" name="edit group objects check"/>
+			<check_box label="社團" name="edit group objects check"/>
 			<text name="allow_label3">
 				Object Entry:
 			</text>
 			<check_box label="Everyone" name="all object entry check"/>
-			<check_box label="Group" name="group object entry check"/>
+			<check_box label="社團" name="group object entry check"/>
 			<text name="allow_label4">
 				Run Scripts:
 			</text>
 			<check_box label="Everyone" name="check other scripts"/>
-			<check_box label="Group" name="check group scripts"/>
+			<check_box label="社團" name="check group scripts"/>
 			<text name="land_options_label">
 				Land Options:
 			</text>
@@ -374,7 +374,7 @@ Only large parcels can be listed in search.
 			<button label="設定" label_selected="設定" name="Set" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."/>
 			<button label="清除" label_selected="清除" name="Clear" tool_tip="清除登陸點"/>
 			<text name="Teleport Routing: ">
-				Teleport Routing:
+				瞬間傳送路徑：
 			</text>
 			<combo_box name="landing type" tool_tip="Teleport Routing -- select how to handle teleports onto your land">
 				<combo_box.item label="Blocked" name="Blocked"/>
@@ -388,7 +388,7 @@ Only large parcels can be listed in search.
 			</text>
 			<combo_box name="media type" tool_tip="Specify if the URL is a movie, web page, or other media"/>
 			<text name="at URL:">
-				Home Page:
+				首頁：
 			</text>
 			<button label="設定" name="set_media_url"/>
 			<text name="Description:">
@@ -396,15 +396,15 @@ Only large parcels can be listed in search.
 			</text>
 			<line_editor name="url_description" tool_tip="Text displayed next to play/load button"/>
 			<text name="Media texture:">
-				Replace Texture:
+				取代材質：
 			</text>
 			<texture_picker name="media texture" tool_tip="點擊以挑選圖片"/>
 			<text name="replace_texture_help">
 				Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
 			</text>
-			<check_box label="Auto scale" name="media_auto_scale" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."/>
+			<check_box label="自動縮放" name="media_auto_scale" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."/>
 			<text name="media_size" tool_tip="Size to render Web media, leave 0 for default.">
-				Size:
+				尺寸：
 			</text>
 			<spinner name="media_size_width" tool_tip="Size to render Web media, leave 0 for default."/>
 			<spinner name="media_size_height" tool_tip="Size to render Web media, leave 0 for default."/>
@@ -453,7 +453,7 @@ Only large parcels can be listed in search.
 			<check_box label="Sell passes to:" name="PassCheck" tool_tip="Allows temporary access to this parcel"/>
 			<combo_box name="pass_combo">
 				<combo_box.item label="Anyone" name="Anyone"/>
-				<combo_box.item label="Group" name="Group"/>
+				<combo_box.item label="社團" name="Group"/>
 			</combo_box>
 			<spinner label="Price in L$:" name="PriceSpin"/>
 			<spinner label="Hours of access:" name="HoursSpin"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index 0f1feaa843..bcb5606b60 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -169,7 +169,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
 		<item label="Standing" name="Standing" value="Standing"/>
 		<item label="Walking" name="Walking" value="Walking"/>
 		<item label="Sitting" name="Sitting" value="Sitting"/>
-		<item label="Flying" name="Flying" value="Flying"/>
+		<item label="飛行" name="Flying" value="飛行"/>
 	</combo_box>
 	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="Amount of time (in seconds) over which animations blends in"/>
 	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index f895fa2e9d..fb17c0bb8a 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="AVATAR TEXTURES">
+<floater name="avatar_texture_debug" title="化身材質">
 	<floater.string name="InvalidAvatar">
 		INVALID AVATAR
 	</floater.string>
@@ -23,7 +23,7 @@ Textures
 				<texture_picker label="Head Alpha" name="head_alpha"/>
 				<texture_picker label="Head Tattoo" name="head_tattoo"/>
 				<texture_picker label="眼睛" name="eyes-baked"/>
-				<texture_picker label="Eye" name="eyes_iris"/>
+				<texture_picker label="眼睛" name="eyes_iris"/>
 				<texture_picker label="Eyes Alpha" name="eyes_alpha"/>
 				<texture_picker label="Upper Body" name="upper-baked"/>
 				<texture_picker label="Upper BodyPaint" name="upper_bodypaint"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index 98fa6804ba..ffdd957f91 100644
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -13,21 +13,21 @@
 		Finished permission change requests.
 	</floater.string>
 	<icon name="icon_animation" tool_tip="Animation"/>
-	<icon name="icon_bodypart" tool_tip="Body Parts"/>
-	<icon name="icon_clothing" tool_tip="Clothing"/>
-	<icon name="icon_gesture" tool_tip="Gestures"/>
+	<icon name="icon_bodypart" tool_tip="身體部位"/>
+	<icon name="icon_clothing" tool_tip="服裝"/>
+	<icon name="icon_gesture" tool_tip="姿勢"/>
 	<icon name="icon_notecard" tool_tip="Notecards"/>
 	<icon name="icon_object" tool_tip="Objects"/>
 	<icon name="icon_script" tool_tip="Scripts"/>
 	<icon name="icon_sound" tool_tip="Sounds"/>
-	<icon name="icon_texture" tool_tip="Textures"/>
-	<button label="√ All" name="check_all"/>
+	<icon name="icon_texture" tool_tip="材質"/>
+	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
 	<text name="newperms">
 		New Content Permissions
 	</text>
 	<text name="GroupLabel">
-		Group:
+		社團：
 	</text>
 	<check_box label="分享" name="share_with_group"/>
 	<text name="AnyoneLabel">
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index de3c0aa075..a00f069e6c 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -15,7 +15,7 @@
 	<text name="buy_text">
 		Buy for L$[AMOUNT] from [NAME]?
 	</text>
-	<check_box label="Wear clothing now" name="wear_check"/>
+	<check_box label="立即穿上服裝" name="wear_check"/>
 	<button label="購買" label_selected="購買" name="buy_btn"/>
 	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index d665a16639..a75d33136d 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -171,7 +171,7 @@ supports [AMOUNT2] objects
 		Scotopteryx 138,204
 	</text>
 	<text name="info_size_label">
-		Size:
+		尺寸：
 	</text>
 	<text name="info_size">
 		1024 m²
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index ec67f8d4fa..dea0a7c318 100644
--- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="groups" title="GROUPS">
+<floater name="groups" title="社團">
 	<text name="groupdesc">
-		Choose a group:
+		選擇一個社團：
 	</text>
 	<button label="確定" label_selected="確定" name="OK"/>
 	<button label="取銷" label_selected="取銷" name="Cancel"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
index df9c780cbf..f6f2f0187d 100644
--- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ColorPicker" title="COLOR PICKER">
+<floater name="ColorPicker" title="顏色挑選器">
 	<text name="r_val_text">
-		Red:
+		紅色：
 	</text>
 	<text name="g_val_text">
-		Green:
+		綠色：
 	</text>
 	<text name="b_val_text">
-		Blue:
+		藍色：
 	</text>
 	<text name="h_val_text">
 		Hue:
@@ -22,7 +22,7 @@
 	<button label="確定" label_selected="確定" name="select_btn"/>
 	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
 	<text name="Current color:">
-		Current color:
+		目前顏色：
 	</text>
 	<text name="(Drag below to save.)">
 		(Drag below to save)
diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
index c6ab787625..8adc094fca 100644
--- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="DAY CYCLE EDITOR">
+<floater name="Day Cycle Floater" title="日循環編輯器">
 	<tab_container name="Day Cycle Tabs">
-		<panel label="Day Cycle" name="Day Cycle">
+		<panel label="日循環" name="Day Cycle">
 			<multi_slider initial_value="0" name="WLTimeSlider"/>
 			<multi_slider initial_value="0" name="WLDayCycleKeys"/>
 			<text name="WL12am">
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 22e7451d13..901770586a 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Places" name="gestures" title="GESTURES">
+<floater label="Places" name="gestures" title="姿勢">
 	<floater.string name="loading">
 		載入中...
 	</floater.string>
@@ -15,7 +15,7 @@
 		<scroll_list.columns label="Key" name="shortcut"/>
 	</scroll_list>
 	<panel label="bottom_panel" name="bottom_panel">
-		<menu_button name="gear_btn" tool_tip="More options"/>
+		<menu_button name="gear_btn" tool_tip="更多選項"/>
 		<button name="new_gesture_btn" tool_tip="Make new gesture"/>
 		<button name="activate_btn" tool_tip="Activate/Deactivate selected gesture"/>
 		<button name="del_btn" tool_tip="Delete this gesture"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index b01d346a64..a501a4257a 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="godtools floater" title="GOD TOOLS">
 	<tab_container name="GodTools Tabs">
-		<panel label="Grid" name="grid">
+		<panel label="網格" name="grid">
 			<button label="Flush This Region&apos;s Map Visibility Caches" label_selected="Flush This Region&apos;s Map Visibility Caches" name="Flush This Region&apos;s Map Visibility Caches"/>
 		</panel>
 		<panel label="地區" name="region">
@@ -27,7 +27,7 @@
 			</text>
 			<line_editor name="parentestate" tool_tip="This is the parent estate for this region"/>
 			<text name="Grid Pos: ">
-				Grid Pos:
+				網格位置：
 			</text>
 			<line_editor name="gridposx" tool_tip="This is the grid x position for this region"/>
 			<line_editor name="gridposy" tool_tip="This is the grid y position for this region"/>
@@ -43,9 +43,9 @@
 			<button label="Refresh" label_selected="Refresh" name="Refresh" tool_tip="Click here to refresh the above information"/>
 			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
 			<button label="選擇地區" label_selected="選擇地區" name="Select Region" tool_tip="Select the whole region with the land tool"/>
-			<button label="Autosave now" label_selected="Autosave now" name="Autosave now" tool_tip="Save gzipped state to autosave directory"/>
+			<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="Save gzipped state to autosave directory"/>
 		</panel>
-		<panel label="Objects" name="objects">
+		<panel label="物件" name="objects">
 			<panel.string name="no_target">
 				(no target)
 			</panel.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
index 75403a79dd..1465dcb256 100644
--- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
@@ -25,7 +25,7 @@
 		Enable VBO:
 	</text>
 	<check_box initial_value="true" label="Enable OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
-	<slider label="Texture Memory (MB):" name="GraphicsCardTextureMemory" tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."/>
+	<slider label="材質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."/>
 	<spinner label="Fog Distance Ratio:" name="fog"/>
 	<button label="確定" label_selected="確定" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
index 957c37bd63..e605d5f19c 100644
--- a/indra/newview/skins/default/xui/zh/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_help_browser" title="HELP BROWSER">
+<floater name="floater_help_browser" title="幫助瀏覽器">
 	<floater.string name="loading_text">
 		載入中...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml
index e458913452..a788961e95 100644
--- a/indra/newview/skins/default/xui/zh/floater_hud.xml
+++ b/indra/newview/skins/default/xui/zh/floater_hud.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="TUTORIAL"/>
+<floater name="floater_hud" title="教學"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 5ea073365e..2d66c659fe 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
+<multi_floater name="floater_im_box" title="交談"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index 92d5c3df73..98e4e5c2cd 100644
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -9,7 +9,7 @@
 	<text name="preview_label">
 		Preview image as:
 	</text>
-	<combo_box label="Clothing Type" name="clothing_type_combo">
+	<combo_box label="服裝類型" name="clothing_type_combo">
 		<item label="Image" name="Image" value="Image"/>
 		<item label="Hair" name="Hair" value="Hair"/>
 		<item label="Female Head" name="FemaleHead" value="Female Head"/>
@@ -28,5 +28,5 @@ Try saving image as 24 bit Targa (.tga).
 	</text>
 	<check_box label="Use lossless compression" name="lossless_check"/>
 	<button label="取銷" name="cancel_btn"/>
-	<button label="Upload (L$[AMOUNT])" name="ok_btn"/>
+	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 9ca08c06b1..4f678dbd9d 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="incoming call" title="Incoming call">
+<floater name="incoming call" title="來電">
 	<floater.string name="lifetime">
 		5
 	</floater.string>
@@ -10,7 +10,7 @@
 		anonymous
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		is calling.
+		通話中。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		has joined a Voice Chat call with a conference chat.
@@ -29,5 +29,5 @@
 	</text>
 	<button label="接受" label_selected="接受" name="Accept"/>
 	<button label="Reject" label_selected="Reject" name="Reject"/>
-	<button label="Start IM" name="Start IM"/>
+	<button label="開始 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 7f23bba37a..295538f797 100644
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -9,6 +9,6 @@
 		<scroll_list.columns label="Creator Name" name="creator_name"/>
 		<scroll_list.columns label="Creation Date" name="creation_date"/>
 	</scroll_list>
-	<button label="See Owner Profile..." name="button owner" tool_tip="See profile of the highlighted object&apos;s owner"/>
-	<button label="See Creator Profile..." name="button creator" tool_tip="See profile of the highlighted object&apos;s original creator"/>
+	<button label="察看擁有者檔案..." name="button owner" tool_tip="See profile of the highlighted object&apos;s owner"/>
+	<button label="察看創造者檔案..." name="button creator" tool_tip="See profile of the highlighted object&apos;s original creator"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory.xml b/indra/newview/skins/default/xui/zh/floater_inventory.xml
index 93cd681126..da4619c964 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MY INVENTORY">
-	<panel label="Inventory Panel" name="Inventory Panel"/>
+<floater name="Inventory" title="我的收納區">
+	<panel label="收納區面板" name="Inventory Panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 4fac10df81..fcd702b16d 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="INVENTORY ITEM PROPERTIES">
+<floater name="item properties" title="收納區物品屬性">
 	<floater.string name="unknown">
 		（未知）
 	</floater.string>
@@ -24,11 +24,11 @@
 	<text name="LabelCreatorTitle">
 		創造者：
 	</text>
-	<button label="Profile..." name="BtnCreator"/>
+	<button label="檔案..." name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		擁有者：
 	</text>
-	<button label="Profile..." name="BtnOwner"/>
+	<button label="檔案..." name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Acquired:
 	</text>
@@ -46,7 +46,7 @@
 	</text>
 	<check_box label="覆製" name="CheckEveryoneCopy"/>
 	<text name="GroupLabel">
-		Group:
+		社團：
 	</text>
 	<check_box label="分享" name="CheckShareWithGroup"/>
 	<text name="NextOwnerLabel">
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 41ea8dc593..a442eb9cbc 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="INVENTORY_RECENT_ITEMS">
+<floater name="Inventory Finder" title="最近_收納區_物品">
 	<check_box label="Animation" name="check_animation"/>
 	<check_box label="Calling Cards" name="check_calling_card"/>
-	<check_box label="Clothing" name="check_clothing"/>
-	<check_box label="Gestures" name="check_gesture"/>
-	<check_box label="Landmarks" name="check_landmark"/>
+	<check_box label="服裝" name="check_clothing"/>
+	<check_box label="姿勢" name="check_gesture"/>
+	<check_box label="地標" name="check_landmark"/>
 	<check_box label="Notecards" name="check_notecard"/>
 	<check_box label="Objects" name="check_object"/>
 	<check_box label="Scripts" name="check_script"/>
 	<check_box label="Sounds" name="check_sound"/>
-	<check_box label="Textures" name="check_texture"/>
+	<check_box label="材質" name="check_texture"/>
 	<check_box label="Snapshots" name="check_snapshot"/>
 	<button label="全部" label_selected="全部" name="All"/>
 	<button label="無" label_selected="無" name="None"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml
index 91f2bc6d81..83bd4e2bca 100644
--- a/indra/newview/skins/default/xui/zh/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml
@@ -17,8 +17,8 @@
 	<text name="Control Modes:">
 		Control Modes:
 	</text>
-	<check_box label="Avatar" name="JoystickAvatarEnabled"/>
-	<check_box label="Build" name="JoystickBuildEnabled"/>
+	<check_box label="化身" name="JoystickAvatarEnabled"/>
+	<check_box label="建造" name="JoystickBuildEnabled"/>
 	<check_box label="Flycam" name="JoystickFlycamEnabled"/>
 	<stat_view label="Joystick Monitor" name="axis_view">
 		<stat_bar label="Axis 0" name="axis0"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
index 4ff6c45b17..261ba8ebc3 100644
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="LAG METER">
+<floater name="floater_lagmeter" title="LAG 測量器">
 	<floater.string name="max_title_msg">
-		Lag Meter
+		Lag 測量器
 	</floater.string>
 	<floater.string name="max_width_px">
 		360
@@ -13,7 +13,7 @@
 		90
 	</floater.string>
 	<floater.string name="client_text_msg">
-		Client
+		客戶端
 	</floater.string>
 	<floater.string name="client_frame_rate_critical_fps">
 		10
@@ -31,7 +31,7 @@
 		Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
 	</floater.string>
 	<floater.string name="client_frame_time_normal_msg">
-		Normal
+		正常
 	</floater.string>
 	<floater.string name="client_draw_distance_cause_msg">
 		Possible cause: Draw distance set too high
@@ -46,7 +46,7 @@
 		Possible cause: Too many complex objects in scene
 	</floater.string>
 	<floater.string name="network_text_msg">
-		Network
+		網路
 	</floater.string>
 	<floater.string name="network_packet_loss_critical_pct">
 		10
@@ -61,7 +61,7 @@
 		Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
 	</floater.string>
 	<floater.string name="network_performance_normal_msg">
-		Normal
+		正常
 	</floater.string>
 	<floater.string name="network_ping_critical_ms">
 		600
@@ -82,7 +82,7 @@
 		Possible bad connection or file-sharing app.
 	</floater.string>
 	<floater.string name="server_text_msg">
-		Server
+		伺服器
 	</floater.string>
 	<floater.string name="server_frame_rate_critical_fps">
 		20
@@ -94,31 +94,31 @@
 		20
 	</floater.string>
 	<floater.string name="server_frame_time_critical_msg">
-		Simulator framerate below [SERVER_FRAME_RATE_CRITICAL]
+		模擬器 framerate 低於 [SERVER_FRAME_RATE_CRITICAL]
 	</floater.string>
 	<floater.string name="server_frame_time_warning_msg">
-		Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING]
+		模擬器 framerate 介於 [SERVER_FRAME_RATE_CRITICAL] 與 [SERVER_FRAME_RATE_WARNING]　之間
 	</floater.string>
 	<floater.string name="server_frame_time_normal_msg">
-		Normal
+		正常
 	</floater.string>
 	<floater.string name="server_physics_cause_msg">
-		Possible Cause: Too many physical objects
+		可能原因：太多物理物件
 	</floater.string>
 	<floater.string name="server_scripts_cause_msg">
-		Possible Cause: Too many scripted objects
+		可能原因：太多腳本物件
 	</floater.string>
 	<floater.string name="server_net_cause_msg">
-		Possible Cause: Too much network traffic
+		可能原因：太多網路流量
 	</floater.string>
 	<floater.string name="server_agent_cause_msg">
-		Possible Cause: Too many moving people in region
+		可能原因：地區有太多移動的人
 	</floater.string>
 	<floater.string name="server_images_cause_msg">
-		Possible Cause: Too many image calculations
+		可能原因：太多影像計算
 	</floater.string>
 	<floater.string name="server_generic_cause_msg">
-		Possible Cause: Simulator load too heavy
+		可能原因：模擬器負載過重
 	</floater.string>
 	<floater.string name="smaller_label">
 		&gt;&gt;
@@ -126,26 +126,26 @@
 	<floater.string name="bigger_label">
 		&lt;&lt;
 	</floater.string>
-	<button name="client_lagmeter" tool_tip="Client lag status"/>
+	<button name="client_lagmeter" tool_tip="客戶端 lag 狀態"/>
 	<text name="client">
-		Client
+		客戶端
 	</text>
 	<text name="client_text">
-		Normal
+		正常
 	</text>
-	<button name="network_lagmeter" tool_tip="Network lag status"/>
+	<button name="network_lagmeter" tool_tip="網路 lag 狀態"/>
 	<text name="network">
-		Network
+		網路
 	</text>
 	<text name="network_text">
-		Normal
+		正常
 	</text>
-	<button name="server_lagmeter" tool_tip="Server lag status"/>
+	<button name="server_lagmeter" tool_tip="伺服器 lag 狀態"/>
 	<text name="server">
-		Server
+		伺服器
 	</text>
 	<text name="server_text">
-		Normal
+		正常
 	</text>
-	<button label="&gt;&gt;" name="minimize" tool_tip="Toggle floater size"/>
+	<button label="&gt;&gt;" name="minimize" tool_tip="切換浮動視窗尺寸"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index de551f8c96..3d9d391a21 100644
--- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
@@ -9,13 +9,13 @@
 		<scroll_list.columns label="Type" name="type"/>
 		<scroll_list.columns label="Area" name="area"/>
 	</scroll_list>
-	<button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleport to the center of this land."/>
+	<button label="瞬間傳送" label_selected="瞬間傳送" name="Teleport" tool_tip="Teleport to the center of this land."/>
 	<button label="地圖" label_selected="地圖" name="Show on Map" tool_tip="Show this land on the world map"/>
 	<text name="contrib_label">
 		Contributions to your groups:
 	</text>
 	<scroll_list name="grant list">
-		<scroll_list.columns label="Group" name="group"/>
+		<scroll_list.columns label="社團" name="group"/>
 		<scroll_list.columns label="Area" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
index 1866592d84..3e44f458e7 100644
--- a/indra/newview/skins/default/xui/zh/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml
@@ -25,22 +25,22 @@
 		Run right (press Shift + Right Arrow or D)
 	</string>
 	<string name="fly_forward_tooltip">
-		Fly Forward (press Up Arrow or W)
+		向前飛（按下向上箭頭或 W 鍵）
 	</string>
 	<string name="fly_back_tooltip">
-		Fly Backwards (press Down Arrow or S)
+		向後飛（按下向下箭頭或 S 鍵）
 	</string>
 	<string name="fly_left_tooltip">
-		Fly left (press Shift + Left Arrow or A)
+		向左飛（按下 Shift 加上左方向鍵或者是按 A 鍵）
 	</string>
 	<string name="fly_right_tooltip">
-		Fly right (press Shift + Right Arrow or D)
+		向右飛（按下 Shift 加上右方向鍵或者是按 D 鍵）
 	</string>
 	<string name="fly_up_tooltip">
-		Fly up (press E)
+		向上飛（按下 E 鍵）
 	</string>
 	<string name="fly_down_tooltip">
-		Fly down (press C)
+		向下飛（按下 C 鍵）
 	</string>
 	<string name="jump_tooltip">
 		Jump (press E)
@@ -55,7 +55,7 @@
 		Run
 	</string>
 	<string name="fly_title">
-		Fly
+		飛行
 	</string>
 	<panel name="panel_actions">
 		<button name="turn left btn" tool_tip="Turn left (press Left Arrow or A)"/>
@@ -64,12 +64,12 @@
 		<joystick_slide name="move right btn" tool_tip="Walk right (press Shift + Right Arrow or D)"/>
 		<joystick_turn name="forward btn" tool_tip="Walk forward (press up arrow or W)"/>
 		<joystick_turn name="backward btn" tool_tip="Walk backward (press down arrow or S)"/>
-		<button name="move up btn" tool_tip="Fly up (press E)"/>
-		<button name="move down btn" tool_tip="Fly down (press C)"/>
+		<button name="move up btn" tool_tip="向上飛（按下 E 鍵）"/>
+		<button name="move down btn" tool_tip="向下飛（按下 C 建）"/>
 	</panel>
 	<panel name="panel_modes">
 		<button label="" name="mode_walk_btn" tool_tip="Walking mode"/>
 		<button label="" name="mode_run_btn" tool_tip="Running mode"/>
-		<button label="" name="mode_fly_btn" tool_tip="Flying mode"/>
+		<button label="" name="mode_fly_btn" tool_tip="飛行模式"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml
index 65102216d2..1e0e207fb0 100644
--- a/indra/newview/skins/default/xui/zh/floater_notification.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notification.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notification" title="NOTIFICATIONS CONSOLE">
+<floater name="notification" title="通知控制台">
 	<text_editor name="payload">
 		載入中...
 	</text_editor>
-	<combo_box label="Response" name="response"/>
+	<combo_box label="回應" name="response"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
index 4e92aa69e0..3478761b0b 100644
--- a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notifications_console" title="NOTIFICATIONS CONSOLE">
-	<combo_box label="Select notification type" name="notification_types"/>
-	<button label="Add" name="add_notification"/>
+<floater name="notifications_console" title="通知控制台">
+	<combo_box label="選擇通知類型" name="notification_types"/>
+	<button label="添加" name="add_notification"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
index 0739e01833..024ef0b102 100644
--- a/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml
@@ -3,6 +3,6 @@
 	<text name="object_name">
 		[DESC]:
 	</text>
-	<button label="Copy To Inventory" label_selected="Copy To Inventory" name="copy_to_inventory_button"/>
-	<button label="Copy And Wear" label_selected="Copy And Wear" name="copy_and_wear_button"/>
+	<button label="覆製到收納區" label_selected="覆製到收納區" name="copy_to_inventory_button"/>
+	<button label="覆製且穿上" label_selected="覆製且穿上" name="copy_and_wear_button"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
index 63c9d6c950..feb68f2b0f 100644
--- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title="Save Outfit">
+<floater name="modal container" title="儲存裝扮">
 	<button label="儲存" label_selected="儲存" name="Save"/>
 	<button label="取銷" label_selected="取銷" name="Cancel"/>
 	<text name="Save item as:">
-		Save what I&apos;m wearing
-as a new Outfit:
+		儲存我正在穿的為新裝扮：
 	</text>
 	<line_editor name="name ed">
 		[DESC] (new)
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index a871f821e3..0cc7bbcfe0 100644
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
@@ -10,7 +10,7 @@
 		anonymous
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		is calling.
+		通話中。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		has joined a Voice Chat call with a conference chat.
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index fe64f75777..52e6a9d8e4 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -54,9 +54,9 @@
 	</text>
 	<button label="Up" name="up_btn"/>
 	<button label="Down" name="down_btn"/>
-	<button label="Remove" name="delete_btn"/>
+	<button label="移除" name="delete_btn"/>
 	<text name="options_text">
-		(options)
+		（選項）
 	</text>
 	<radio_group name="animation_trigger_type">
 		<radio_item label="Start" name="start"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index a3eaa559e0..08d56be302 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="NOTECARD:">
+<floater name="preview notecard" title="記事卡：">
 	<floater.string name="no_object">
 		Unable to find object containing this notecard.
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
index 53fb7ef2f1..02e26cea24 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_texture">
 	<floater.string name="Title">
-		Texture: [NAME]
+		材質：[NAME]
 	</floater.string>
 	<floater.string name="Copy">
-		Copy To Inventory
+		覆製到收納區
 	</floater.string>
 	<text name="desc txt">
 		描述：
@@ -22,7 +22,7 @@
 		<combo_item name="1:1" tool_tip="Group insignia or Real World profile">
 			1:1
 		</combo_item>
-		<combo_item name="4:3" tool_tip="[SECOND_LIFE] profile">
+		<combo_item name="4:3" tool_tip="[SECOND_LIFE] 檔案">
 			4:3
 		</combo_item>
 		<combo_item name="10:7" tool_tip="Classifieds and search listings, landmarks">
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index c745051c8b..da89cd80ad 100644
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_report_abuse" title="REPORT ABUSE">
+<floater name="floater_report_abuse" title="舉報濫用">
 	<floater.string name="Screenshot">
-		Screenshot
+		快照
 	</floater.string>
-	<check_box label="Use this screenshot" name="screen_check"/>
+	<check_box label="使用這張快照" name="screen_check"/>
 	<text name="reporter_title">
-		Reporter:
+		舉報者：
 	</text>
 	<text name="sim_title">
 		地區：
@@ -24,13 +24,13 @@
 	</text>
 	<button name="pick_btn" tool_tip="Object Picker - Identify an object as the subject of this report"/>
 	<text name="object_name_label">
-		Object:
+		物件：
 	</text>
 	<text name="owner_name_label">
 		擁有者：
 	</text>
 	<combo_box name="category_combo" tool_tip="Category -- select the category that best describes this report">
-		<combo_box.item label="Select category" name="Select_category"/>
+		<combo_box.item label="選擇類別" name="Select_category"/>
 		<combo_box.item label="Age &gt; Age play" name="Age__Age_play"/>
 		<combo_box.item label="Age &gt; Adult Resident on Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
 		<combo_box.item label="Age &gt; Underage Resident outside of Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
@@ -68,20 +68,20 @@
 		<combo_box.item label="Land &gt; Encroachment &gt; Particles" name="Land__Encroachment__Particles"/>
 		<combo_box.item label="Land &gt; Encroachment &gt; Trees/plants" name="Land__Encroachment__Trees_plants"/>
 		<combo_box.item label="Wagering/gambling" name="Wagering_gambling"/>
-		<combo_box.item label="Other" name="Other"/>
+		<combo_box.item label="其他" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
-		Abuser name:
+		濫用者名稱：
 	</text>
-	<button label="Choose" name="select_abuser" tool_tip="Select the name of the abuser from a list"/>
+	<button label="選擇" name="select_abuser" tool_tip="Select the name of the abuser from a list"/>
 	<text name="abuser_name_title2">
-		Location of Abuse:
+		濫用位置：
 	</text>
 	<text name="sum_title">
-		Summary:
+		摘要：
 	</text>
 	<text name="dscr_title">
-		Details:
+		細節：
 	</text>
 	<text name="bug_aviso">
 		Please be as specific as possible
@@ -89,6 +89,6 @@
 	<text name="incomplete_title">
 		* Incomplete reports won&apos;t be investigated
 	</text>
-	<button label="Report Abuse" label_selected="Report Abuse" name="send_btn"/>
+	<button label="舉報濫用" label_selected="舉報濫用" name="send_btn"/>
 	<button label="取銷" label_selected="取銷" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 12d4ed606d..2d3f5066bc 100644
--- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -9,7 +9,7 @@
 				地段名稱
 			</text>
 			<text name="info_size_label">
-				Size:
+				尺寸：
 			</text>
 			<text name="info_size">
 				[AREA] m²
@@ -39,11 +39,11 @@
 				Choose whether to sell to anyone or a particular buyer.
 			</text>
 			<combo_box name="sell_to">
-				<combo_box.item label="- Select one -" name="--selectone--"/>
+				<combo_box.item label="- 選擇一個 -" name="--selectone--"/>
 				<combo_box.item label="任何人" name="Anyone"/>
 				<combo_box.item label="Specific person:" name="Specificuser:"/>
 			</combo_box>
-			<button label="Select" name="sell_to_select_agent"/>
+			<button label="選擇" name="sell_to_select_agent"/>
 			<text name="sell_objects_label">
 				3. Sell the objects with the land?
 			</text>
@@ -54,7 +54,7 @@
 				<radio_item label="No, keep ownership of objects" name="no"/>
 				<radio_item label="Yes, sell objects with land" name="yes"/>
 			</radio_group>
-			<button label="Show Objects" name="show_objects"/>
+			<button label="顯示物件" name="show_objects"/>
 			<text name="nag_message_label">
 				REMEMBER: All sales are final.
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 80b9d69a79..b4216cf5b2 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -5,7 +5,7 @@
 	</floater.string>
 	<radio_group label="Snapshot type" name="snapshot_type_radio">
 		<radio_item label="Email" name="postcard"/>
-		<radio_item label="My inventory (L$[AMOUNT])" name="texture"/>
+		<radio_item label="我的收納區（L$[AMOUNT]）" name="texture"/>
 		<radio_item label="Save to my computer" name="local"/>
 	</radio_group>
 	<text name="file_size_label">
@@ -17,31 +17,31 @@
 		<flyout_button.item label="儲存" name="save_item"/>
 		<flyout_button.item label="另存..." name="saveas_item"/>
 	</flyout_button>
-	<button label="More" name="more_btn" tool_tip="Advanced options"/>
-	<button label="Less" name="less_btn" tool_tip="Advanced options"/>
+	<button label="更多" name="more_btn" tool_tip="進階選項"/>
+	<button label="更少" name="less_btn" tool_tip="進階選項"/>
 	<button label="取銷" name="discard_btn"/>
 	<text name="type_label2">
-		Size
+		尺寸
 	</text>
 	<text name="format_label">
 		Format
 	</text>
 	<combo_box label="Resolution" name="postcard_size_combo">
-		<combo_box.item label="Current Window" name="CurrentWindow"/>
+		<combo_box.item label="目前視窗" name="CurrentWindow"/>
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
 		<combo_box.item label="1024x768" name="1024x768"/>
-		<combo_box.item label="Custom" name="Custom"/>
+		<combo_box.item label="自訂" name="Custom"/>
 	</combo_box>
 	<combo_box label="Resolution" name="texture_size_combo">
-		<combo_box.item label="Current Window" name="CurrentWindow"/>
+		<combo_box.item label="目前視窗" name="CurrentWindow"/>
 		<combo_box.item label="Small (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Medium (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Large (512x512)" name="Large(512x512)"/>
-		<combo_box.item label="Custom" name="Custom"/>
+		<combo_box.item label="自訂" name="Custom"/>
 	</combo_box>
 	<combo_box label="Resolution" name="local_size_combo">
-		<combo_box.item label="Current Window" name="CurrentWindow"/>
+		<combo_box.item label="目前視窗" name="CurrentWindow"/>
 		<combo_box.item label="320x240" name="320x240"/>
 		<combo_box.item label="640x480" name="640x480"/>
 		<combo_box.item label="800x600" name="800x600"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index 6b6276e88f..54c5ba5cc0 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -15,7 +15,7 @@
 					<stat_bar label="Total Objects" name="objs"/>
 					<stat_bar label="New Objects" name="newobjs"/>
 				</stat_view>
-				<stat_view label="Texture" name="texture">
+				<stat_view label="材質" name="texture">
 					<stat_bar label="Count" name="numimagesstat"/>
 					<stat_bar label="Raw Count" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>
@@ -27,7 +27,7 @@
 					<stat_bar label="Packets In" name="packetsinstat"/>
 					<stat_bar label="Packets Out" name="packetsoutstat"/>
 					<stat_bar label="Objects" name="objectkbitstat"/>
-					<stat_bar label="Texture" name="texturekbitstat"/>
+					<stat_bar label="材質" name="texturekbitstat"/>
 					<stat_bar label="Asset" name="assetkbitstat"/>
 					<stat_bar label="Layers" name="layerskbitstat"/>
 					<stat_bar label="Actual In" name="actualinkbitstat"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index 4c6dffea76..aaf6ecd7cf 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -10,13 +10,13 @@
 		Multiple textures
 	</text>
 	<text name="unknown">
-		Size: [DIMENSIONS]
+		尺寸：[DIMENSIONS]
 	</text>
 	<button label="預設" label_selected="預設" name="Default"/>
 	<button label="無" label_selected="無" name="None"/>
 	<button label="Blank" label_selected="Blank" name="Blank"/>
 	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
-	<filter_editor label="Filter Textures" name="inventory search editor"/>
+	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
 	<button label="確定" label_selected="確定" name="Select"/>
 	<button label="取銷" label_selected="取銷" name="Cancel"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index b0d3d69230..feee659736 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -73,7 +73,7 @@
 	<text label="Stretch Both Sides" name="checkbox uniform label">
 		Stretch Both Sides
 	</text>
-	<check_box initial_value="true" label="Stretch Textures" name="checkbox stretch textures"/>
+	<check_box initial_value="true" label="伸展材質" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="貼齊格線" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Choose the type of grid ruler for positioning the object">
 		<combo_box.item label="World grid" name="World"/>
@@ -113,7 +113,7 @@
 		Bulldozer:
 	</text>
 	<text name="Dozer Size:">
-		Size
+		尺寸
 	</text>
 	<slider_bar initial_value="2.0" name="slider brush size"/>
 	<text name="Strength:">
@@ -178,7 +178,7 @@
 				擁有者：
 			</text>
 			<text name="Group:">
-				Group:
+				社團：
 			</text>
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
 			<button name="button set group" tool_tip="Choose a group to share this object&apos;s permissions"/>
@@ -250,7 +250,7 @@
 			<spinner label="Y" name="Pos Y"/>
 			<spinner label="Z" name="Pos Z"/>
 			<text name="label size">
-				Size (meters)
+				尺寸（公尺）
 			</text>
 			<spinner label="X" name="Scale X"/>
 			<spinner label="Y" name="Scale Y"/>
@@ -309,7 +309,7 @@
 				Taper
 			</text>
 			<text name="scale_hole">
-				Hole Size
+				洞尺寸
 			</text>
 			<spinner label="X" name="Taper Scale X"/>
 			<spinner label="Y" name="Taper Scale Y"/>
@@ -380,14 +380,14 @@
 			<spinner label="Falloff" name="Light Falloff"/>
 			<spinner label="Ambiance" name="Light Ambiance"/>
 		</panel>
-		<panel label="Texture" name="Texture">
+		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
 				Repeats Per Meter
 			</panel.string>
 			<panel.string name="string repeats per face">
 				Repeats Per Face
 			</panel.string>
-			<texture_picker label="Texture" name="texture control" tool_tip="點擊以挑選圖片"/>
+			<texture_picker label="材質" name="texture control" tool_tip="點擊以挑選圖片"/>
 			<color_swatch label="Color" name="colorswatch" tool_tip="Click to open color picker"/>
 			<text name="color trans">
 				Transparency %
@@ -447,7 +447,7 @@
 			<spinner label="Repeats / Meter" name="rptctrl"/>
 			<button label="套用" label_selected="套用" name="button apply"/>
 			<text name="tex offset">
-				Texture Offset
+				材質位移
 			</text>
 			<spinner label="Horizontal (U)" name="TexOffsetU"/>
 			<spinner label="Vertical (V)" name="TexOffsetV"/>
@@ -456,7 +456,7 @@
 					Media
 				</text>
 				<button name="add_media" tool_tip="Add Media"/>
-				<button name="delete_media" tool_tip="Delete this media texture"/>
+				<button name="delete_media" tool_tip="刪除這個媒體材質"/>
 				<button name="edit_media" tool_tip="Edit this Media"/>
 				<button label="Align" label_selected="Align Media" name="button align" tool_tip="Align media texture (must load first)"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index d4a76555cb..4d650eaaee 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -17,7 +17,7 @@
 	</string>
 	<layout_stack name="my_call_stack">
 		<layout_panel name="my_panel">
-			<text name="user_text" value="My Avatar:"/>
+			<text name="user_text" value="我的化身："/>
 		</layout_panel>
 		<layout_panel name="leave_call_panel">
 			<layout_stack name="voice_effect_and_leave_call_stack">
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
index 2e0fcd13a8..8e790f8dad 100644
--- a/indra/newview/skins/default/xui/zh/floater_water.xml
+++ b/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ADVANCED WATER EDITOR">
+<floater name="Water Floater" title="進階水文編輯器">
 	<floater.string name="WLDefaultWaterNames">
 		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
 	</floater.string>
 	<text name="KeyFramePresetsText">
 		Water Presets:
 	</text>
-	<button label="New" label_selected="New" name="WaterNewPreset"/>
+	<button label="新增" label_selected="新增" name="WaterNewPreset"/>
 	<button label="儲存" label_selected="儲存" name="WaterSavePreset"/>
 	<button label="刪除" label_selected="刪除" name="WaterDeletePreset"/>
 	<tab_container name="Water Tabs">
@@ -63,7 +63,7 @@
 				Y
 			</text>
 			<text name="BHText3">
-				Normal Map
+				正常地圖
 			</text>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
index 2b202a9e6c..d292386323 100644
--- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -99,7 +99,7 @@
 				Sun Glow
 			</text>
 			<slider label="Focus" name="WLGlowB"/>
-			<slider label="Size" name="WLGlowR"/>
+			<slider label="尺寸" name="WLGlowR"/>
 			<text name="SceneGammaText">
 				Scene Gamma
 			</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
index 34b969c2dc..167d4cb858 100644
--- a/indra/newview/skins/default/xui/zh/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="window_size" title="WINDOW SIZE">
+<floater name="window_size" title="視窗尺寸大小">
 	<string name="resolution_format">
 		[RES_X] x [RES_Y]
 	</string>
 	<text name="windowsize_text">
-		Set window size:
+		設定視窗尺寸大小：
 	</text>
 	<combo_box name="window_size_combo" tool_tip="width x height">
-		<combo_box.item label="1000 x 700 (default)" name="item0"/>
+		<combo_box.item label="1000 x 700 （預設）" name="item0"/>
 		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1280 x 720 （720p）" name="item2"/>
+		<combo_box.item label="1920 x 1080 （1080p）" name="item3"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="取銷" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index e149285ab2..47038e3b3d 100644
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -25,9 +25,9 @@
 		<text name="by_owner_label">
 			by owner
 		</text>
-		<button name="Go Home" tool_tip="Teleport to my home location"/>
+		<button name="Go Home" tool_tip="瞬間傳送到我的家位置"/>
 		<text name="Home_label">
-			Home
+			家
 		</text>
 		<text name="events_label">
 			Events:
@@ -45,24 +45,24 @@
 	</panel>
 	<panel name="layout_panel_3">
 		<text name="find_on_map_label">
-			Find on Map
+			在地圖上發現
 		</text>
 	</panel>
 	<panel name="layout_panel_4">
-		<combo_box label="Online Friends" name="friend combo" tool_tip="Show friends on map">
-			<combo_box.item label="My Friends Online" name="item1"/>
+		<combo_box label="線上的朋友" name="friend combo" tool_tip="顯示朋友在地圖上">
+			<combo_box.item label="我線上的朋友" name="item1"/>
 		</combo_box>
-		<combo_box label="My Landmarks" name="landmark combo" tool_tip="Landmark to show on map">
-			<combo_box.item label="My Landmarks" name="item1"/>
+		<combo_box label="我的地標" name="landmark combo" tool_tip="將地標位置顯示在地圖上">
+			<combo_box.item label="我的地標" name="item1"/>
 		</combo_box>
-		<search_editor label="Regions by Name" name="location" tool_tip="Type the name of a region"/>
+		<search_editor label="Regions by Name" name="location" tool_tip="輸入一個地區的名稱"/>
 		<button label="Find" name="DoSearch" tool_tip="Search for region"/>
 		<button name="Clear" tool_tip="Clear tracking lines and reset map"/>
 		<text name="events_label">
 			位置：
 		</text>
-		<button label="Teleport" name="Teleport" tool_tip="Teleport to selected location"/>
-		<button label="Copy SLurl" name="copy_slurl" tool_tip="Copies current location as SLurl to be used on the web."/>
+		<button label="瞬間傳送" name="Teleport" tool_tip="瞬間傳送到所選的位置"/>
+		<button label="覆製 SLurl" name="copy_slurl" tool_tip="Copies current location as SLurl to be used on the web."/>
 		<button label="Show Selection" name="Show Destination" tool_tip="Center map on selected location"/>
 	</panel>
 	<panel name="layout_panel_5">
diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
index df450937fd..02e81983a6 100644
--- a/indra/newview/skins/default/xui/zh/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
@@ -17,7 +17,7 @@
 	<slider name="volume_slider" tool_tip="Voice volume" value="0.5"/>
 	<button label="加為朋友" name="add_friend_btn"/>
 	<button label="IM" name="im_btn"/>
-	<button label="Profile" name="view_profile_btn"/>
+	<button label="檔案" name="view_profile_btn"/>
 	<panel name="moderator_panel">
 		<button label="Disable Voice" name="disable_voice"/>
 		<button label="Enable Voice" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
index 72e5eade9c..01649496bc 100644
--- a/indra/newview/skins/default/xui/zh/inspect_group.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_group.xml
@@ -5,7 +5,7 @@
 -->
 <floater name="inspect_group">
 	<string name="PrivateGroup">
-		Private group
+		私人社團
 	</string>
 	<string name="FreeToJoin">
 		Free to join
@@ -28,5 +28,5 @@ Fear the moose!  Fear it!  And the mongoose too!
 	</text>
 	<button label="Join" name="join_btn"/>
 	<button label="Leave" name="leave_btn"/>
-	<button label="View Profile" name="view_profile_btn"/>
+	<button label="察看檔案" name="view_profile_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index b674ed2763..aa803cc49d 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_avatar_other.xml -->
 <context_menu name="Avatar Pie">
-	<menu_item_call label="View Profile" name="Profile..."/>
+	<menu_item_call label="察看檔案" name="Profile..."/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="Send IM..."/>
-	<menu_item_call label="Call" name="Call"/>
-	<menu_item_call label="Invite to Group" name="Invite..."/>
-	<menu_item_call label="Block" name="Avatar Mute"/>
-	<menu_item_call label="Report" name="abuse"/>
+	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="邀請加入社團" name="Invite..."/>
+	<menu_item_call label="封鎖" name="Avatar Mute"/>
+	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="Freeze" name="Freeze..."/>
 	<menu_item_call label="Eject" name="Eject..."/>
-	<menu_item_call label="Debug Textures" name="Debug..."/>
+	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="Zoom In" name="Zoom In"/>
 	<menu_item_call label="Pay" name="Pay..."/>
-	<menu_item_call label="Object Profile" name="Object Inspect"/>
+	<menu_item_call label="物件檔案" name="Object Inspect"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index 2089f8d58a..e3a791cde5 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -5,12 +5,12 @@
 	<menu_item_call label="卸下" name="Detach"/>
 	<menu_item_call label="坐下" name="Sit Down Here"/>
 	<menu_item_call label="起立" name="Stand Up"/>
-	<menu_item_call label="My Appearance" name="Change Outfit"/>
-	<menu_item_call label="Edit My Outfit" name="Edit Outfit"/>
-	<menu_item_call label="Edit My Shape" name="Edit My Shape"/>
-	<menu_item_call label="My Friends" name="Friends..."/>
-	<menu_item_call label="My Groups" name="Groups..."/>
-	<menu_item_call label="My Profile" name="Profile..."/>
-	<menu_item_call label="Debug Textures" name="Debug..."/>
-	<menu_item_call label="Drop" name="Drop"/>
+	<menu_item_call label="我的外觀" name="Change Outfit"/>
+	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
+	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
+	<menu_item_call label="我的朋友" name="Friends..."/>
+	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的檔案" name="Profile..."/>
+	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="丟棄" name="Drop"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
index cce8fa3ca6..1da583b3d0 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Avatar Icon Menu">
-	<menu_item_call label="View Profile" name="Show Profile"/>
-	<menu_item_call label="Send IM..." name="Send IM"/>
+	<menu_item_call label="察看檔案" name="Show Profile"/>
+	<menu_item_call label="送出 IM..." name="Send IM"/>
 	<menu_item_call label="加為朋友..." name="Add Friend"/>
 	<menu_item_call label="Remove Friend..." name="Remove Friend"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index db22646ced..281d357fd3 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu name="Avatar Pie">
-	<menu_item_call label="View Profile" name="Profile..."/>
+	<menu_item_call label="察看檔案" name="Profile..."/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="Send IM..."/>
-	<menu_item_call label="Call" name="Call"/>
-	<menu_item_call label="Invite to Group" name="Invite..."/>
+	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="邀請加入社團" name="Invite..."/>
 	<menu_item_call label="Block" name="Avatar Mute"/>
-	<menu_item_call label="Report" name="abuse"/>
+	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="Freeze" name="Freeze..."/>
 	<menu_item_call label="Eject" name="Eject..."/>
-	<menu_item_call label="Debug Textures" name="Debug..."/>
+	<menu_item_call label="材質除錯" name="Debug..."/>
 	<menu_item_call label="Zoom In" name="Zoom In"/>
 	<menu_item_call label="Pay" name="Pay..."/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index bccae5b547..646edcf563 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="坐下" name="Sit Down Here"/>
 	<menu_item_call label="起立" name="Stand Up"/>
 	<context_menu label="脫下" name="Take Off &gt;">
-		<context_menu label="Clothes" name="Clothes &gt;">
+		<context_menu label="衣服" name="Clothes &gt;">
 			<menu_item_call label="襯衫" name="Shirt"/>
 			<menu_item_call label="褲子" name="Pants"/>
 			<menu_item_call label="裙子" name="Skirt"/>
@@ -16,17 +16,17 @@
 			<menu_item_call label="刺青" name="Self Tattoo"/>
 			<menu_item_call label="Physics" name="Self Physics"/>
 			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="All Clothes" name="All Clothes"/>
+			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="HUD" name="Object Detach HUD"/>
 		<context_menu label="卸下" name="Object Detach"/>
 		<menu_item_call label="全部卸下" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="My Appearance" name="Chenge Outfit"/>
-	<menu_item_call label="Edit My Outfit" name="Edit Outfit"/>
-	<menu_item_call label="Edit My Shape" name="Edit My Shape"/>
-	<menu_item_call label="My Friends" name="Friends..."/>
-	<menu_item_call label="My Groups" name="Groups..."/>
-	<menu_item_call label="My Profile" name="Profile..."/>
-	<menu_item_call label="Debug Textures" name="Debug..."/>
+	<menu_item_call label="我的外觀" name="Chenge Outfit"/>
+	<menu_item_call label="編輯我裝扮" name="Edit Outfit"/>
+	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
+	<menu_item_call label="我的朋友" name="Friends..."/>
+	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的檔案" name="Profile..."/>
+	<menu_item_call label="材質除錯" name="Debug..."/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index 7314676c6c..cd069f9601 100644
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
-	<menu label="New Clothes" name="COF.Gear.New_Clothes"/>
-	<menu label="New Body Parts" name="COF.Geear.New_Body_Parts"/>
+	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
+	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml
index 1e645acc7a..5c5c225c59 100644
--- a/indra/newview/skins/default/xui/zh/menu_edit.xml
+++ b/indra/newview/skins/default/xui/zh/menu_edit.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu label="編輯" name="Edit">
 	<menu_item_call label="復原" name="Undo"/>
-	<menu_item_call label="Redo" name="Redo"/>
+	<menu_item_call label="重做" name="Redo"/>
 	<menu_item_call label="剪下" name="Cut"/>
 	<menu_item_call label="覆製" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="覆製貼上" name="Duplicate"/>
 	<menu_item_call label="全選" name="Select All"/>
-	<menu_item_call label="Deselect" name="Deselect"/>
+	<menu_item_call label="取銷選擇" name="Deselect"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml
index 042f5c3a93..c60bebd3dc 100644
--- a/indra/newview/skins/default/xui/zh/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Teleport" name="Teleport To Landmark"/>
-	<menu_item_call label="View/Edit Landmark" name="Landmark Open"/>
-	<menu_item_call label="Copy SLurl" name="Copy slurl"/>
+	<menu_item_call label="瞬間傳送" name="Teleport To Landmark"/>
+	<menu_item_call label="察看 / 編輯 地標" name="Landmark Open"/>
+	<menu_item_call label="覆製 SLurl" name="Copy slurl"/>
 	<menu_item_call label="顯示在地圖上" name="Show On Map"/>
 	<menu_item_call label="覆製" name="Landmark Copy"/>
 	<menu_item_call label="貼上" name="Landmark Paste"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
index 488d80bfad..8e30a15562 100644
--- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
@@ -4,6 +4,6 @@
 	<menu_item_call label="覆製" name="copy_gesture"/>
 	<menu_item_call label="貼上" name="paste"/>
 	<menu_item_call label="Copy UUID" name="copy_uuid"/>
-	<menu_item_call label="Save to current outfit" name="save_to_outfit"/>
+	<menu_item_call label="儲存到目前裝扮" name="save_to_outfit"/>
 	<menu_item_call label="編輯" name="edit_gesture"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
index 7ca805278a..c208a146d2 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet Group Menu">
-	<menu_item_call label="Group Info" name="Show Profile"/>
+	<menu_item_call label="社團資訊" name="Show Profile"/>
 	<menu_item_call label="Show Session" name="Chat"/>
 	<menu_item_call label="End Session" name="End Session"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
index d9254f7aff..dc933518c0 100644
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="IMChiclet P2P Menu">
-	<menu_item_call label="View Profile" name="Show Profile"/>
+	<menu_item_call label="察看檔案" name="Show Profile"/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="Show Session" name="Send IM"/>
 	<menu_item_call label="End Session" name="End Session"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
index 2ed6cfad89..6d8fbba503 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <toggleable_menu name="Gear Menu">
-	<menu_item_call label="View Profile" name="view_profile"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
 	<menu_item_call label="加為朋友" name="add_friend"/>
 	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Call" name="call"/>
-	<menu_item_call label="Teleport" name="teleport"/>
+	<menu_item_call label="通話" name="call"/>
+	<menu_item_call label="瞬間傳送" name="teleport"/>
 	<menu_item_call label="Invite to Group" name="invite_to_group"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
-	<menu_item_call label="Report" name="report"/>
+	<menu_item_call label="回報" name="report"/>
 	<menu_item_call label="Freeze" name="freeze"/>
 	<menu_item_call label="Eject" name="eject"/>
-	<menu_item_call label="Kick" name="kick"/>
+	<menu_item_call label="踢除" name="kick"/>
 	<menu_item_call label="CSR" name="csr"/>
-	<menu_item_call label="Debug Textures" name="debug"/>
+	<menu_item_call label="材質除錯" name="debug"/>
 	<menu_item_call label="Find On Map" name="find_on_map"/>
 	<menu_item_call label="Zoom In" name="zoom_in"/>
 	<menu_item_call label="Pay" name="pay"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
index 41ea648803..dab95fcadc 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
@@ -10,7 +10,7 @@
 	<menu_item_call label="編輯" name="edit"/>
 	<menu_item_call label="Wear" name="wear"/>
 	<menu_item_call label="Add" name="add"/>
-	<menu_item_call label="Report" name="report"/>
+	<menu_item_call label="回報" name="report"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Zoom In" name="zoom_in"/>
 	<menu_item_call label="Remove" name="remove"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
index c88826708e..2d7da70bfc 100644
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="坐下" name="Sit Down Here"/>
 	<menu_item_call label="起立" name="Stand Up"/>
 	<context_menu label="脫下" name="Take Off &gt;">
-		<context_menu label="Clothes" name="Clothes &gt;">
+		<context_menu label="衣服" name="Clothes &gt;">
 			<menu_item_call label="襯衫" name="Shirt"/>
 			<menu_item_call label="褲子" name="Pants"/>
 			<menu_item_call label="裙子" name="Skirt"/>
@@ -15,17 +15,17 @@
 			<menu_item_call label="內褲" name="Self Underpants"/>
 			<menu_item_call label="刺青" name="Self Tattoo"/>
 			<menu_item_call label="Alpha" name="Self Alpha"/>
-			<menu_item_call label="All Clothes" name="All Clothes"/>
+			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="HUD" name="Object Detach HUD"/>
 		<context_menu label="卸下" name="Object Detach"/>
 		<menu_item_call label="全部卸下" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Change Outfit" name="Chenge Outfit"/>
-	<menu_item_call label="Edit My Outfit" name="Edit Outfit"/>
-	<menu_item_call label="Edit My Shape" name="Edit My Shape"/>
-	<menu_item_call label="My Friends" name="Friends..."/>
-	<menu_item_call label="My Groups" name="Groups..."/>
-	<menu_item_call label="My Profile" name="Profile..."/>
-	<menu_item_call label="Debug Textures" name="Debug..."/>
+	<menu_item_call label="變更裝扮" name="Chenge Outfit"/>
+	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
+	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
+	<menu_item_call label="我的朋友" name="Friends..."/>
+	<menu_item_call label="我的社團" name="Groups..."/>
+	<menu_item_call label="我的檔案" name="Profile..."/>
+	<menu_item_call label="材質除錯" name="Debug..."/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 086a89fc33..fd8f73e4ea 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -13,7 +13,7 @@
 	<menu_item_call label="New Script" name="New Script"/>
 	<menu_item_call label="New Notecard" name="New Note"/>
 	<menu_item_call label="New Gesture" name="New Gesture"/>
-	<menu label="New Clothes" name="New Clothes">
+	<menu label="新衣服" name="New Clothes">
 		<menu_item_call label="新襯衫" name="New Shirt"/>
 		<menu_item_call label="新褲子" name="New Pants"/>
 		<menu_item_call label="新鞋子" name="New Shoes"/>
@@ -24,10 +24,10 @@
 		<menu_item_call label="新內衣" name="New Undershirt"/>
 		<menu_item_call label="新內褲" name="New Underpants"/>
 		<menu_item_call label="New Alpha Mask" name="New Alpha Mask"/>
-		<menu_item_call label="New Tattoo" name="New Tattoo"/>
+		<menu_item_call label="新刺青" name="New Tattoo"/>
 		<menu_item_call label="New Physics" name="New Physics"/>
 	</menu>
-	<menu label="New Body Parts" name="New Body Parts">
+	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="New Shape" name="New Shape"/>
 		<menu_item_call label="New Skin" name="New Skin"/>
 		<menu_item_call label="New Hair" name="New Hair"/>
@@ -45,12 +45,12 @@
 		<menu_item_call label="內褲" name="Underpants"/>
 		<menu_item_call label="內衣" name="Undershirt"/>
 	</menu>
-	<menu_item_call label="Teleport" name="Landmark Open"/>
+	<menu_item_call label="瞬間傳送" name="Landmark Open"/>
 	<menu_item_call label="Open" name="Animation Open"/>
 	<menu_item_call label="Open" name="Sound Open"/>
-	<menu_item_call label="Replace Current Outfit" name="Replace Outfit"/>
-	<menu_item_call label="Add To Current Outfit" name="Add To Outfit"/>
-	<menu_item_call label="Remove From Current Outfit" name="Remove From Outfit"/>
+	<menu_item_call label="取代目前的裝扮" name="Replace Outfit"/>
+	<menu_item_call label="添加到目前裝扮" name="Add To Outfit"/>
+	<menu_item_call label="由目前的裝扮移除" name="Remove From Outfit"/>
 	<menu_item_call label="Find Original" name="Find Original"/>
 	<menu_item_call label="Purge Item" name="Purge Item"/>
 	<menu_item_call label="Restore Item" name="Restore Item"/>
@@ -67,7 +67,7 @@
 	<menu_item_call label="刪除系統資料夾" name="Delete System Folder"/>
 	<menu_item_call label="Start Conference Chat" name="Conference Chat Folder"/>
 	<menu_item_call label="Play" name="Sound Play"/>
-	<menu_item_call label="About Landmark" name="About Landmark"/>
+	<menu_item_call label="添加地標" name="About Landmark"/>
 	<menu_item_call label="Play Inworld" name="Animation Play"/>
 	<menu_item_call label="Play Locally" name="Animation Audition"/>
 	<menu_item_call label="Send Instant Message" name="Send Instant Message"/>
@@ -83,5 +83,5 @@
 	<menu_item_call label="編輯" name="Wearable Edit"/>
 	<menu_item_call label="Add" name="Wearable Add"/>
 	<menu_item_call label="脫下" name="Take Off"/>
-	<menu_item_call label="--no options--" name="--no options--"/>
+	<menu_item_call label="-- 無選項 --" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
index 1cfba8e989..9199608200 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
@@ -25,7 +25,7 @@
 		<menu_item_call label="新刺青" name="New Tattoo"/>
 		<menu_item_call label="New Physics" name="New Physics"/>
 	</menu>
-	<menu label="New Body Parts" name="New Body Parts">
+	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="新體形" name="New Shape"/>
 		<menu_item_call label="新皮膚" name="New Skin"/>
 		<menu_item_call label="新頭髮" name="New Hair"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 8b0fd8c014..8c938222e7 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gear_default">
-	<menu_item_call label="New Inventory Window" name="new_window"/>
+	<menu_item_call label="新收納區視窗" name="new_window"/>
 	<menu_item_check label="依名稱排序" name="sort_by_name"/>
 	<menu_item_check label="依最近排序" name="sort_by_recent"/>
 	<menu_item_check label="Sort Folders Always by Name" name="sort_folders_by_name"/>
@@ -9,7 +9,7 @@
 	<menu_item_call label="Reset Filters" name="reset_filters"/>
 	<menu_item_call label="關閉全部資料夾" name="close_folders"/>
 	<menu_item_call label="Empty Lost and Found" name="empty_lostnfound"/>
-	<menu_item_call label="Save Texture As" name="Save Texture As"/>
+	<menu_item_call label="儲存材質為" name="Save Texture As"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="Find Original" name="Find Original"/>
 	<menu_item_call label="Find All Links" name="Find All Links"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
index f91b479fb6..97b115151e 100644
--- a/indra/newview/skins/default/xui/zh/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="landmark_overflow_menu">
-	<menu_item_call label="Copy SLurl" name="copy"/>
+	<menu_item_call label="覆製 SLurl" name="copy"/>
 	<menu_item_call label="刪除" name="delete"/>
 	<menu_item_call label="Create Pick" name="pick"/>
 	<menu_item_call label="Add to Favorites Bar" name="add_to_favbar"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index 056c11e69d..436e86cb74 100644
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="Me" name="File">
+	<menu label="自己" name="File">
 		<menu_item_call label="Preferences" name="Preferences..."/>
 		<menu_item_call label="Exit [APP_NAME]" name="Quit"/>
 	</menu>
-	<menu label="Help" name="Help">
-		<menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/>
-		<menu_item_call label="About [APP_NAME]" name="About Second Life"/>
+	<menu label="幫助" name="Help">
+		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
+		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
 	</menu>
-	<menu_item_check label="Show Debug Menu" name="Show Debug Menu"/>
+	<menu_item_check label="顯示除錯選單" name="Show Debug Menu"/>
 	<menu label="除錯" name="Debug">
 		<menu_item_call label="Show Debug Settings" name="Debug Settings"/>
 		<menu_item_call label="UI/Color Settings" name="UI/Color Settings"/>
 		<menu_item_call label="XUI Preview Tool" name="UI Preview Tool"/>
 		<menu label="UI Tests" name="UI Tests"/>
-		<menu_item_call label="Set Window Size..." name="Set Window Size..."/>
+		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
 		<menu_item_call label="Show TOS" name="TOS"/>
 		<menu_item_call label="Show Critical Message" name="Critical"/>
 		<menu_item_call label="Media Browser Test" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml
index 66b5fbe58d..69df4929f2 100644
--- a/indra/newview/skins/default/xui/zh/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_navbar.xml
@@ -2,7 +2,7 @@
 <menu name="Navbar Menu">
 	<menu_item_check label="顯示座標" name="Show Coordinates"/>
 	<menu_item_check label="顯示地段屬性" name="Show Parcel Properties"/>
-	<menu_item_call label="Landmark" name="Landmark"/>
+	<menu_item_call label="地標" name="Landmark"/>
 	<menu_item_call label="剪下" name="Cut"/>
 	<menu_item_call label="覆製" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
index 6e525cccd5..7d8997fafe 100644
--- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
@@ -5,5 +5,5 @@
 	<menu_item_check label="Show Buddy Icons" name="show_buddy_icons"/>
 	<menu_item_check label="Show Names" name="show_names"/>
 	<menu_item_check label="Show Icons and Names" name="show_icons_and_names"/>
-	<menu_item_call label="Font Size" name="font_size"/>
+	<menu_item_call label="字型尺寸" name="font_size"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index 6107318a0e..869c5f66fe 100644
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
@@ -6,7 +6,7 @@
 	<menu_item_call label="Open" name="Open"/>
 	<menu_item_call label="Sit Here" name="Object Sit"/>
 	<menu_item_call label="起立" name="Object Stand Up"/>
-	<menu_item_call label="Object Profile" name="Object Inspect"/>
+	<menu_item_call label="物件檔案" name="Object Inspect"/>
 	<menu_item_call label="Zoom In" name="Zoom In"/>
 	<context_menu label="Put On" name="Put On">
 		<menu_item_call label="Wear" name="Wear"/>
@@ -15,7 +15,7 @@
 		<context_menu label="Attach HUD" name="Object Attach HUD"/>
 	</context_menu>
 	<context_menu label="Manage" name="Remove">
-		<menu_item_call label="Report Abuse" name="Report Abuse..."/>
+		<menu_item_call label="舉報濫用" name="Report Abuse..."/>
 		<menu_item_call label="Block" name="Object Mute"/>
 		<menu_item_call label="Return" name="Return..."/>
 	</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index 7cf6289bd1..d27e75b830 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Object Icon Menu">
-	<menu_item_call label="Object Profile..." name="Object Profile"/>
+	<menu_item_call label="物件檔案..." name="Object Profile"/>
 	<menu_item_call label="Block..." name="Block"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index 6befd163b3..169dbf2187 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Outfit">
-	<menu_item_call label="Wear - Replace Current Outfit" name="wear"/>
-	<menu_item_call label="Wear - Add to Current Outfit" name="wear_add"/>
-	<menu_item_call label="Take Off - Remove from Current Outfit" name="take_off"/>
-	<menu label="New Clothes" name="New Clothes">
+	<menu_item_call label="穿上 － 取代目前裝扮" name="wear"/>
+	<menu_item_call label="穿上 － 添加到目前裝扮" name="wear_add"/>
+	<menu_item_call label="脫下 － 由目前裝扮移除" name="take_off"/>
+	<menu label="新衣服" name="New Clothes">
 		<menu_item_call label="新襯衫" name="New Shirt"/>
 		<menu_item_call label="新褲子" name="New Pants"/>
 		<menu_item_call label="新鞋子" name="New Shoes"/>
@@ -15,14 +15,14 @@
 		<menu_item_call label="新內褲" name="New Underpants"/>
 		<menu_item_call label="New Alpha" name="New Alpha"/>
 		<menu_item_call label="New Physics" name="New Physics"/>
-		<menu_item_call label="New Tattoo" name="New Tattoo"/>
+		<menu_item_call label="新刺青" name="New Tattoo"/>
 	</menu>
-	<menu label="New Body Parts" name="New Body Parts">
+	<menu label="新身體部位" name="New Body Parts">
 		<menu_item_call label="New Shape" name="New Shape"/>
 		<menu_item_call label="New Skin" name="New Skin"/>
 		<menu_item_call label="New Hair" name="New Hair"/>
 		<menu_item_call label="New Eyes" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Rename Outfit" name="rename"/>
-	<menu_item_call label="Delete Outfit" name="delete_outfit"/>
+	<menu_item_call label="裝扮更名" name="rename"/>
+	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
index 9254aadf56..a4614710f4 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit">
-	<menu_item_call label="Wear - Replace Current Outfit" name="wear_replace"/>
-	<menu_item_call label="Wear - Add to Current Outfit" name="wear_add"/>
-	<menu_item_call label="Take Off - Remove from Current Outfit" name="take_off"/>
-	<menu_item_call label="Edit Outfit" name="edit"/>
-	<menu_item_call label="Rename Outfit" name="rename"/>
-	<menu_item_call label="Delete Outfit" name="delete"/>
+	<menu_item_call label="穿上 － 取代目前裝扮" name="wear_replace"/>
+	<menu_item_call label="穿上 － 添加到目前裝扮" name="wear_add"/>
+	<menu_item_call label="脫下 － 由目前裝扮移除" name="take_off"/>
+	<menu_item_call label="編輯裝扮" name="edit"/>
+	<menu_item_call label="裝扮更名" name="rename"/>
+	<menu_item_call label="刪除裝扮" name="delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index c487c35588..7b6f6f954e 100644
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
@@ -2,10 +2,10 @@
 <context_menu name="Participant List Context Menu">
 	<menu_item_check label="依名稱排序" name="SortByName"/>
 	<menu_item_check label="Sort by Recent Speakers" name="SortByRecentSpeakers"/>
-	<menu_item_call label="View Profile" name="View Profile"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Call" name="Call"/>
+	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="Pay" name="Pay"/>
 	<menu_item_check label="View People Icons" name="View Icons"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index c2d7182a6c..1d78c1de0a 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="Call" name="Call"/>
+	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="Activate" name="Activate"/>
 	<menu_item_call label="Leave" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
index 2c84a858af..06247ab249 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus">
 	<menu_item_check label="Display Group Icons" name="Display Group Icons"/>
-	<menu_item_call label="Leave Selected Group" name="Leave Selected Group"/>
+	<menu_item_call label="脫離所選擇的社團" name="Leave Selected Group"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 2ca0ad6a89..73b754e059 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="View Profile" name="View Profile"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="Remove Friend" name="Remove Friend"/>
 	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Call" name="Call"/>
+	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="地圖" name="Map"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="Pay" name="Pay"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index a71609170b..4ffbcaff83 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="加為朋友" name="Add Friends"/>
 	<menu_item_call label="移除朋友" name="Remove Friend"/>
 	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Call" name="Call"/>
+	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="Pay" name="Pay"/>
 	<menu_item_call label="Offer Teleport" name="teleport"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
index 5a4729abde..5b6e7335d6 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
@@ -2,6 +2,6 @@
 <toggleable_menu name="menu_group_plus">
 	<menu_item_check label="依最近排序" name="sort_most"/>
 	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="View People Icons" name="view_icons"/>
-	<menu_item_call label="Show Blocked Residents &amp; Objects" name="show_blocked_list"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml
index 3c78e9f920..2e88ac2d39 100644
--- a/indra/newview/skins/default/xui/zh/menu_picks.xml
+++ b/indra/newview/skins/default/xui/zh/menu_picks.xml
@@ -2,7 +2,7 @@
 <context_menu name="Picks">
 	<menu_item_call label="資訊" name="pick_info"/>
 	<menu_item_call label="編輯" name="pick_edit"/>
-	<menu_item_call label="Teleport" name="pick_teleport"/>
+	<menu_item_call label="瞬間傳送" name="pick_teleport"/>
 	<menu_item_call label="地圖" name="pick_map"/>
 	<menu_item_call label="刪除" name="pick_delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml
index 63e44d808c..6ffdf329df 100644
--- a/indra/newview/skins/default/xui/zh/menu_place.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="place_overflow_menu">
-	<menu_item_call label="Make a Landmark" name="landmark"/>
+	<menu_item_call label="製作一個地標" name="landmark"/>
 	<menu_item_call label="Create Pick" name="pick"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index e86fe7367e..d0b9438cfc 100644
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_folder_gear">
 	<menu_item_call label="Add Folder" name="add_folder"/>
-	<menu_item_call label="Add Landmark" name="add_landmark"/>
+	<menu_item_call label="添加地標" name="add_landmark"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
index e9658f72a2..7f1d091f44 100644
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_folder_gear">
-	<menu_item_call label="Add Landmark" name="add_landmark"/>
-	<menu_item_call label="Add Folder" name="add_folder"/>
+	<menu_item_call label="添加地標" name="add_landmark"/>
+	<menu_item_call label="添加資料夾" name="add_folder"/>
 	<menu_item_call label="Restore Item" name="restore_item"/>
 	<menu_item_call label="剪下" name="cut"/>
 	<menu_item_call label="覆製" name="copy_folder"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
index 66247d3fe6..8578751a28 100644
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
-	<menu_item_call label="Teleport" name="teleport"/>
+	<menu_item_call label="瞬間傳送" name="teleport"/>
 	<menu_item_call label="更多資訊" name="more_info"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="Add Landmark" name="add_landmark"/>
-	<menu_item_call label="Add Folder" name="add_folder"/>
-	<menu_item_call label="Restore Item" name="restore_item"/>
+	<menu_item_call label="添加地標" name="add_landmark"/>
+	<menu_item_call label="添加資料夾" name="add_folder"/>
+	<menu_item_call label="還原物品" name="restore_item"/>
 	<menu_item_call label="剪下" name="cut"/>
-	<menu_item_call label="Copy Landmark" name="copy_landmark"/>
-	<menu_item_call label="Copy SLurl" name="copy_slurl"/>
+	<menu_item_call label="覆製地標" name="copy_landmark"/>
+	<menu_item_call label="覆製 SLurl" name="copy_slurl"/>
 	<menu_item_call label="貼上" name="paste"/>
 	<menu_item_call label="更名" name="rename"/>
 	<menu_item_call label="刪除" name="delete"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
index 9c52ddfd18..2c5e3153bf 100644
--- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="分享" name="share"/>
 	<menu_item_call label="Block" name="block"/>
 	<menu_item_call label="Unblock" name="unblock"/>
-	<menu_item_call label="Kick" name="kick"/>
+	<menu_item_call label="踢除" name="kick"/>
 	<menu_item_call label="Freeze" name="freeze"/>
 	<menu_item_call label="Unfreeze" name="unfreeze"/>
 	<menu_item_call label="CSR" name="csr"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml
index 7291239383..2cea18105a 100644
--- a/indra/newview/skins/default/xui/zh/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_slurl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="About URL" name="about_url"/>
-	<menu_item_call label="Teleport to URL" name="teleport_to_url"/>
+	<menu_item_call label="關於 URL" name="about_url"/>
+	<menu_item_call label="瞬間傳送到 URL" name="teleport_to_url"/>
 	<menu_item_call label="地圖" name="show_on_map"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
index 12989ea59c..d188840588 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
@@ -2,5 +2,5 @@
 <toggleable_menu name="Teleport History Gear Context Menu">
 	<menu_item_call label="展開全部資料夾" name="Expand all folders"/>
 	<menu_item_call label="摺疊全部資料夾" name="Collapse all folders"/>
-	<menu_item_call label="Clear Teleport History" name="Clear Teleport History"/>
+	<menu_item_call label="清除瞬間傳送歷史紀錄" name="Clear Teleport History"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
index 4d1aa5f74a..c636e108ad 100644
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-	<menu_item_call label="Teleport" name="Teleport"/>
+	<menu_item_call label="瞬間傳送" name="Teleport"/>
 	<menu_item_call label="更多資訊" name="More Information"/>
 	<menu_item_call label="覆製到剪貼簿" name="CopyToClipboard"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
index dc3981a4d8..debaafaa10 100644
--- a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
@@ -2,6 +2,6 @@
 <menu name="menu_topinfobar">
 	<menu_item_check label="顯示座標" name="Show Coordinates"/>
 	<menu_item_check label="顯示地段屬性" name="Show Parcel Properties"/>
-	<menu_item_call label="Landmark" name="Landmark"/>
+	<menu_item_call label="地標" name="Landmark"/>
 	<menu_item_call label="覆製" name="Copy"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 9f56edb959..3b667d429c 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -2,5 +2,5 @@
 <context_menu name="Url Popup">
 	<menu_item_call label="Show Resident Profile" name="show_agent"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
index c574090a4a..2cbdd602cb 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Show Group Information" name="show_group"/>
-	<menu_item_call label="Copy Group to clipboard" name="url_copy_label"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="顯示社團資訊" name="show_group"/>
+	<menu_item_call label="覆製社團到剪貼簿" name="url_copy_label"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
index 1e56aa1a47..8eaea68c6f 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Show Inventory Item" name="show_item"/>
-	<menu_item_call label="Copy Name to clipboard" name="url_copy_label"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="顯示收納區物品" name="show_item"/>
+	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml
index fc8922318f..fbda20fd2f 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="Teleport to Location" name="teleport_to_location"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="瞬間傳送到位置" name="teleport_to_location"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index 8ad8e4ba84..d2f0b81a9d 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -2,7 +2,7 @@
 <context_menu name="Url Popup">
 	<menu_item_call label="Show Object Information" name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="Teleport to Object Location" name="teleport_to_object"/>
-	<menu_item_call label="Copy Object Name to clipboard" name="url_copy_label"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
+	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
index d011ba8208..330c28238f 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
@@ -2,5 +2,5 @@
 <context_menu name="Url Popup">
 	<menu_item_call label="顯示地段資訊" name="show_parcel"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
index 10d7c9cba0..afc15ce13c 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="Run This Command" name="run_slapp"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
index cf4ff9f8ee..2fb247f250 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Show Place Information" name="show_place"/>
+	<menu_item_call label="顯示地點資訊" name="show_place"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="Teleport to Location" name="teleport_to_location"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="瞬間傳送到位置" name="teleport_to_location"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
index c103582487..e3e4b4716d 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Teleport to this Location" name="teleport"/>
+	<menu_item_call label="瞬間傳送到這個位置" name="teleport"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="Copy SLurl to clipboard" name="url_copy"/>
+	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 3b1f7820af..6f6ca064c8 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -20,8 +20,8 @@
 			<menu_item_call label="離開" name="Set Away"/>
 			<menu_item_call label="忙碌" name="Set Busy"/>
 		</menu>
-		<menu_item_call label="Request Admin Status" name="Request Admin Options"/>
-		<menu_item_call label="Leave Admin Status" name="Leave Admin Options"/>
+		<menu_item_call label="要求 Admin 狀態" name="Request Admin Options"/>
+		<menu_item_call label="離開 Admin 狀態" name="Leave Admin Options"/>
 		<menu_item_call label="結束離開 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
@@ -35,9 +35,9 @@
 		<menu_item_check label="世界地圖" name="World Map"/>
 		<menu_item_check label="搜尋" name="Search"/>
 		<menu_item_call label="拍攝快照" name="Take Snapshot"/>
-		<menu_item_call label="Landmark This Place" name="Create Landmark Here"/>
-		<menu label="Place Profile" name="Land">
-			<menu_item_call label="Place Profile" name="Place Profile"/>
+		<menu_item_call label="將此處記下地標" name="Create Landmark Here"/>
+		<menu label="地點檔案" name="Land">
+			<menu_item_call label="地點檔案" name="Place Profile"/>
 			<menu_item_call label="關於土地" name="About Land"/>
 			<menu_item_call label="地區 / 領地" name="Region/Estate"/>
 		</menu>
@@ -85,11 +85,11 @@
 		</menu>
 		<menu_item_call label="聚焦於所選部位" name="Focus on Selection"/>
 		<menu_item_call label="Zoom to Selection" name="Zoom to Selection"/>
-		<menu label="Object" name="Object">
+		<menu label="物件" name="Object">
 			<menu_item_call label="購買" name="Menu Object Buy"/>
-			<menu_item_call label="Take" name="Menu Object Take"/>
+			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
-			<menu_item_call label="Save Back to My Inventory" name="Save Object Back to My Inventory"/>
+			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
@@ -100,10 +100,10 @@
 			<menu_item_call label="Set Scripts to Running" name="Set Scripts to Running"/>
 			<menu_item_call label="Set Scripts to Not Running" name="Set Scripts to Not Running"/>
 		</menu>
-		<menu label="Options" name="Options">
-			<menu_item_check label="Show Advanced Permissions" name="DebugPermissions"/>
-			<menu_item_check label="Select Only My Objects" name="Select Only My Objects"/>
-			<menu_item_check label="Select Only Movable Objects" name="Select Only Movable Objects"/>
+		<menu label="選項" name="Options">
+			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
+			<menu_item_check label="只選取我的物件" name="Select Only My Objects"/>
+			<menu_item_check label="只選取可移動的物件" name="Select Only Movable Objects"/>
 			<menu_item_check label="Select By Surrounding" name="Select By Surrounding"/>
 			<menu_item_check label="Show Selection Outlines" name="Show Selection Outlines"/>
 			<menu_item_check label="Show Hidden Selection" name="Show Hidden Selection"/>
@@ -112,9 +112,9 @@
 			<menu_item_check label="貼齊格線" name="Snap to Grid"/>
 			<menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/>
 			<menu_item_call label="Use Selection for Grid" name="Use Selection for Grid"/>
-			<menu_item_call label="Grid Options" name="Grid Options"/>
+			<menu_item_call label="格線選項" name="Grid Options"/>
 		</menu>
-		<menu label="Upload" name="Upload">
+		<menu label="上傳" name="Upload">
 			<menu_item_call label="Image (L$[COST])..." name="Upload Image"/>
 			<menu_item_call label="Sound (L$[COST])..." name="Upload Sound"/>
 			<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
@@ -122,19 +122,19 @@
 			<menu_item_call label="Set Default Upload Permissions" name="perm prefs"/>
 		</menu>
 		<menu_item_call label="復原" name="Undo"/>
-		<menu_item_call label="Redo" name="Redo"/>
+		<menu_item_call label="重做" name="Redo"/>
 	</menu>
-	<menu label="Help" name="Help">
-		<menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/>
-		<menu_item_check label="Enable Hints" name="Enable Hints"/>
-		<menu_item_call label="Report Abuse" name="Report Abuse"/>
-		<menu_item_call label="Report Bug" name="Report Bug"/>
-		<menu_item_call label="About [APP_NAME]" name="About Second Life"/>
+	<menu label="幫助" name="Help">
+		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
+		<menu_item_check label="啟用提示" name="Enable Hints"/>
+		<menu_item_call label="舉報濫用" name="Report Abuse"/>
+		<menu_item_call label="回報臭蟲" name="Report Bug"/>
+		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
 	</menu>
-	<menu label="Advanced" name="Advanced">
+	<menu label="進階" name="Advanced">
 		<menu_item_call label="Rebake Textures" name="Rebake Texture"/>
-		<menu_item_call label="Set UI Size to Default" name="Set UI Size to Default"/>
-		<menu_item_call label="Set Window Size..." name="Set Window Size..."/>
+		<menu_item_call label="設定使用者界面大小至預設值" name="Set UI Size to Default"/>
+		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
 		<menu_item_check label="Limit Select Distance" name="Limit Select Distance"/>
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="High-res Snapshot" name="HighResSnapshot"/>
@@ -185,7 +185,7 @@
 			<menu_item_call label="Image (L$[COST])..." name="Upload Image"/>
 			<menu_item_check label="Search" name="Search"/>
 			<menu_item_call label="Release Keys" name="Release Keys"/>
-			<menu_item_call label="Set UI Size to Default" name="Set UI Size to Default"/>
+			<menu_item_call label="設定使用者界面大小至預設值" name="Set UI Size to Default"/>
 			<menu_item_check label="Show Advanced Menu - legacy shortcut" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="關閉視窗" name="Close Window"/>
 			<menu_item_call label="關閉全部視窗" name="Close All Windows"/>
@@ -210,10 +210,10 @@
 	</menu>
 	<menu label="開發" name="Develop">
 		<menu label="Consoles" name="Consoles">
-			<menu_item_check label="Texture Console" name="Texture Console"/>
+			<menu_item_check label="材質控制台" name="Texture Console"/>
 			<menu_item_check label="Debug Console" name="Debug Console"/>
 			<menu_item_call label="Notifications Console" name="Notifications"/>
-			<menu_item_check label="Texture Size Console" name="Texture Size"/>
+			<menu_item_check label="材質尺寸控制台" name="Texture Size"/>
 			<menu_item_check label="Texture Category Console" name="Texture Category"/>
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
@@ -228,7 +228,7 @@
 		<menu label="顯示資訊" name="Display Info">
 			<menu_item_check label="Show Time" name="Show Time"/>
 			<menu_item_check label="Show Render Info" name="Show Render Info"/>
-			<menu_item_check label="Show Texture Info" name="Show Texture Info"/>
+			<menu_item_check label="顯示材質資訊" name="Show Texture Info"/>
 			<menu_item_check label="Show Matrices" name="Show Matrices"/>
 			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="顯示記憶體" name="Show Memory"/>
@@ -316,7 +316,7 @@
 			<menu_item_call label="Media Browser Test" name="Web Browser Test"/>
 			<menu_item_call label="Web Content Browser" name="Web Content Browser"/>
 			<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
-			<menu_item_call label="Dump Inventory" name="Dump Inventory"/>
+			<menu_item_call label="傾印收納區" name="Dump Inventory"/>
 			<menu_item_call label="Dump Timers" name="Dump Timers"/>
 			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
@@ -335,7 +335,7 @@
 			<menu_item_call label="Reload Color Settings" name="Reload Color Settings"/>
 			<menu_item_call label="Show Font Test" name="Show Font Test"/>
 			<menu_item_check label="Show XUI Names" name="Show XUI Names"/>
-			<menu_item_call label="Send Test IMs" name="Send Test IMs"/>
+			<menu_item_call label="送出測試 IMs" name="Send Test IMs"/>
 			<menu_item_call label="Flush Names Caches" name="Flush Names Caches"/>
 		</menu>
 		<menu label="Avatar" name="Character">
@@ -369,7 +369,7 @@
 			<menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/>
 			<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
 		</menu>
-		<menu_item_check label="HTTP Textures" name="HTTP Textures"/>
+		<menu_item_check label="HTTP 材質" name="HTTP Textures"/>
 		<menu_item_call label="Compress Images" name="Compress Images"/>
 		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
 		<menu_item_check label="Console Window on next Run" name="Console Window"/>
@@ -400,7 +400,7 @@
 	<menu label="Admin" name="Deprecated">
 		<menu label="Attach Object" name="Attach Object"/>
 		<menu label="Detach Object" name="Detach Object"/>
-		<menu label="Take Off Clothing" name="Take Off Clothing">
+		<menu label="脫下服裝" name="Take Off Clothing">
 			<menu_item_call label="襯衫" name="Shirt"/>
 			<menu_item_call label="褲子" name="Pants"/>
 			<menu_item_call label="鞋子" name="Shoes"/>
@@ -413,15 +413,15 @@
 			<menu_item_call label="Alpha" name="Alpha"/>
 			<menu_item_call label="Tattoo" name="Tattoo"/>
 			<menu_item_call label="Physics" name="Physics"/>
-			<menu_item_call label="All Clothes" name="All Clothes"/>
+			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</menu>
-		<menu label="Help" name="Help">
-			<menu_item_call label="Official Linden Blog" name="Official Linden Blog"/>
+		<menu label="幫助" name="Help">
+			<menu_item_call label="林登官方部落格" name="Official Linden Blog"/>
 			<menu_item_call label="Scripting Portal" name="Scripting Portal"/>
-			<menu label="Bug Reporting" name="Bug Reporting">
+			<menu label="臭蟲回報" name="Bug Reporting">
 				<menu_item_call label="Public Issue Tracker" name="Public Issue Tracker"/>
 				<menu_item_call label="Public Issue Tracker Help" name="Publc Issue Tracker Help"/>
-				<menu_item_call label="Bug Reporting 101" name="Bug Reporing 101"/>
+				<menu_item_call label="臭蟲回報 101" name="Bug Reporing 101"/>
 				<menu_item_call label="Security Issues" name="Security Issues"/>
 				<menu_item_call label="QA Wiki" name="QA Wiki"/>
 			</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
index 97f18f0936..c5c1f661fb 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
@@ -9,6 +9,6 @@
 	<context_menu label="Attach to HUD" name="wearable_attach_to_hud"/>
 	<menu_item_call label="脫下" name="take_off"/>
 	<menu_item_call label="編輯" name="edit"/>
-	<menu_item_call label="Item Profile" name="object_profile"/>
-	<menu_item_call label="Show Original" name="show_original"/>
+	<menu_item_call label="物品檔案" name="object_profile"/>
+	<menu_item_call label="顯示原件" name="show_original"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
index ebf9b80d27..d9f4acb27b 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear Wearing">
-	<menu_item_call label="Edit Outfit" name="edit"/>
+	<menu_item_call label="編輯裝扮" name="edit"/>
 	<menu_item_call label="脫下" name="takeoff"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
index 5e82cb087f..c7d2853995 100644
--- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
@@ -2,5 +2,5 @@
 <context_menu name="Wearing">
 	<menu_item_call label="脫下" name="take_off"/>
 	<menu_item_call label="卸下" name="detach"/>
-	<menu_item_call label="Edit Outfit" name="edit"/>
+	<menu_item_call label="編輯裝扮" name="edit"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 1c9b68da1a..ecc14867b8 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -13,13 +13,13 @@
 	</widgetset>
 	<widgetset name="movie">
 		<label name="movie_label">
-			Movie
+			影片
 		</label>
 		<tooltip name="movie_tooltip">
-			There is a movie to play here
+			沒有影片可以播放
 		</tooltip>
 		<playtip name="movie_playtip">
-			Play movie
+			播放影片
 		</playtip>
 	</widgetset>
 	<widgetset name="image">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			影片（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -111,7 +111,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Web Page (XHTML)
+			選項（XHTML）
 		</label>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -171,7 +171,7 @@
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">
-			Web Page
+			選項
 		</label>
 	</mimetype>
 	<mimetype name="text/plain">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			Movie (MPEG)
+			影片（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			Movie (MP4)
+			影片（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			Movie (QuickTime)
+			影片（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			Movie (Windows Media ASF)
+			影片（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			Movie (Windows Media WMV)
+			影片（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			Movie (AVI)
+			影片（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 1c9b68da1a..ecc14867b8 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -13,13 +13,13 @@
 	</widgetset>
 	<widgetset name="movie">
 		<label name="movie_label">
-			Movie
+			影片
 		</label>
 		<tooltip name="movie_tooltip">
-			There is a movie to play here
+			沒有影片可以播放
 		</tooltip>
 		<playtip name="movie_playtip">
-			Play movie
+			播放影片
 		</playtip>
 	</widgetset>
 	<widgetset name="image">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			影片（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -111,7 +111,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Web Page (XHTML)
+			選項（XHTML）
 		</label>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -171,7 +171,7 @@
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">
-			Web Page
+			選項
 		</label>
 	</mimetype>
 	<mimetype name="text/plain">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			Movie (MPEG)
+			影片（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			Movie (MP4)
+			影片（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			Movie (QuickTime)
+			影片（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			Movie (Windows Media ASF)
+			影片（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			Movie (Windows Media WMV)
+			影片（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			Movie (AVI)
+			影片（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index b6c8784759..51f242a1c2 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -5,7 +5,7 @@
 			網頁內容
 		</label>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			這個位置有網頁內容
 		</tooltip>
 		<playtip name="web_playtip">
 			顯示網頁內容
@@ -13,13 +13,13 @@
 	</widgetset>
 	<widgetset name="movie">
 		<label name="movie_label">
-			Movie
+			影片
 		</label>
 		<tooltip name="movie_tooltip">
-			There is a movie to play here
+			沒有影片可以播放
 		</tooltip>
 		<playtip name="movie_playtip">
-			Play movie
+			播放影片
 		</playtip>
 	</widgetset>
 	<widgetset name="image">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			影片 （QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -111,7 +111,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Web Page (XHTML)
+			網頁（XHTML）
 		</label>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -186,32 +186,32 @@
 	</mimetype>
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">
-			Movie (MPEG)
+			影片（MPEG）
 		</label>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			Movie (MP4)
+			影片（MP4）
 		</label>
 	</mimetype>
 	<mimetype name="video/quicktime">
 		<label name="video/quicktime_label">
-			Movie (QuickTime)
+			影片（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			Movie (Windows Media ASF)
+			影片（Windows Media ASF）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			Movie (Windows Media WMV)
+			影片（Windows Media WMV）
 		</label>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			Movie (AVI)
+			影片（AVI）
 		</label>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 8b26c70430..7652c1a1d0 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -102,7 +102,7 @@ Make sure your Internet connection is working properly.
 Please select only one object and try again.
 	</notification>
 	<notification name="SaveClothingBodyChanges">
-		Save all changes to clothing/body parts?
+		儲存全部服裝或身體部位的變更？
 		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="不要儲存" yestext="全部儲存"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
@@ -356,11 +356,11 @@ Are you sure you want to continue?
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="DeleteOutfits">
-		Delete the selected outfit?
+		刪除所選擇的裝扮？
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="PromptGoToEventsPage">
-		Go to the [SECOND_LIFE] events web page?
+		前往 [SECOND_LIFE] 事件網頁？
 		<url name="url">
 			http://secondlife.com/events/
 		</url>
@@ -389,7 +389,7 @@ Note: This will clear the cache.
 		Changing language will take effect after you restart [APP_NAME].
 	</notification>
 	<notification name="GoToAuctionPage">
-		Go to the [SECOND_LIFE] web page to see auction details or make a bid?
+		前往 [SECOND_LIFE] 網頁去察看拍賣細節或下標？
 		<url name="url">
 			http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]
 		</url>
@@ -485,10 +485,10 @@ and will lose it from your inventory if you give it away. Do you really want to
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="CannotGiveItem">
-		Unable to give inventory item.
+		無法給予收納區物品。
 	</notification>
 	<notification name="TransactionCancelled">
-		Transaction cancelled.
+		交易已取銷。
 	</notification>
 	<notification name="TooManyItems">
 		Cannot give more than 42 items in a single inventory transfer.
@@ -643,14 +643,14 @@ Expected [VALIDS]
 Please try again later.
 	</notification>
 	<notification name="LandmarkCreated">
-		You have added &quot;[LANDMARK_NAME]&quot; to your [FOLDER_NAME] folder.
+		你已經添加 &quot;[LANDMARK_NAME]&quot; 到你的 [FOLDER_NAME] 資料夾。
 	</notification>
 	<notification name="LandmarkAlreadyExists">
-		You already have a landmark for this location.
+		你已經有這個位置的地標。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="CannotCreateLandmarkNotOwner">
-		You cannot create a landmark here because the owner of the land doesn&apos;t allow it.
+		你不能創造地標，因為地主並不允許你這樣做。
 	</notification>
 	<notification name="CannotRecompileSelectObjectsNoScripts">
 		Not able to perform &apos;recompilation&apos;.
@@ -696,7 +696,7 @@ Searched for: [FINALQUERY]
 		Your search terms were too short so no search was performed.
 	</notification>
 	<notification name="CouldNotTeleportReason">
-		Teleport failed.
+		瞬間傳送失敗。
 [REASON]
 	</notification>
 	<notification name="invalid_tport">
@@ -735,7 +735,7 @@ If you continue to get this message, please check the [SUPPORT_SITE].
 		Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
 	</notification>
 	<notification name="no_inventory_host">
-		The inventory system is currently unavailable.
+		收納區功能目前無法使用。
 	</notification>
 	<notification name="CannotSetLandOwnerNothingSelected">
 		Unable to set land owner:
@@ -895,8 +895,8 @@ Join land?
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmItemCopy">
-		Copy this item to your inventory?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Copy"/>
+		覆製這個物品到你的收納區？
+		<usetemplate name="okcancelbuttons" notext="取銷" yestext="覆製"/>
 	</notification>
 	<notification name="ResolutionSwitchFail">
 		Failed to switch resolution to [RESX] by [RESY]
@@ -929,24 +929,24 @@ You do not have permission to buy land for your active group.
 Offer friendship to [NAME]?
 		<form name="form">
 			<input name="message">
-				Would you be my friend?
+				你願意成為我的朋友嗎？
 			</input>
 			<button name="Offer" text="確定"/>
 			<button name="Cancel" text="取銷"/>
 		</form>
 	</notification>
-	<notification label="Save Outfit" name="SaveOutfitAs">
-		Save what I&apos;m wearing as a new Outfit:
+	<notification label="儲存裝扮" name="SaveOutfitAs">
+		儲存我正在穿的為新裝扮：
 		<form name="form">
 			<input name="message">
-				[DESC] (new)
+				[DESC] （新）
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取銷"/>
 		</form>
 	</notification>
 	<notification label="Save Wearable" name="SaveWearableAs">
-		Save item to my inventory as:
+		儲存物品到我的收納區為：
 		<form name="form">
 			<input name="message">
 				[DESC] （新）
@@ -955,8 +955,8 @@ Offer friendship to [NAME]?
 			<button name="Cancel" text="取銷"/>
 		</form>
 	</notification>
-	<notification label="Rename Outfit" name="RenameOutfit">
-		New outfit name:
+	<notification label="裝扮更名" name="RenameOutfit">
+		新裝扮名稱：
 		<form name="form">
 			<input name="new_name">
 				[NAME]
@@ -970,7 +970,7 @@ Offer friendship to [NAME]?
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
-		Do you want to remove multiple friends from your Friends list?
+		你確定要由朋友清單中移除多個朋友嗎？
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
@@ -1118,14 +1118,14 @@ You have been moved into a nearby region.
 You may want to set a new home location.
 	</notification>
 	<notification name="ClothingLoading">
-		Your clothing is still downloading.
-You can use [SECOND_LIFE] normally and other people will see you correctly.
+		你的服裝仍在下載中。
+你可以正常使用 [SECOND_LIFE]，而且其他人看到你也是正常的。
 		<form name="form">
-			<ignore name="ignore" text="Clothing is taking a long time to download"/>
+			<ignore name="ignore" text="服裝花太多時間下載"/>
 		</form>
 	</notification>
 	<notification name="FirstRun">
-		[APP_NAME] installation is complete.
+		[APP_NAME] 安裝完成。
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
 Return to [http://join.secondlife.com secondlife.com] to create a new account?
@@ -1140,8 +1140,8 @@ You can either check your Internet connection and try again in a few minutes, cl
 		</url>
 		<form name="form">
 			<button name="OK" text="確定"/>
-			<button name="Help" text="Help"/>
-			<button name="Teleport" text="Teleport"/>
+			<button name="Help" text="幫助"/>
+			<button name="Teleport" text="瞬間傳送"/>
 		</form>
 	</notification>
 	<notification name="WelcomeChooseSex">
@@ -1212,7 +1212,7 @@ Please select only one object and try again.
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="KickUsersFromRegion">
-		Teleport all Residents in this region home?
+		確定要強制瞬間傳送這地區所有居民回家？
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="EstateObjectReturn">
@@ -1232,7 +1232,7 @@ Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
 	</notification>
 	<notification name="RawUploadStarted">
-		Upload started. It may take up to two minutes, depending on your connection speed.
+		上傳開始。將會花費約兩分鐘，這取決於你的連線速度。
 	</notification>
 	<notification name="ConfirmBakeTerrain">
 		Do you really want to bake the current terrain, make it the center for terrain raise/lower limits and the default for the &apos;Revert&apos; tool?
@@ -1259,7 +1259,7 @@ Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
 		Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
 	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
-		Can&apos;t change appearance until clothing and shape are loaded.
+		無法變更外觀，直到服裝與體形下載完畢。
 	</notification>
 	<notification name="ClassifiedMustBeAlphanumeric">
 		The name of your classified must start with a letter from A to Z or a number.  No punctuation is allowed.
@@ -1351,7 +1351,7 @@ http://secondlife.com/download.
 
 You may download this update from http://www.secondlife.com/downloads
 or you can install it now.
-		<usetemplate name="okcancelbuttons" notext="Quit Second Life" yestext="Download and install now"/>
+		<usetemplate name="okcancelbuttons" notext="Quit Second Life" yestext="立即下載及安裝"/>
 	</notification>
 	<notification name="DownloadBackgroundTip">
 		We have downloaded an update to your [APP_NAME] installation.
@@ -1397,7 +1397,7 @@ We must restart [APP_NAME] to install the update.
 	</notification>
 	<notification name="WebLaunchPublicIssue">
 		Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
-		<usetemplate ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="取銷" yestext="Go to page"/>
+		<usetemplate ignoretext="Launch my browser to use the Public Issue Tracker" name="okcancelignore" notext="取銷" yestext="前往頁面"/>
 	</notification>
 	<notification name="WebLaunchSupportWiki">
 		Go to the Official Linden Blog, for the latest news and information.
@@ -1423,8 +1423,8 @@ Leave Group?
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmKick">
-		Do you REALLY want to kick all Residents off the grid?
-		<usetemplate name="okcancelbuttons" notext="取銷" yestext="Kick All Residents"/>
+		你確定要踢除這網格內的全部居民？
+		<usetemplate name="okcancelbuttons" notext="取銷" yestext="踢除全部居民"/>
 	</notification>
 	<notification name="MuteLinden">
 		Sorry, you cannot block a Linden.
@@ -1464,7 +1464,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="KickUser">
-		Kick this Resident with what message?
+		踢除這個居民並留給他什麼訊息？
 		<form name="form">
 			<input name="message">
 				An administrator has logged you off.
@@ -1547,7 +1547,7 @@ Please try again later.
 		Offer a teleport to your location with the following message?
 		<form name="form">
 			<input name="message">
-				Join me in [REGION]
+				加入我到 [REGION]
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取銷"/>
@@ -1565,19 +1565,19 @@ Please try again later.
 	</notification>
 	<notification name="TeleportFromLandmark">
 		Are you sure you want to teleport to &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
-		<usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" notext="取銷" yestext="Teleport"/>
+		<usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" notext="取銷" yestext="瞬間傳送"/>
 	</notification>
 	<notification name="TeleportToPick">
-		Teleport to [PICK]?
+		瞬間傳送到 [PICK]?
 		<usetemplate ignoretext="Confirm that I want to teleport to a location in Picks" name="okcancelignore" notext="取銷" yestext="Teleport"/>
 	</notification>
 	<notification name="TeleportToClassified">
-		Teleport to [CLASSIFIED]?
-		<usetemplate ignoretext="Confirm that I want to teleport to a location in Classifieds" name="okcancelignore" notext="取銷" yestext="Teleport"/>
+		瞬間傳送到 [CLASSIFIED]?
+		<usetemplate ignoretext="Confirm that I want to teleport to a location in Classifieds" name="okcancelignore" notext="取銷" yestext="瞬間傳送"/>
 	</notification>
 	<notification name="TeleportToHistoryEntry">
-		Teleport to [HISTORY_ENTRY]?
-		<usetemplate ignoretext="Confirm that I want to teleport to a history location" name="okcancelignore" notext="取銷" yestext="Teleport"/>
+		瞬間傳送到 [HISTORY_ENTRY]?
+		<usetemplate ignoretext="Confirm that I want to teleport to a history location" name="okcancelignore" notext="取銷" yestext="瞬間傳送"/>
 	</notification>
 	<notification label="Message everyone in your Estate" name="MessageEstate">
 		Type a short announcement which will be sent to everyone currently in your estate.
@@ -1633,8 +1633,8 @@ It will change thousands of regions and make the spaceserver hiccup.
 		Remove estate manager for this estate only or for [ALL_ESTATES]?
 		<usetemplate canceltext="取銷" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
-	<notification label="Confirm Kick" name="EstateKickUser">
-		Kick [EVIL_USER] from this estate?
+	<notification label="確認踢除" name="EstateKickUser">
+		將 [EVIL_USER] 由這領地踢除？
 		<usetemplate name="okcancelbuttons" notext="取銷" yestext="確定"/>
 	</notification>
 	<notification name="EstateChangeCovenant">
@@ -1946,8 +1946,8 @@ Linden Lab
 Do you want to replace it with the selected object?
 		<form name="form">
 			<ignore name="ignore" text="Replace an existing attachment with the selected item"/>
-			<button ignore="Replace Automatically" name="Yes" text="確定"/>
-			<button ignore="Never Replace" name="No" text="取銷"/>
+			<button ignore="自動取代" name="Yes" text="確定"/>
+			<button ignore="絕不取代" name="No" text="取銷"/>
 		</form>
 	</notification>
 	<notification label="Busy Mode Warning" name="BusyModePay">
@@ -1990,7 +1990,7 @@ Would you like to leave Busy Mode before completing this transaction?
 
 Link to this from a web page to give others easy access to this location, or try it out yourself by pasting it into the address bar of any web browser.
 		<form name="form">
-			<ignore name="ignore" text="SLurl is copied to my clipboard"/>
+			<ignore name="ignore" text="SLurl 已經覆製到我的剪貼簿。"/>
 		</form>
 	</notification>
 	<notification name="WLSavePresetAlert">
@@ -2063,8 +2063,8 @@ Link to this from a web page to give others easy access to this location, or try
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AutoWearNewClothing">
-		Would you like to automatically wear the clothing you are about to create?
-		<usetemplate ignoretext="Wear the clothing I create while editing My Appearance" name="okcancelignore" notext="否" yestext="是"/>
+		你要自動穿上你所創造的服裝嗎？
+		<usetemplate ignoretext="編輯外觀時能穿上我所創造的服裝" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="NotAgeVerified">
 		You must be age-verified to visit this area.  Do you want to go to the [SECOND_LIFE] website and verify your age?
@@ -2122,7 +2122,7 @@ Link to this from a web page to give others easy access to this location, or try
 (Takes about 5 minutes.)
 	</notification>
 	<notification name="UploadPayment">
-		You paid L$[AMOUNT] to upload.
+		你支付 L$[AMOUNT] 上傳。
 	</notification>
 	<notification name="UploadWebSnapshotDone">
 		Web site snapshot upload done.
@@ -2140,10 +2140,10 @@ Link to this from a web page to give others easy access to this location, or try
 		Unable to load gesture [NAME].
 	</notification>
 	<notification name="LandmarkMissing">
-		Landmark is missing from database.
+		資料庫中的地標遺失。
 	</notification>
 	<notification name="UnableToLoadLandmark">
-		Unable to load landmark.  Please try again.
+		無法載入地標，請再試一次。
 	</notification>
 	<notification name="CapsKeyOn">
 		Your Caps Lock key is on.
@@ -2374,7 +2374,7 @@ Please go to the Knowledge Base for details on accessing areas with this maturit
 		Could not teleport closer to destination.
 	</notification>
 	<notification name="TPCancelled">
-		Teleport cancelled.
+		瞬間傳送已取銷。
 	</notification>
 	<notification name="FullRegionTryAgain">
 		The region you are attempting to enter is currently full.
@@ -2452,7 +2452,7 @@ Please try again in a few moments.
 
 [MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
 		<form name="form">
-			<button name="Teleport" text="Teleport"/>
+			<button name="Teleport" text="瞬間傳送"/>
 			<button name="Cancel" text="取銷"/>
 		</form>
 	</notification>
@@ -2519,7 +2519,7 @@ If you stay in this region you will be logged out.
 If you stay in this region you will be logged out.
 	</notification>
 	<notification name="LoadWebPage">
-		Load web page [URL]?
+		載入網頁 [URL]?
 
 [MESSAGE]
 
@@ -2697,7 +2697,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
 		An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
 	</notification>
 	<notification name="UnsupportedCommandSLURL">
-		The SLurl you clicked on is not supported.
+		你所點擊的 SLurl 位置並不被支援。
 	</notification>
 	<notification name="BlockedSLURL">
 		A SLurl was received from an untrusted browser and has been blocked for your security.
@@ -2823,7 +2823,7 @@ You locally updated a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; af
 	</notification>
 	<notification name="ConfirmLeaveCall">
 		Are you sure you want to leave this call?
-		<usetemplate ignoretext="Confirm before I leave call" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="我結束通話前進行確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ConfirmMuteAll">
 		You have selected to mute all participants in a group call.
@@ -2868,7 +2868,7 @@ Click and drag anywhere on the world to rotate your view
 	<notification label="View" name="HintView">
 		To change your camera view, use the Orbit and Pan controls. Reset your view by pressing Escape or walking.
 	</notification>
-	<notification label="Inventory" name="HintInventory">
+	<notification label="收納區" name="HintInventory">
 		Check your inventory to find items. Newest items can be easily found in the Recent tab.
 	</notification>
 	<notification label="You&apos;ve got Linden Dollars!" name="HintLindenDollar">
diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
index 0905cc30b6..42a4aa9e85 100644
--- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_activeim_row">
 	<text name="object_name">
-		Unnamed Object
+		未命名物件
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
index 641d0eba93..c9e47984e2 100644
--- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
@@ -2,13 +2,13 @@
 <panel name="panel_im_control_panel">
 	<layout_stack name="vertical_stack">
 		<layout_panel name="call_btn_panel">
-			<button label="Call" name="call_btn"/>
+			<button label="通話" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
 			<button label="Leave Call" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice Controls" name="voice_ctrls_btn"/>
+			<button label="語音控制" name="voice_ctrls_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index e7a94eafa8..23b76eea9b 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -23,9 +23,9 @@
 	</string>
 	<text name="avatar_name" value="(loading)"/>
 	<text name="last_interaction" value="0s"/>
-	<icon name="permission_edit_theirs_icon" tool_tip="You can edit this friend&apos;s objects"/>
-	<icon name="permission_edit_mine_icon" tool_tip="This friend can edit, delete or take your objects"/>
-	<icon name="permission_map_icon" tool_tip="This friend can locate you on the map"/>
-	<icon name="permission_online_icon" tool_tip="This friend can see when you&apos;re online"/>
-	<button name="profile_btn" tool_tip="View profile"/>
+	<icon name="permission_edit_theirs_icon" tool_tip="你不能編輯這位朋友的物件"/>
+	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
+	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
+	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
+	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index d8327683dd..9ef4258f0b 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
 	<text name="title_text">
-		Block List
+		封鎖清單
 	</text>
 	<scroll_list name="blocked" tool_tip="List of currently blocked Residents"/>
 	<button label="Block person" name="Block resident..." tool_tip="Pick a Resident to block"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
index 4e7f261e63..4c0174559e 100644
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
@@ -40,7 +40,7 @@
 		</layout_panel>
 		<layout_panel name="notification_well_panel">
 			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifications"/>
+				<button name="Unread" tool_tip="通知"/>
 			</chiclet_notification>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
index 6ddfbdaf4f..94edb7ab71 100644
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
@@ -10,7 +10,7 @@
 		L$[PRICE]
 	</panel.string>
 	<panel.string name="click_through_text_fmt">
-		[TELEPORT] teleport, [MAP] map, [PROFILE] profile
+		[TELEPORT] 瞬間傳送，[MAP] 地圖，[PROFILE] 檔案
 	</panel.string>
 	<panel.string name="date_fmt">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
@@ -54,7 +54,7 @@
 	<panel name="buttons">
 		<layout_stack name="layout_stack1">
 			<layout_panel name="layout_panel1">
-				<button label="Teleport" name="teleport_btn"/>
+				<button label="瞬間傳送" name="teleport_btn"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="地圖" name="show_on_map_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
index eba6fa7c29..1185336a2d 100644
--- a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
-	<button name="btn_delete" tool_tip="Remove from outfit"/>
+	<button name="btn_delete" tool_tip="由裝扮移除"/>
 	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="You don&apos;t have permission to edit"/>
+	<panel name="btn_lock" tool_tip="你並沒有權限去編輯"/>
 	<panel name="btn_edit_panel">
 		<button name="btn_edit" tool_tip="Edit this wearable"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
index 9e63b9a3a8..309ab1c0d4 100644
--- a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="cof_wearables">
 	<accordion name="cof_wearables_accordion">
-		<accordion_tab name="tab_clothing" title="Clothing"/>
+		<accordion_tab name="tab_clothing" title="服裝"/>
 		<accordion_tab name="tab_attachments" title="Attachments"/>
-		<accordion_tab name="tab_body_parts" title="Body Parts"/>
+		<accordion_tab name="tab_body_parts" title="身體部位"/>
 	</accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
index 59bff5f3e9..a9e65419c2 100644
--- a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="deletable_wearable_item">
-	<button name="btn_delete" tool_tip="Remove from outfit"/>
+	<button name="btn_delete" tool_tip="由裝扮移除"/>
 	<text name="item_name" value="..."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
index 6558eda253..6377bf4135 100644
--- a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
@@ -2,6 +2,6 @@
 <panel name="dummy_clothing_item">
 	<text name="item_name" value="..."/>
 	<panel name="btn_add_panel">
-		<button name="btn_add" tool_tip="Add more items of this type"/>
+		<button name="btn_add" tool_tip="添加更多物品到這個類型"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
index c664880898..9c542366bc 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
index 0709ad4e67..0578fe9ef1 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
 	<panel name="avatar_hair_color_panel">
-		<texture_picker label="Texture" name="Texture" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Texture" tool_tip="點擊以挑選圖片"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
index 388fee9eb3..df85f7deb2 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="Upper Texture" name="Upper Fabric" tool_tip="點擊以挑選圖片"/>
-		<texture_picker label="Lower Texture" name="Lower Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="上半身材質" name="Upper Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="下半身材質" name="Lower Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
index d21c118195..b453fdc758 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
index 24ed9b9acb..7fb8392836 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profile Edit" name="edit_profile_panel">
+<panel label="檔案編輯" name="edit_profile_panel">
 	<string name="CaptionTextAcctInfo">
 		[ACCTTYPE]
 [PAYMENTINFO] [AGEVERIFICATION]
@@ -37,17 +37,17 @@
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Click to select an image"/>
 				</panel>
 				<panel name="first_life_image_panel">
-					<text name="real_world_photo_title_text" value="Real World:"/>
+					<text name="real_world_photo_title_text" value="真實世界："/>
 				</panel>
 				<icon label="" name="real_world_edit_icon" tool_tip="Click to select an image"/>
 				<text name="title_homepage_text">
-					Homepage:
+					首頁：
 				</text>
 				<line_editor name="homepage_edit" value="http://"/>
 				<text name="title_acc_status_text" value="My Account:"/>
 				<text_editor name="acc_status_text" value="Resident. No payment info on file."/>
 				<text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
-				<text name="title_partner_text" value="My Partner:"/>
+				<text name="title_partner_text" value="我的配偶："/>
 				<panel name="partner_data_panel">
 					<text initial_value="(retrieving)" name="partner_text"/>
 				</panel>
@@ -58,7 +58,7 @@
 	<panel name="profile_me_buttons_panel">
 		<layout_stack name="bottom_panel_ls">
 			<layout_panel name="save_changes_btn_lp">
-				<button label="Save Changes" name="save_btn"/>
+				<button label="儲存變更" name="save_btn"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="取銷" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
index 44b93504d1..321fb68756 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
index d1ba9625f1..7bf923b4ca 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
index 303aa80e11..096a83c871 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
index 1e61a65788..dab132bad2 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
index 47d5db4fca..82ab70bafc 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
index cbfdcaae8e..b284668777 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="Texture" name="Fabric" tool_tip="點擊以挑選圖片"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖片"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
index d68767d4d2..21b5c1c698 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
@@ -96,7 +96,7 @@
 	<string name="physics_desc_text">
 		Physics:
 	</string>
-	<labeled_back_button label="儲存" name="back_btn" tool_tip="Return to Edit Outfit"/>
+	<labeled_back_button label="儲存" name="back_btn" tool_tip="回到編輯裝扮"/>
 	<text name="edit_wearable_title" value="Editing Shape"/>
 	<panel label="襯衫" name="wearable_type_panel">
 		<text name="description_text" value="Shape:"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
index 9ba578c1a1..1e3c18f522 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
@@ -2,7 +2,7 @@
 <panel name="panel_im_control_panel">
 	<layout_stack name="vertical_stack">
 		<layout_panel name="group_info_btn_panel">
-			<button label="Group Profile" name="group_info_btn"/>
+			<button label="社團檔案" name="group_info_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
 			<button label="Call Group" name="call_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index c65b139cb5..2873d4cabb 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -37,10 +37,10 @@ Hover your mouse over the options for more help.
 	</text>
 	<combo_box name="active_title" tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."/>
 	<check_box label="Receive group notices" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
-	<check_box label="Show in my profile" name="list_groups_in_profile" tool_tip="Sets whether you want to show this group in your profile"/>
+	<check_box label="顯示在我的檔案中" name="list_groups_in_profile" tool_tip="Sets whether you want to show this group in your profile"/>
 	<panel name="preferences_container">
 		<text name="group_settngs_label">
-			Group
+			社團
 		</text>
 		<check_box label="Anyone can join" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited."/>
 		<check_box label="Cost to join" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index 90797e1473..4c65d2484c 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Group Profile" name="GroupInfo">
+<panel label="社團檔案" name="GroupInfo">
 	<panel.string name="default_needs_apply_text">
 		There are unsaved changes
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 576760f747..c9b17b5d67 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -22,6 +22,6 @@
 	<button label="Send Invitations" name="ok_button"/>
 	<button label="取銷" name="cancel_button"/>
 	<string name="GroupInvitation">
-		Group Invitation
+		社團邀請
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 08a5e711d1..71f139a3e6 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -58,7 +58,7 @@
 			More land credits are needed to support land in use
 		</text>
 		<text name="group_money_heading">
-			Group L$
+			社團 L$
 		</text>
 	</panel>
 	<tab_container name="group_money_tab_container">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index 147c4859c6..175293cdf7 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
-	<button name="profile_btn" tool_tip="View profile"/>
+	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index a007c86063..b4d7e3608e 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -38,7 +38,7 @@ Maximum 200 per group daily
 		<text name="string">
 			Drag and drop item here to attach it:
 		</text>
-		<button label="Inventory" name="open_inventory" tool_tip="Open Inventory"/>
+		<button label="收納區" name="open_inventory" tool_tip="開啟收納區"/>
 		<button name="remove_attachment" tool_tip="Remove attachment from your notification"/>
 		<button label="Send" label_selected="Send" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it."/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index 2b15f4813a..91f0f4125f 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -64,7 +64,7 @@ things in this group. There&apos;s a broad variety of Abilities.
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
-			Role Name
+			角色名稱
 		</text>
 		<text name="static3">
 			Role Title
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
index 8fdecad420..881f8eac0b 100644
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
@@ -2,13 +2,13 @@
 <panel name="panel_im_control_panel">
 	<layout_stack name="button_stack">
 		<layout_panel name="view_profile_btn_panel">
-			<button label="Profile" name="view_profile_btn"/>
+			<button label="檔案" name="view_profile_btn"/>
 		</layout_panel>
 		<layout_panel name="add_friend_btn_panel">
 			<button label="加為朋友" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="Teleport" name="teleport_btn" tool_tip="Offer to teleport this person"/>
+			<button label="瞬間傳送" name="teleport_btn" tool_tip="Offer to teleport this person"/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="分享" name="share_btn"/>
@@ -17,13 +17,13 @@
 			<button label="Pay" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
-			<button label="Call" name="call_btn"/>
+			<button label="通話" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="End Call" name="end_call_btn"/>
+			<button label="結束通話" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="Voice Controls" name="voice_ctrls_btn"/>
+			<button label="語音控制" name="voice_ctrls_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
index 16119f9e2c..d86ba7bc7c 100644
--- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="landmark_info">
-	<string name="title_create_landmark" value="Create Landmark"/>
-	<string name="title_edit_landmark" value="Edit Landmark"/>
-	<string name="title_landmark" value="Landmark"/>
+	<string name="title_create_landmark" value="創造地標"/>
+	<string name="title_edit_landmark" value="編輯地標"/>
+	<string name="title_landmark" value="地標"/>
 	<string name="not_available" value="(N\A)"/>
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
@@ -19,7 +19,7 @@
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
 	<button name="back_btn" tool_tip="Back"/>
-	<text name="title" value="Place Profile"/>
+	<text name="title" value="地點檔案"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
 			<text name="region_title" value="SampleRegion"/>
@@ -29,12 +29,12 @@
 			<panel name="landmark_info_panel">
 				<text name="owner_label" value="擁有者："/>
 				<text name="creator_label" value="創造者："/>
-				<text name="created_label" value="Created:"/>
+				<text name="created_label" value="創造於："/>
 			</panel>
 			<panel name="landmark_edit_panel">
 				<text name="title_label" value="Title:"/>
 				<text name="notes_label" value="My notes:"/>
-				<text name="folder_label" value="Landmark location:"/>
+				<text name="folder_label" value="地標位置："/>
 			</panel>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
index 45f8edc355..0ea3ea2226 100644
--- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
@@ -2,8 +2,8 @@
 <panel name="Landmarks">
 	<accordion name="landmarks_accordion">
 		<accordion_tab name="tab_favorites" title="Favorites bar"/>
-		<accordion_tab name="tab_landmarks" title="My Landmarks"/>
-		<accordion_tab name="tab_inventory" title="My Inventory"/>
+		<accordion_tab name="tab_landmarks" title="我的地標"/>
+		<accordion_tab name="tab_inventory" title="我的收納區"/>
 		<accordion_tab name="tab_library" title="Library"/>
 	</accordion>
 	<panel name="bottom_panel">
@@ -12,10 +12,10 @@
 				<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
 			</layout_panel>
 			<layout_panel name="add_btn_panel">
-				<button name="add_btn" tool_tip="Add new landmark"/>
+				<button name="add_btn" tool_tip="添加新地標"/>
 			</layout_panel>
 			<layout_panel name="trash_btn_panel">
-				<dnd_button name="trash_btn" tool_tip="Remove selected landmark"/>
+				<dnd_button name="trash_btn" tool_tip="移除所選擇的地標"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 2533b90203..f7dada226f 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -4,25 +4,25 @@
 		Fetching [ITEM_COUNT] Items... [FILTER]
 	</panel.string>
 	<panel.string name="ItemcountCompleted">
-		[ITEM_COUNT] Items [FILTER]
+		[ITEM_COUNT] 物品 [FILTER]
 	</panel.string>
 	<text name="ItemcountText">
-		Items:
+		物品：
 	</text>
-	<filter_editor label="Filter Inventory" name="inventory search editor"/>
+	<filter_editor label="收納區過濾器" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
-		<inventory_panel label="MY INVENTORY" name="All Items"/>
-		<recent_inventory_panel label="RECENT" name="Recent Items"/>
+		<inventory_panel label="我的收納區" name="All Items"/>
+		<recent_inventory_panel label="最近" name="Recent Items"/>
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
+			<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
-			<button name="add_btn" tool_tip="Add new item"/>
+			<button name="add_btn" tool_tip="添加新物品"/>
 		</layout_panel>
 		<layout_panel name="trash_btn_panel">
-			<dnd_button name="trash_btn" tool_tip="Remove selected item"/>
+			<dnd_button name="trash_btn" tool_tip="移除所選擇的物品"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
index 7a176a92c6..abdbfd7429 100644
--- a/indra/newview/skins/default/xui/zh/panel_me.xml
+++ b/indra/newview/skins/default/xui/zh/panel_me.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="My Profile" name="panel_me">
+<panel label="我的檔案" name="panel_me">
 	<tab_container name="tabs">
-		<panel label="MY PROFILE" name="panel_profile"/>
+		<panel label="我的檔案" name="panel_profile"/>
 		<panel label="MY PICKS" name="panel_picks"/>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index 9e72dc9daf..f3163e3c19 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
@@ -24,7 +24,7 @@
 	</text>
 	<check_box initial_value="false" label="Auto Scale Media on Face of Object" name="auto_scale"/>
 	<text name="size_label">
-		Size:
+		尺寸：
 	</text>
 	<text name="X_label">
 		X
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index b682ffda7d..be9711c8a6 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
@@ -17,7 +17,7 @@
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_owner_interact"/>
 	<check_box initial_value="false" label="Show Control Bar" name="perms_owner_control"/>
 	<text name="group_label">
-		Group:
+		社團：
 	</text>
 	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_group_interact"/>
 	<check_box initial_value="false" label="Show Control Bar" name="perms_group_control"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_my_profile.xml b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
index f36608efb5..e26ccdef73 100644
--- a/indra/newview/skins/default/xui/zh/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profile" name="panel_profile">
+<panel label="檔案" name="panel_profile">
 	<string name="CaptionTextAcctInfo">
 		[ACCTTYPE]
 [PAYMENTINFO] [AGEVERIFICATION]
@@ -33,7 +33,7 @@
 						<text name="name_descr_text">
 							Display Name
 						</text>
-						<button label="Profile" name="see_profile_btn" tool_tip="See profile for this avatar"/>
+						<button label="檔案" name="see_profile_btn" tool_tip="察看這位化身的檔案"/>
 					</panel>
 				</panel>
 			</scroll_container>
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
index c4bcf605e3..26e03c9b3b 100644
--- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
@@ -3,10 +3,10 @@
 	<panel name="navigation_panel">
 		<pull_button name="back_btn" tool_tip="Go back to previous location"/>
 		<pull_button name="forward_btn" tool_tip="Go forward one location"/>
-		<button name="home_btn" tool_tip="Teleport to my home location"/>
-		<location_input label="Location" name="location_combo"/>
-		<search_combo_box label="Search" name="search_combo_box" tool_tip="Search">
-			<combo_editor label="Search [SECOND_LIFE]" name="search_combo_editor"/>
+		<button name="home_btn" tool_tip="瞬間傳送到我家的位置"/>
+		<location_input label="位置" name="location_combo"/>
+		<search_combo_box label="搜尋" name="search_combo_box" tool_tip="搜尋">
+			<combo_editor label="搜尋 [SECOND_LIFE]" name="search_combo_editor"/>
 		</search_combo_box>
 	</panel>
 	<favorites_bar name="favorite" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!">
diff --git a/indra/newview/skins/default/xui/zh/panel_notes.xml b/indra/newview/skins/default/xui/zh/panel_notes.xml
index 12182b521e..cf804b517d 100644
--- a/indra/newview/skins/default/xui/zh/panel_notes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notes.xml
@@ -5,10 +5,10 @@
 			<scroll_container name="profile_scroll">
 				<panel name="profile_scroll_panel">
 					<text name="status_message" value="My private notes:"/>
-					<text name="status_message2" value="Allow this person to:"/>
-					<check_box label="See my online status" name="status_check"/>
-					<check_box label="See me on the map" name="map_check"/>
-					<check_box label="Edit, delete or take my objects" name="objects_check"/>
+					<text name="status_message2" value="允許這個人可以："/>
+					<check_box label="看到我上線狀態" name="status_check"/>
+					<check_box label="在地圖上看見我" name="map_check"/>
+					<check_box label="邊輯，刪除或取下我的物件" name="objects_check"/>
 				</panel>
 			</scroll_container>
 		</layout_panel>
@@ -21,13 +21,13 @@
 					<button label="IM" name="im" tool_tip="Open instant message session"/>
 				</layout_panel>
 				<layout_panel name="call_btn_lp">
-					<button label="Call" name="call" tool_tip="Call this Resident"/>
+					<button label="通話" name="call" tool_tip="與這位居民通話"/>
 				</layout_panel>
 				<layout_panel name="show_on_map_btn_lp">
 					<button label="地圖" name="show_on_map_btn" tool_tip="Show the Resident on the map"/>
 				</layout_panel>
 				<layout_panel name="teleport_btn_lp">
-					<button label="Teleport" name="teleport" tool_tip="Offer teleport"/>
+					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
index fdc489f375..a5d3afccb9 100644
--- a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="friend_online_status" name="friend_online_status"/>
+<panel label="朋友_上線_狀態" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
index 97e423b8cc..6ceaf447a7 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray Outfit Edit panel -->
 <panel name="outfit_edit">
-	<string name="No Outfit" value="No Outfit"/>
-	<string name="unsaved_changes" value="Unsaved Changes"/>
-	<string name="now_editing" value="Now Editing"/>
+	<string name="No Outfit" value="無裝扮"/>
+	<string name="unsaved_changes" value="變更未儲存"/>
+	<string name="now_editing" value="現在編輯中"/>
 	<panel.string name="not_available">
 		(N\A)
 	</panel.string>
@@ -11,15 +11,15 @@
 		（未知）
 	</panel.string>
 	<string name="Filter.All" value="全部"/>
-	<string name="Filter.Clothes/Body" value="Clothes/Body"/>
-	<string name="Filter.Objects" value="Objects"/>
-	<string name="Filter.Clothing" value="Clothing"/>
-	<string name="Filter.Bodyparts" value="Body parts"/>
+	<string name="Filter.Clothes/Body" value="衣服 / 身體"/>
+	<string name="Filter.Objects" value="物件"/>
+	<string name="Filter.Clothing" value="服裝"/>
+	<string name="Filter.Bodyparts" value="身體部位"/>
 	<string name="replace_body_part" value="Click to replace your existing shape"/>
-	<text name="title" value="Edit Outfit"/>
+	<text name="title" value="編輯裝扮"/>
 	<panel name="header_panel">
 		<panel name="outfit_name_and_status">
-			<text name="status" value="Now editing..."/>
+			<text name="status" value="現在編輯中..."/>
 			<text name="curr_outfit_name" value="[Current Outfit]"/>
 		</panel>
 	</panel>
@@ -27,10 +27,10 @@
 		<layout_panel name="outfit_wearables_panel">
 			<layout_stack name="filter_panels">
 				<layout_panel name="add_button_and_combobox">
-					<button label="Add More..." name="show_add_wearables_btn" tool_tip="Open/Close"/>
+					<button label="Add More..." name="show_add_wearables_btn" tool_tip="開啟 / 關閉"/>
 				</layout_panel>
 				<layout_panel name="filter_panel">
-					<filter_editor label="Filter Inventory Wearables" name="look_item_filter"/>
+					<filter_editor label="收納區可穿著過濾器" name="look_item_filter"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
index 486b81e024..dfd81a85cc 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Things" name="Outfits">
 	<panel.string name="wear_outfit_tooltip">
-		Wear selected outfit
+		穿上所選擇的裝扮
 	</panel.string>
 	<panel.string name="wear_items_tooltip">
 		Wear selected items
 	</panel.string>
 	<tab_container name="appearance_tabs">
-		<panel label="MY OUTFITS" name="outfitslist_tab"/>
+		<panel label="我的裝扮" name="outfitslist_tab"/>
 		<panel label="WEARING" name="cof_tab"/>
 	</tab_container>
 	<panel name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
index af417a79ef..92ec774f9b 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu_gear_default">
-	<menu_item_call label="Replace Current Outfit" name="wear"/>
-	<menu_item_call label="Remove From Current Outfit" name="remove"/>
+	<menu_item_call label="取代目前的裝扮" name="wear"/>
+	<menu_item_call label="由目前的裝扮移除" name="remove"/>
 	<menu_item_call label="更名" name="rename"/>
-	<menu_item_call label="Remove Link" name="remove_link"/>
-	<menu_item_call label="Delete Outfit" name="delete"/>
+	<menu_item_call label="移除聯結" name="remove_link"/>
+	<menu_item_call label="刪除裝扮" name="delete"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
index 36770c52c7..a4b041469b 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
 	<panel name="bottom_panel">
-		<menu_button name="options_gear_btn" tool_tip="Show additional options"/>
-		<button name="trash_btn" tool_tip="Delete selected outfit"/>
+		<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
+		<button name="trash_btn" tool_tip="刪除所選擇的裝扮"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 49c36614db..a1fec08940 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -5,8 +5,8 @@
 	<string name="no_filtered_recent_people" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_one_near" value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
 	<string name="no_one_filtered_near" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
-	<string name="no_friends_online" value="No friends online"/>
-	<string name="no_friends" value="No friends"/>
+	<string name="no_friends_online" value="無朋友上線"/>
+	<string name="no_friends" value="無朋友"/>
 	<string name="no_friends_msg">
 		Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
 Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
@@ -22,13 +22,13 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Double-click to teleport, shift-drag to pan)"/>
 	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
-		<panel label="NEARBY" name="nearby_panel">
+		<panel label="附近" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
+				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
 				<button name="add_friend_btn" tool_tip="Add selected Resident to your friends List"/>
 			</panel>
 		</panel>
-		<panel label="MY FRIENDS" name="friends_panel">
+		<panel label="我的朋友" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
@@ -36,7 +36,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 			<panel label="bottom_panel" name="bottom_panel">
 				<layout_stack name="bottom_panel">
 					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Show additional options"/>
+						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
 					</layout_panel>
 					<layout_panel name="add_btn_panel">
 						<button name="add_btn" tool_tip="Offer friendship to a Resident"/>
@@ -47,16 +47,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				</layout_stack>
 			</panel>
 		</panel>
-		<panel label="MY GROUPS" name="groups_panel">
+		<panel label="我的社團" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
+				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
 				<button name="plus_btn" tool_tip="Join group/Create new group"/>
 				<button name="activate_btn" tool_tip="Activate selected group"/>
 			</panel>
 		</panel>
 		<panel label="RECENT" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
+				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
 				<button name="add_friend_btn" tool_tip="Add selected Resident to your friends List"/>
 			</panel>
 		</panel>
@@ -64,24 +64,24 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<panel name="button_bar">
 		<layout_stack name="bottom_bar_ls">
 			<layout_panel name="view_profile_btn_lp">
-				<button label="Profile" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information"/>
+				<button label="檔案" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="IM" name="im_btn" tool_tip="Open instant message session"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="Call" name="call_btn" tool_tip="Call this Resident"/>
+				<button label="通話" name="call_btn" tool_tip="Call this Resident"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="Share an inventory item"/>
+				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
-				<button label="Teleport" name="teleport_btn" tool_tip="Offer teleport"/>
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="Offer teleport"/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
 			<layout_panel name="group_info_btn_lp">
-				<button label="Group Profile" name="group_info_btn" tool_tip="Show group information"/>
+				<button label="社團檔案" name="group_info_btn" tool_tip="顯示社團資訊"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
 				<button label="Group Chat" name="chat_btn" tool_tip="Open chat session"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
index 75ecdb99a5..44ae5703c6 100644
--- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
@@ -11,7 +11,7 @@
 	<panel name="buttons">
 		<layout_stack name="layout_stack1">
 			<layout_panel name="layout_panel1">
-				<button label="Teleport" name="teleport_btn"/>
+				<button label="瞬間傳送" name="teleport_btn"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="地圖" name="show_on_map_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
index 28a47ed003..3b356967f9 100644
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_picks.xml
@@ -19,7 +19,7 @@
 				<button label="資訊" name="info_btn" tool_tip="Show pick information"/>
 			</layout_panel>
 			<layout_panel name="teleport_btn_lp">
-				<button label="Teleport" name="teleport_btn" tool_tip="Teleport to the corresponding area"/>
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="Teleport to the corresponding area"/>
 			</layout_panel>
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="地圖" name="show_on_map_btn" tool_tip="Show the corresponding area on the World Map"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index cef56eb907..b0919c9151 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -5,18 +5,18 @@
 	<string name="anyone" value="Anyone"/>
 	<string name="available" value="available"/>
 	<string name="allocated" value="allocated"/>
-	<string name="title_place" value="Place Profile"/>
-	<string name="title_teleport_history" value="Teleport History"/>
+	<string name="title_place" value="地點檔案"/>
+	<string name="title_teleport_history" value="瞬間傳送歷史紀錄"/>
 	<string name="not_available" value="(N\A)"/>
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
 	<string name="none_text" value="（無）"/>
 	<string name="sale_pending_text" value="(Sale Pending)"/>
-	<string name="group_owned_text" value="(Group Owned)"/>
+	<string name="group_owned_text" value="（社團所擁有）"/>
 	<string name="price_text" value="L$"/>
 	<string name="area_text" value="m²"/>
 	<string name="all_residents_text" value="全部居民"/>
-	<string name="group_text" value="Group"/>
+	<string name="group_text" value="社團"/>
 	<string name="can_resell">
 		Purchased land in this region may be resold.
 	</string>
@@ -42,7 +42,7 @@
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
 	<button name="back_btn" tool_tip="Back"/>
-	<text name="title" value="Place Profile"/>
+	<text name="title" value="地點檔案"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
 			<text name="region_title" value="SampleRegion"/>
@@ -58,7 +58,7 @@
 						<text name="rating_value" value="未知"/>
 						<text name="voice_label" value="Voice:"/>
 						<text name="voice_value" value="On"/>
-						<text name="fly_label" value="Fly:"/>
+						<text name="fly_label" value="飛行："/>
 						<text name="fly_value" value="On"/>
 						<text name="push_label" value="Push:"/>
 						<text name="push_value" value="Off"/>
@@ -81,7 +81,7 @@
 						<text name="region_rating" value="Adult"/>
 						<text name="region_owner_label" value="擁有者："/>
 						<text name="region_owner" value="moose Van Moose extra long name moose"/>
-						<text name="region_group_label" value="Group:"/>
+						<text name="region_group_label" value="社團："/>
 						<text name="region_group">
 							The Mighty Moose of mooseville soundvillemoose
 						</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
index 9a038c8b04..10524bc5f0 100644
--- a/indra/newview/skins/default/xui/zh/panel_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_places.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Places" name="places panel">
-	<string name="landmarks_tab_title" value="MY LANDMARKS"/>
-	<string name="teleport_history_tab_title" value="TELEPORT HISTORY"/>
-	<filter_editor label="Filter My Places" name="Filter"/>
+<panel label="地點" name="places panel">
+	<string name="landmarks_tab_title" value="我的地標"/>
+	<string name="teleport_history_tab_title" value="瞬間傳送歷史紀錄"/>
+	<filter_editor label="我的地點過濾器" name="Filter"/>
 	<panel name="button_panel">
 		<layout_stack name="bottom_bar_ls0">
 			<layout_panel name="lp1">
 				<layout_stack name="bottom_bar_ls1">
 					<layout_panel name="teleport_btn_lp">
-						<button label="Teleport" name="teleport_btn" tool_tip="Teleport to the selected area"/>
+						<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選擇的區域"/>
 					</layout_panel>
 					<layout_panel name="chat_btn_lp">
 						<button label="地圖" name="map_btn" tool_tip="Show the corresponding area on the World Map"/>
@@ -18,15 +18,15 @@
 			<layout_panel name="lp2">
 				<layout_stack name="bottom_bar_ls3">
 					<layout_panel name="edit_btn_lp">
-						<button label="編輯" name="edit_btn" tool_tip="Edit landmark information"/>
+						<button label="編輯" name="edit_btn" tool_tip="編輯地標資訊"/>
 					</layout_panel>
 					<layout_panel name="overflow_btn_lp">
-						<menu_button name="overflow_btn" tool_tip="Show additional options"/>
+						<menu_button name="overflow_btn" tool_tip="顯示額外選項"/>
 					</layout_panel>
 				</layout_stack>
 				<layout_stack name="bottom_bar_ls3">
 					<layout_panel name="profile_btn_lp">
-						<button label="Profile" name="profile_btn" tool_tip="Show place profile"/>
+						<button label="檔案" name="profile_btn" tool_tip="顯示地點檔案"/>
 					</layout_panel>
 				</layout_stack>
 				<layout_stack name="bottom_bar_close_ls3">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index cad8d75470..34b0e3800f 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -13,7 +13,7 @@
 	<check_box label="Enable plain text IM and chat history" name="plain_text_chat_history"/>
 	<check_box label="聊天泡泡" name="bubble_text_chat"/>
 	<text name="show_ims_in_label">
-		Show IMs in:
+		顯示 IMs 於：
 	</text>
 	<text name="requires_restart_label">
 		（須重新啟動）
@@ -26,7 +26,7 @@
 		Enable incoming chat popups:
 	</text>
 	<check_box label="Group Chats" name="EnableGroupChatPopups" tool_tip="Check to see popups when a Group Chat message arrives"/>
-	<check_box label="IM Chats" name="EnableIMChatPopups" tool_tip="Check to see popups when an instant message arrives"/>
+	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="Check to see popups when an instant message arrives"/>
 	<spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/>
 	<spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/>
 	<text name="translate_chb_label">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index 261622d136..8d92eadd20 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -34,7 +34,7 @@
 	<color_swatch name="background" tool_tip="挑選名稱標籤顏色"/>
 	<slider label="不透明度：" name="bubble_chat_opacity" tool_tip="挑選名稱標籤不透明度"/>
 	<text name="floater_opacity">
-		Floater Opacity:
+		浮動視窗不透明度：
 	</text>
 	<slider label="啟用：" name="active"/>
 	<slider label="停用：" name="inactive"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 32b3508af5..e53d2a8c06 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -46,7 +46,7 @@
 	<check_box label="My name" name="show_my_name_checkbox1"/>
 	<check_box label="Usernames" name="show_slids" tool_tip="Show username, like bobsmith123"/>
 	<check_box label="Group titles" name="show_all_title_checkbox1" tool_tip="Show group titles, like Officer or Member"/>
-	<check_box label="Highlight friends" name="show_friends" tool_tip="Highlight the name tags of your friends"/>
+	<check_box label="高亮顯示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
 	<check_box label="View Display Names" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
 	<text name="inworld_typing_rg_label">
 		Pressing letter keys:
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index 642edff336..68e149d866 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -35,8 +35,8 @@
 		<combo_box name="Reflections">
 			<combo_box.item label="Minimal" name="0"/>
 			<combo_box.item label="Terrain and trees" name="1"/>
-			<combo_box.item label="All static objects" name="2"/>
-			<combo_box.item label="All avatars and objects" name="3"/>
+			<combo_box.item label="全部靜態物件" name="2"/>
+			<combo_box.item label="全部化身與物件" name="3"/>
 			<combo_box.item label="Everything" name="4"/>
 		</combo_box>
 		<slider label="Avatar Physics:" name="AvatarPhysicsDetail"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index acd0a54ebf..ff582d774b 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -17,7 +17,7 @@
 	<check_box label="Tap-tap-hold to run" name="tap_tap_hold_to_run"/>
 	<check_box label="Double-Click to:" name="double_click_chkbox"/>
 	<radio_group name="double_click_action">
-		<radio_item label="Teleport" name="radio_teleport"/>
+		<radio_item label="瞬間傳送" name="radio_teleport"/>
 		<radio_item label="Auto-pilot" name="radio_autopilot"/>
 	</radio_group>
 	<button label="其他設備" name="joystick_setup_button"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index 847798e7a0..e0e0911872 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="溝通" name="im">
 	<panel.string name="log_in_to_change">
-		log in to change
+		登入以改變
 	</panel.string>
 	<button label="清除歷史紀錄" name="clear_cache" tool_tip="清除登入圖像、最後位置、瞬間傳送紀錄、網頁及材質快取"/>
 	<text name="cache_size_label_l">
@@ -9,14 +9,14 @@
 	</text>
 	<check_box label="將我顯示在搜尋的結果中" name="online_searchresults"/>
 	<check_box label="只有我的朋友和社團知道我在線上" name="online_visibility"/>
-	<check_box label="Only friends and groups can call or IM me" name="voice_call_friends_only_check"/>
-	<check_box label="Switch off microphone when ending calls" name="auto_disengage_mic_check"/>
-	<check_box label="Show my Favorite Landmarks at Login (via &apos;Start At&apos; drop-down menu)" name="favorites_on_login_check"/>
+	<check_box label="只有我的朋友和社團可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
+	<check_box label="當通話結束時關閉麥克風" name="auto_disengage_mic_check"/>
+	<check_box label="登入時顯示我最愛的地標位置（經由 &apos;開始於&apos; 的下拉式選單）" name="favorites_on_login_check"/>
 	<text name="Logs:">
 		聊天紀錄：
 	</text>
 	<check_box label="儲存附近的聊天紀錄到我的電腦" name="log_nearby_chat"/>
-	<check_box label="Save IM logs on my computer" name="log_instant_messages"/>
+	<check_box label="儲存 IM 紀錄到我的電腦中" name="log_instant_messages"/>
 	<check_box label="添加時間戳記到聊天紀錄的每一行" name="show_timestamps_check_im"/>
 	<check_box label="添加時間戳記到紀錄檔檔名。" name="logfile_name_datestamp"/>
 	<text name="log_path_desc">
diff --git a/indra/newview/skins/default/xui/zh/panel_profile.xml b/indra/newview/skins/default/xui/zh/panel_profile.xml
index 88cd3a0e16..fafbf855de 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profile" name="panel_profile">
+<panel label="檔案" name="panel_profile">
 	<string name="CaptionTextAcctInfo">
 		[ACCTTYPE]
 [PAYMENTINFO] [AGEVERIFICATION]
@@ -30,15 +30,15 @@
 						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
 					</panel>
 					<panel name="first_life_image_panel">
-						<text name="title_rw_descr_text" value="Real World:"/>
+						<text name="title_rw_descr_text" value="真實世界："/>
 					</panel>
 					<text name="title_member_text" value="Resident Since:"/>
 					<text name="title_acc_status_text" value="Account Status:"/>
-					<text name="title_partner_text" value="Partner:"/>
+					<text name="title_partner_text" value="配偶："/>
 					<panel name="partner_data_panel">
 						<text initial_value="(retrieving)" name="partner_text"/>
 					</panel>
-					<text name="title_groups_text" value="Groups:"/>
+					<text name="title_groups_text" value="社團："/>
 				</panel>
 			</scroll_container>
 		</layout_panel>
@@ -53,10 +53,10 @@
 					<button label="IM" name="im" tool_tip="Open instant message session"/>
 				</layout_panel>
 				<layout_panel name="call_btn_lp">
-					<button label="Call" name="call" tool_tip="Call this Resident"/>
+					<button label="通話" name="call" tool_tip="與這位居民通話"/>
 				</layout_panel>
 				<layout_panel name="chat_btn_lp">
-					<button label="Teleport" name="teleport" tool_tip="Offer teleport"/>
+					<button label="瞬間傳送" name="teleport" tool_tip="Offer teleport"/>
 				</layout_panel>
 				<layout_panel name="overflow_btn_lp">
 					<menu_button label="▼" name="overflow_btn" tool_tip="Pay money to or share inventory with the Resident"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_view.xml b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
index 0f30d5dcbe..a8d7c8d6d1 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
@@ -13,7 +13,7 @@
 	<button name="copy_to_clipboard" tool_tip="覆製到剪貼簿"/>
 	<text name="user_label" value="Username:"/>
 	<tab_container name="tabs">
-		<panel label="PROFILE" name="panel_profile"/>
+		<panel label="檔案" name="panel_profile"/>
 		<panel label="PICKS" name="panel_picks"/>
 		<panel label="NOTES &amp; PRIVACY" name="panel_notes"/>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index 892b743f57..dee3e3045f 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -21,7 +21,7 @@
 	</line_editor>
 	<button label="Choose" name="choose_avatar_btn"/>
 	<text name="options_text_lbl">
-		Options:
+		選項：
 	</text>
 	<check_box label="With scripts" name="return_scripts" tool_tip="Return only objects which have scripts"/>
 	<check_box label="On someone else&apos;s land" name="return_other_land" tool_tip="Return only objects which are on land belonging to someone else"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index 687135bf65..c1e43cef48 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -24,11 +24,11 @@
 	</text>
 	<check_box label="Payment Information on File" name="limit_payment" tool_tip="Ban unidentified Residents"/>
 	<check_box label="年齡驗證" name="limit_age_verified" tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."/>
-	<check_box label="Allow Voice Chat" name="voice_chat_check"/>
-	<check_box label="Allow Direct Teleport" name="allow_direct_teleport"/>
+	<check_box label="允許語音聊天" name="voice_chat_check"/>
+	<check_box label="允許直接瞬間傳送" name="allow_direct_teleport"/>
 	<button label="套用" name="apply_btn"/>
-	<button label="Send Message To Estate..." name="message_estate_btn"/>
-	<button label="Kick Resident from Estate..." name="kick_user_from_estate_btn"/>
+	<button label="瞬間傳送訊息到領地..." name="message_estate_btn"/>
+	<button label="由領地將居民踢除..." name="kick_user_from_estate_btn"/>
 	<text name="estate_manager_label">
 		領地管理員：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index ce69ec59c4..f2ccb6e1cf 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -36,8 +36,8 @@
 		<icons_combo_box.item label="一般" name="PG" value="13"/>
 	</icons_combo_box>
 	<button label="套用" name="apply_btn"/>
-	<button label="Teleport Home One Resident..." name="kick_btn"/>
-	<button label="Teleport Home All Residents..." name="kick_all_btn"/>
-	<button label="Send Message To Region..." name="im_btn"/>
-	<button label="Manage Telehub..." name="manage_telehub_btn"/>
+	<button label="強制瞬間傳送一位居民回家..." name="kick_btn"/>
+	<button label="強制瞬間傳送所有居民回家..." name="kick_all_btn"/>
+	<button label="傳送訊息到地區..." name="im_btn"/>
+	<button label="管理瞬間傳送中心..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_texture.xml b/indra/newview/skins/default/xui/zh/panel_region_texture.xml
index 42d70fddb8..7b6152121f 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Ground Textures" name="Textures">
+<panel label="地面材質" name="Textures">
 	<text name="region_text_lbl">
 		地區：
 	</text>
@@ -7,7 +7,7 @@
 		未知
 	</text>
 	<text name="detail_texture_text">
-		Terrain Textures (requires 512x512, 24 bit .tga files)
+		地形材質（須 512x512，24 位元 .tga 檔格式）
 	</text>
 	<text name="height_text_lbl">
 		1 (Low)
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index b0f1bdb337..03b845a76c 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -19,29 +19,29 @@
 		Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
 	</panel.string>
 	<menu_bar name="script_menu">
-		<menu label="File" name="File">
+		<menu label="檔案" name="File">
 			<menu_item_call label="儲存" name="Save"/>
-			<menu_item_call label="Revert All Changes" name="Revert All Changes"/>
+			<menu_item_call label="還原全部變更" name="Revert All Changes"/>
 		</menu>
 		<menu label="編輯" name="Edit">
 			<menu_item_call label="復原" name="Undo"/>
-			<menu_item_call label="Redo" name="Redo"/>
+			<menu_item_call label="重做" name="Redo"/>
 			<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="Deselect" name="Deselect"/>
+			<menu_item_call label="取銷選擇" name="Deselect"/>
 			<menu_item_call label="搜尋 / 取代..." name="Search / Replace..."/>
 		</menu>
-		<menu label="Help" name="Help">
-			<menu_item_call label="Help..." name="Help..."/>
-			<menu_item_call label="Keyword Help..." name="Keyword Help..."/>
+		<menu label="幫助" name="Help">
+			<menu_item_call label="幫助..." name="Help..."/>
+			<menu_item_call label="關鍵字幫助..." name="Keyword Help..."/>
 		</menu>
 	</menu_bar>
 	<text_editor name="Script Editor">
 		載入中...
 	</text_editor>
-	<combo_box label="Insert..." name="Insert..."/>
+	<combo_box label="插入..." name="Insert..."/>
 	<button label="儲存" label_selected="儲存" name="Save_btn"/>
 	<button label="編輯..." name="Edit_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
index 5276466117..32cc2f9a5d 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="MY AVATAR" name="script_limits_my_avatar_panel">
+<panel label="我的化身" name="script_limits_my_avatar_panel">
 	<text name="script_memory">
 		Avatar Script Usage
 	</text>
@@ -7,10 +7,10 @@
 		載入中...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="Size (kb)" name="size"/>
+		<scroll_list.columns label="尺寸（kb）" name="size"/>
 		<scroll_list.columns label="URLs" name="urls"/>
 		<scroll_list.columns label="物件名稱" name="name"/>
-		<scroll_list.columns label="Location" name="location"/>
+		<scroll_list.columns label="位置" name="location"/>
 	</scroll_list>
 	<button label="Refresh List" name="refresh_list_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
index 1dc8278db1..cbb40e52de 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
@@ -7,7 +7,7 @@
 		載入中...
 	</text>
 	<scroll_list name="scripts_list">
-		<scroll_list.columns label="Size (kb)" name="size"/>
+		<scroll_list.columns label="尺寸（kb）" name="size"/>
 		<scroll_list.columns label="URLs" name="urls"/>
 		<scroll_list.columns label="物件名稱" name="name"/>
 		<scroll_list.columns label="Object Owner" name="owner"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
index d99450b5be..d0169b7c2d 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -6,24 +6,24 @@
 	<sidetray_tab description="首頁。" name="sidebar_home" tab_title="首頁">
 		<panel label="首頁" name="panel_home"/>
 	</sidetray_tab>
-	<sidetray_tab description="Edit your public profile and Picks." name="sidebar_me" tab_title="My Profile">
+	<sidetray_tab description="Edit your public profile and Picks." name="sidebar_me" tab_title="我的檔案">
 		<panel_container name="panel_container">
 			<panel label="自己" name="panel_me"/>
 		</panel_container>
 	</sidetray_tab>
 	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="People">
 		<panel_container name="panel_container">
-			<panel label="Group Profile" name="panel_group_info_sidetray"/>
+			<panel label="社團檔案" name="panel_group_info_sidetray"/>
 			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
 		</panel_container>
 	</sidetray_tab>
 	<sidetray_tab description="Find places to go and places you&apos;ve visited before." label="Places" name="sidebar_places" tab_title="Places">
 		<panel label="Places" name="panel_places"/>
 	</sidetray_tab>
-	<sidetray_tab description="Browse your inventory." name="sidebar_inventory" tab_title="My Inventory">
-		<panel label="Edit Inventory" name="sidepanel_inventory"/>
+	<sidetray_tab description="瀏覽你的收納區。" name="sidebar_inventory" tab_title="我的收納區">
+		<panel label="編輯收納區" name="sidepanel_inventory"/>
 	</sidetray_tab>
-	<sidetray_tab description="Change your appearance and current look." name="sidebar_appearance" tab_title="My Appearance">
+	<sidetray_tab description="變更你的外觀與目前樣貌。" name="sidebar_appearance" tab_title="我的外觀">
 		<panel label="Edit Appearance" name="sidepanel_appearance"/>
 	</sidetray_tab>
 </side_tray>
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
index 822b2b5894..cdd79da30c 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="sidetray_tab_panel">
 	<text name="sidetray_tab_title" value="側邊欄"/>
-	<button name="undock" tool_tip="Undock"/>
-	<button name="dock" tool_tip="Dock"/>
-	<button name="show_help" tool_tip="Show Help"/>
+	<button name="undock" tool_tip="不停泊固定"/>
+	<button name="dock" tool_tip="停泊固定"/>
+	<button name="show_help" tool_tip="顯示幫助"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
index 279a9869a8..1dd3acef5d 100644
--- a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
 <panel name="panel_stand_stop_flying">
-	<button label="Stand" name="stand_btn" tool_tip="Click here to stand up."/>
-	<button label="Stop Flying" name="stop_fly_btn" tool_tip="Stop flying"/>
+	<button label="站立" name="stand_btn" tool_tip="點擊此處起立。"/>
+	<button label="停止飛行" name="stop_fly_btn" tool_tip="停止飛行"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 65740f1b6d..9a59d627d0 100644
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -17,11 +17,11 @@
 	</panel.string>
 	<panel name="balance_bg">
 		<text name="balance" tool_tip="Click to refresh your L$ balance" value="L$20"/>
-		<button label="購買 L$" name="buyL" tool_tip="Click to buy more L$"/>
+		<button label="購買 L$" name="buyL" tool_tip="點擊以購買更多 L$"/>
 	</panel>
-	<text name="TimeText" tool_tip="Current time (Pacific)">
+	<text name="TimeText" tool_tip="目前時區（太平洋）">
 		24:00 AM PST
 	</text>
-	<button name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)"/>
+	<button name="media_toggle_btn" tool_tip="開始 / 停止全部媒體（音樂、影片、網頁）"/>
 	<button name="volume_btn" tool_tip="Global Volume Control"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
index 872a4584bf..6c81ede76c 100644
--- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History">
 	<accordion name="history_accordion">
-		<no_matched_tabs_text name="no_matched_teleports_msg" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]."/>
-		<no_visible_tabs_text name="no_teleports_msg" value="Teleport history is empty. Try [secondlife:///app/search/places/ Search]."/>
+		<no_matched_tabs_text name="no_matched_teleports_msg" value="沒有發現你要找的嗎？試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。"/>
+		<no_visible_tabs_text name="no_teleports_msg" value="瞬間傳送紀錄是空白的。試試 [secondlife:///app/search/places/ 搜尋]。"/>
 		<accordion_tab name="today" title="今天"/>
 		<accordion_tab name="yesterday" title="昨天"/>
 		<accordion_tab name="2_days_ago" title="前天"/>
@@ -14,6 +14,6 @@
 		<accordion_tab name="6_months_and_older" title="半年前或更久"/>
 	</accordion>
 	<panel name="bottom_panel">
-		<menu_button name="gear_btn" tool_tip="Show additional options"/>
+		<menu_button name="gear_btn" tool_tip="顯示額外選項"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 196f8c7a6a..91015bb8b0 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -37,7 +37,7 @@
 		<action description="Always allow &apos;Edit Terrain&apos;" longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow edit land" value="23"/>
 		<action description="Always allow &apos;Fly&apos;" longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow fly" value="24"/>
 		<action description="Always allow &apos;Create Objects&apos;" longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow create" value="25"/>
-		<action description="Always allow &apos;Create Landmark&apos;" longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow landmark" value="26"/>
+		<action description="總是允許 &apos;創造地標&apos;" longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow landmark" value="26"/>
 		<action description="Allow &apos;Set Home to Here&apos; on group land" longdescription="Members in a Role with this Ability can use World menu &gt; Landmarks &gt; Set Home to Here on a parcel deeded to this group." name="land allow set home" value="28"/>
 		<action description="Allow &apos;Event Hosting&apos; on group land" longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event." name="land allow host event" value="41"/>
 	</action_set>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
index 1832886135..6f8f19b26d 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Outfits" name="appearance panel">
-	<string name="No Outfit" value="No Outfit"/>
-	<string name="Unsaved Changes" value="Unsaved changes"/>
-	<string name="Now Wearing" value="Now wearing..."/>
-	<string name="Changing outfits" value="Changing outfits"/>
+<panel label="裝扮" name="appearance panel">
+	<string name="No Outfit" value="無裝扮"/>
+	<string name="Unsaved Changes" value="變更未儲存"/>
+	<string name="Now Wearing" value="現在穿上..."/>
+	<string name="Changing outfits" value="變更裝扮"/>
 	<panel name="panel_currentlook">
 		<button label="E" name="editappearance_btn"/>
 		<button label="O" name="openoutfit_btn"/>
@@ -13,7 +13,7 @@
 		<text name="currentlook_name">
 			MyOutfit With a really Long Name like MOOSE
 		</text>
-		<button label="" name="edit_outfit_btn" tool_tip="Edit this outfit"/>
+		<button label="" name="edit_outfit_btn" tool_tip="編輯這裝扮"/>
 	</panel>
-	<filter_editor label="Filter Outfits" name="Filter"/>
+	<filter_editor label="裝扮過濾器" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index 4230d60c45..4cc16ed250 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
@@ -4,16 +4,16 @@
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
-					<button label="Profile" name="info_btn" tool_tip="Show object profile"/>
+					<button label="檔案" name="info_btn" tool_tip="顯示物件檔案"/>
 				</layout_panel>
 				<layout_panel name="share_btn_lp">
 					<button label="分享" name="share_btn" tool_tip="Share an inventory item"/>
 				</layout_panel>
 				<layout_panel name="shop_btn_lp">
 					<button label="Shop" name="shop_btn" tool_tip="Open Marketplace webpage"/>
-					<button label="Wear" name="wear_btn" tool_tip="Wear seleceted outfit"/>
+					<button label="Wear" name="wear_btn" tool_tip="穿上所選擇的裝扮"/>
 					<button label="Play" name="play_btn"/>
-					<button label="Teleport" name="teleport_btn" tool_tip="Teleport to the selected area"/>
+					<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選的區域"/>
 				</layout_panel>
 			</layout_stack>
 		</panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index d1332ddb7c..15437e3624 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Item Profile">
+<panel name="item properties" title="物品檔案">
 	<panel.string name="unknown">
 		（未知）
 	</panel.string>
@@ -16,13 +16,13 @@
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</panel.string>
 	<panel.string name="origin_inventory">
-		(Inventory)
+		（收納區）
 	</panel.string>
 	<panel.string name="origin_inworld">
 		(Inworld)
 	</panel.string>
-	<text name="title" value="Item Profile"/>
-	<text name="origin" value="(Inventory)"/>
+	<text name="title" value="物品檔案"/>
+	<text name="origin" value="（收納區）"/>
 	<scroll_container name="item_profile_scroll">
 		<panel label="" name="item_profile">
 			<text name="LabelItemNameTitle">
@@ -38,7 +38,7 @@
 				擁有者：
 			</text>
 			<text name="LabelAcquiredTitle">
-				Acquired:
+				取得於：
 			</text>
 			<panel name="perms_inv">
 				<text name="perm_modify">
@@ -52,7 +52,7 @@
 				</text>
 				<check_box label="覆製" name="CheckEveryoneCopy"/>
 				<text name="GroupLabel">
-					Group:
+					社團：
 				</text>
 				<check_box label="分享" name="CheckShareWithGroup" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 				<text name="NextOwnerLabel">
@@ -64,8 +64,8 @@
 			</panel>
 			<check_box label="出售" name="CheckPurchase"/>
 			<combo_box name="combobox sale copy">
-				<combo_box.item label="Copy" name="Copy"/>
-				<combo_box.item label="Original" name="Original"/>
+				<combo_box.item label="副本" name="Copy"/>
+				<combo_box.item label="原件" name="Original"/>
 			</combo_box>
 			<spinner label="價格： L$" name="Edit Cost"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 14d67d52b8..a011e29184 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="object properties" title="Object Profile">
+<panel name="object properties" title="物件檔案">
 	<panel.string name="text deed continued">
 		Deed
 	</panel.string>
@@ -36,7 +36,7 @@
 	<panel.string name="Sale Mixed">
 		Mixed Sale
 	</panel.string>
-	<text name="title" value="Object Profile"/>
+	<text name="title" value="物件檔案"/>
 	<text name="where" value="(Inworld)"/>
 	<panel label="" name="properties_panel">
 		<text name="Name:">
@@ -52,7 +52,7 @@
 			擁有者：
 		</text>
 		<text name="Group_label">
-			Group:
+			社團：
 		</text>
 		<button name="button set group" tool_tip="Choose a group to share this object&apos;s permissions"/>
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
@@ -77,7 +77,7 @@
 			<check_box label="覆製" name="checkbox allow everyone copy"/>
 			<check_box label="移動" name="checkbox allow everyone move"/>
 			<text name="GroupLabel">
-				Group:
+				社團：
 			</text>
 			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
 			<text name="NextOwnerLabel">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index aa94035b94..c3f669c686 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -20,22 +20,22 @@
 		Second Life Support Portal
 	</string>
 	<string name="StartupDetectingHardware">
-		Detecting hardware...
+		硬體偵測中...
 	</string>
 	<string name="StartupLoading">
-		Loading [APP_NAME]...
+		[APP_NAME] 載入中...
 	</string>
 	<string name="StartupClearingCache">
-		Clearing cache...
+		快取清除中...
 	</string>
 	<string name="StartupInitializingTextureCache">
-		Initializing Texture Cache...
+		材質快取初始化中...
 	</string>
 	<string name="StartupInitializingVFS">
-		Initializing VFS...
+		VFS 初始化中...
 	</string>
 	<string name="ProgressRestoring">
-		Restoring...
+		回存中...
 	</string>
 	<string name="ProgressChangingResolution">
 		Changing Resolution...
@@ -92,13 +92,13 @@
 		QuickTime initialized successfully.
 	</string>
 	<string name="LoginWaitingForRegionHandshake">
-		Waiting for region handshake...
+		地區交握等待中...
 	</string>
 	<string name="LoginConnectingToRegion">
-		Connecting to region...
+		地區聯結中...
 	</string>
 	<string name="LoginDownloadingClothing">
-		Downloading clothing...
+		服裝下載中...
 	</string>
 	<string name="InvalidCertificate">
 		The server returned an invalid or corrupt certificate. Please contact the Grid administrator.
@@ -122,7 +122,7 @@
 		Network Error: Could not establish connection, please check your network connection.
 	</string>
 	<string name="LoginFailed">
-		Login failed.
+		登入失敗。
 	</string>
 	<string name="Quit">
 		Quit
@@ -137,13 +137,13 @@
 		Saving your settings...
 	</string>
 	<string name="LoggingOut">
-		Logging out...
+		登出中...
 	</string>
 	<string name="ShuttingDown">
-		Shutting down...
+		關閉中...
 	</string>
 	<string name="YouHaveBeenDisconnected">
-		You have been disconnected from the region you were in.
+		你已經被所在的地區中斷聯結。
 	</string>
 	<string name="SentToInvalidRegion">
 		You were sent to an invalid region.
@@ -164,7 +164,7 @@
 		Public
 	</string>
 	<string name="TooltipIsGroup">
-		(Group)
+		（社團）
 	</string>
 	<string name="TooltipForSaleL$">
 		出售： L$[AMOUNT]
@@ -182,7 +182,7 @@
 		Not Safe
 	</string>
 	<string name="TooltipFlagNoFly">
-		No Fly
+		禁止飛行
 	</string>
 	<string name="TooltipFlagGroupScripts">
 		Group Scripts
@@ -198,7 +198,7 @@
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]:"/>
 	<string name="TooltipHttpUrl">
-		Click to view this web page
+		點擊以察看這個網頁
 	</string>
 	<string name="TooltipSLURL">
 		Click to view this location&apos;s information
@@ -216,7 +216,7 @@
 		Click to unmute this Resident
 	</string>
 	<string name="TooltipAgentIM">
-		Click to IM this Resident
+		點擊開始 IM 這位居民
 	</string>
 	<string name="TooltipAgentPay">
 		Click to Pay this Resident
@@ -253,7 +253,7 @@
 	</string>
 	<string name="CurrentURL" value="CurrentURL: [CurrentURL]"/>
 	<string name="SLurlLabelTeleport">
-		Teleport to
+		瞬間傳送到
 	</string>
 	<string name="SLurlLabelShowOnMap">
 		Show Map for
@@ -274,13 +274,13 @@
 		Offer Teleport to
 	</string>
 	<string name="SLappAgentRequestFriend">
-		Friend Request
+		交友要求
 	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
-		Close (⌘W)
+		關閉（⌘W）
 	</string>
 	<string name="BUTTON_CLOSE_WIN">
-		Close (Ctrl+W)
+		關閉（Ctrl+W）
 	</string>
 	<string name="BUTTON_CLOSE_CHROME">
 		關閉
@@ -289,22 +289,22 @@
 		Restore
 	</string>
 	<string name="BUTTON_MINIMIZE">
-		Minimize
+		最小化
 	</string>
 	<string name="BUTTON_TEAR_OFF">
-		Tear Off
+		脫下
 	</string>
 	<string name="BUTTON_DOCK">
 		Dock
 	</string>
 	<string name="BUTTON_HELP">
-		Show Help
+		顯示幫助
 	</string>
 	<string name="Searching">
-		Searching...
+		搜尋中...
 	</string>
 	<string name="NoneFound">
-		None found.
+		未發現。
 	</string>
 	<string name="RetrievingData">
 		Retrieving...
@@ -364,7 +364,7 @@
 		Unknown status
 	</string>
 	<string name="texture">
-		texture
+		材質
 	</string>
 	<string name="sound">
 		sound
@@ -373,13 +373,13 @@
 		calling card
 	</string>
 	<string name="landmark">
-		landmark
+		地標
 	</string>
 	<string name="legacy script">
 		legacy script
 	</string>
 	<string name="clothing">
-		clothing
+		服裝
 	</string>
 	<string name="object">
 		object
@@ -400,7 +400,7 @@
 		LSL bytecode
 	</string>
 	<string name="tga texture">
-		tga texture
+		tga 材質
 	</string>
 	<string name="body part">
 		body part
@@ -772,7 +772,7 @@
 		Mainland / Full Region
 	</string>
 	<string name="all_files">
-		All Files
+		全部檔案
 	</string>
 	<string name="sound_files">
 		Sounds
@@ -796,7 +796,7 @@
 		Bitmap Images
 	</string>
 	<string name="avi_movie_file">
-		AVI Movie File
+		AVI 影片檔案
 	</string>
 	<string name="xaf_animation_file">
 		XAF Anim File
@@ -922,16 +922,16 @@
 		invalid
 	</string>
 	<string name="create_new_shape">
-		Create new shape
+		創造新體形
 	</string>
 	<string name="create_new_skin">
-		Create new skin
+		創造新皮膚
 	</string>
 	<string name="create_new_hair">
-		Create new hair
+		創造新頭髮
 	</string>
 	<string name="create_new_eyes">
-		Create new eyes
+		創耖新眼睛
 	</string>
 	<string name="create_new_shirt">
 		Create new shirt
@@ -964,7 +964,7 @@
 		Create new alpha
 	</string>
 	<string name="create_new_tattoo">
-		Create new tattoo
+		創造新刺青
 	</string>
 	<string name="create_new_physics">
 		Create new physics
@@ -982,10 +982,10 @@
 		確定
 	</string>
 	<string name="GroupNotifyGroupNotice">
-		Group Notice
+		社團通知
 	</string>
 	<string name="GroupNotifyGroupNotices">
-		Group Notices
+		社團通知
 	</string>
 	<string name="GroupNotifySentBy">
 		Sent by
@@ -1060,7 +1060,7 @@
 	<string name="link" value="(link)"/>
 	<string name="broken_link" value="(broken_link)"/>
 	<string name="LoadingContents">
-		Loading contents...
+		內容載入中...
 	</string>
 	<string name="NoContents">
 		No contents
@@ -1073,31 +1073,31 @@
 	<string name="PermNo">
 		否
 	</string>
-	<string name="Chat Message" value="Chat :"/>
-	<string name="Sound" value="Sound :"/>
-	<string name="Wait" value="--- Wait :"/>
-	<string name="AnimFlagStop" value="Stop Animation :"/>
-	<string name="AnimFlagStart" value="Start Animation :"/>
+	<string name="Chat Message" value="聊天："/>
+	<string name="Sound" value="聲音："/>
+	<string name="Wait" value="--- 等待："/>
+	<string name="AnimFlagStop" value="停止動作："/>
+	<string name="AnimFlagStart" value="開始動作："/>
 	<string name="Wave" value="Wave"/>
 	<string name="GestureActionNone" value="無"/>
 	<string name="HelloAvatar" value="Hello, avatar!"/>
 	<string name="ViewAllGestures" value="察看全部 &gt;&gt;"/>
-	<string name="GetMoreGestures" value="Get More &gt;&gt;"/>
-	<string name="Animations" value="Animations,"/>
+	<string name="GetMoreGestures" value="取得更多 &gt;&gt;"/>
+	<string name="Animations" value="動作,"/>
 	<string name="Calling Cards" value="Calling Cards,"/>
-	<string name="Clothing" value="Clothing,"/>
-	<string name="Gestures" value="Gestures,"/>
-	<string name="Landmarks" value="Landmarks,"/>
-	<string name="Notecards" value="Notecards,"/>
-	<string name="Objects" value="Objects,"/>
-	<string name="Scripts" value="Scripts,"/>
-	<string name="Sounds" value="Sounds,"/>
-	<string name="Textures" value="Textures,"/>
+	<string name="Clothing" value="服裝,"/>
+	<string name="Gestures" value="姿勢,"/>
+	<string name="Landmarks" value="地標,"/>
+	<string name="Notecards" value="記事卡,"/>
+	<string name="Objects" value="物件,"/>
+	<string name="Scripts" value="腳本,"/>
+	<string name="Sounds" value="聲音,"/>
+	<string name="Textures" value="材質,"/>
 	<string name="Snapshots" value="Snapshots,"/>
 	<string name="No Filters" value="No"/>
-	<string name="Since Logoff" value="- Since Logoff"/>
+	<string name="Since Logoff" value="- 自上次登出"/>
 	<string name="InvFolder My Inventory">
-		My Inventory
+		我的收納區
 	</string>
 	<string name="InvFolder My Favorites">
 		My Favorites
@@ -1106,46 +1106,46 @@
 		Library
 	</string>
 	<string name="InvFolder Textures">
-		Textures
+		材質
 	</string>
 	<string name="InvFolder Sounds">
-		Sounds
+		聲音
 	</string>
 	<string name="InvFolder Calling Cards">
 		Calling Cards
 	</string>
 	<string name="InvFolder Landmarks">
-		Landmarks
+		地標
 	</string>
 	<string name="InvFolder Scripts">
-		Scripts
+		腳本
 	</string>
 	<string name="InvFolder Clothing">
-		Clothing
+		服裝
 	</string>
 	<string name="InvFolder Objects">
-		Objects
+		物件
 	</string>
 	<string name="InvFolder Notecards">
-		Notecards
+		記事卡
 	</string>
 	<string name="InvFolder New Folder">
 		新資料夾
 	</string>
 	<string name="InvFolder Inventory">
-		Inventory
+		收納區
 	</string>
 	<string name="InvFolder Uncompressed Images">
 		Uncompressed Images
 	</string>
 	<string name="InvFolder Body Parts">
-		Body Parts
+		身體部位
 	</string>
 	<string name="InvFolder Trash">
-		Trash
+		垃圾桶
 	</string>
 	<string name="InvFolder Photo Album">
-		Photo Album
+		相簿
 	</string>
 	<string name="InvFolder Lost And Found">
 		Lost And Found
@@ -1154,10 +1154,10 @@
 		Uncompressed Sounds
 	</string>
 	<string name="InvFolder Animations">
-		Animations
+		動作
 	</string>
 	<string name="InvFolder Gestures">
-		Gestures
+		姿勢
 	</string>
 	<string name="InvFolder Favorite">
 		Favorites
@@ -1166,19 +1166,19 @@
 		Favorites
 	</string>
 	<string name="InvFolder Current Outfit">
-		Current Outfit
+		目前裝扮
 	</string>
 	<string name="InvFolder Initial Outfits">
-		Initial Outfits
+		初始裝扮
 	</string>
 	<string name="InvFolder My Outfits">
-		My Outfits
+		我的裝扮
 	</string>
 	<string name="InvFolder Accessories">
 		Accessories
 	</string>
 	<string name="InvFolder Friends">
-		Friends
+		朋友
 	</string>
 	<string name="InvFolder All">
 		全部
@@ -1250,25 +1250,25 @@
 		Pelvis
 	</string>
 	<string name="Mouth">
-		Mouth
+		嘴
 	</string>
 	<string name="Chin">
 		Chin
 	</string>
 	<string name="Left Ear">
-		Left Ear
+		左耳
 	</string>
 	<string name="Right Ear">
-		Right Ear
+		右耳
 	</string>
 	<string name="Left Eyeball">
-		Left Eyeball
+		左眼球
 	</string>
 	<string name="Right Eyeball">
-		Right Eyeball
+		右眼球
 	</string>
 	<string name="Nose">
-		Nose
+		鼻子
 	</string>
 	<string name="R Upper Arm">
 		R Upper Arm
@@ -1328,43 +1328,43 @@
 		[AGEDAYS] old
 	</string>
 	<string name="TodayOld">
-		Joined today
+		今日剛加入
 	</string>
 	<string name="AgeYearsA">
-		[COUNT] year
+		[COUNT] 年
 	</string>
 	<string name="AgeYearsB">
-		[COUNT] years
+		[COUNT] 年
 	</string>
 	<string name="AgeYearsC">
-		[COUNT] years
+		[COUNT] 年
 	</string>
 	<string name="AgeMonthsA">
-		[COUNT] month
+		[COUNT] 月
 	</string>
 	<string name="AgeMonthsB">
-		[COUNT] months
+		[COUNT] 月
 	</string>
 	<string name="AgeMonthsC">
-		[COUNT] months
+		[COUNT] 月
 	</string>
 	<string name="AgeWeeksA">
-		[COUNT] week
+		[COUNT] 週
 	</string>
 	<string name="AgeWeeksB">
-		[COUNT] weeks
+		[COUNT] 週
 	</string>
 	<string name="AgeWeeksC">
-		[COUNT] weeks
+		[COUNT] 週
 	</string>
 	<string name="AgeDaysA">
-		[COUNT] day
+		[COUNT] 天
 	</string>
 	<string name="AgeDaysB">
-		[COUNT] days
+		[COUNT] 天
 	</string>
 	<string name="AgeDaysC">
-		[COUNT] days
+		[COUNT] 天
 	</string>
 	<string name="GroupMembersA">
 		[COUNT] member
@@ -1486,14 +1486,14 @@
 	<string name="GroupsNone">
 		無
 	</string>
-	<string name="Group" value="(group)"/>
+	<string name="Group" value="（社團）"/>
 	<string name="Unknown">
 		（未知）
 	</string>
-	<string name="SummaryForTheWeek" value="Summary for this week, beginning on "/>
-	<string name="NextStipendDay" value=". The next stipend day is "/>
+	<string name="SummaryForTheWeek" value="Summary for this week, beginning on"/>
+	<string name="NextStipendDay" value="The next stipend day is"/>
 	<string name="GroupIndividualShare" value="Group       Individual Share"/>
-	<string name="GroupColumn" value="Group"/>
+	<string name="GroupColumn" value="社團"/>
 	<string name="Balance">
 		Balance
 	</string>
@@ -1522,10 +1522,10 @@
 		error
 	</string>
 	<string name="RegionInfoAllEstatesOwnedBy">
-		all estates owned by [OWNER]
+		[OWNER] 所擁有的的全部領地
 	</string>
 	<string name="RegionInfoAllEstatesYouOwn">
-		all estates that you own
+		你所擁有的全部領地
 	</string>
 	<string name="RegionInfoAllEstatesYouManage">
 		all estates that you manage for [OWNER]
@@ -1618,13 +1618,13 @@
 		Right Ear
 	</string>
 	<string name="ATTACH_LEYE">
-		Left Eye
+		左眼
 	</string>
 	<string name="ATTACH_REYE">
-		Right Eye
+		右眼
 	</string>
 	<string name="ATTACH_NOSE">
-		Nose
+		鼻子
 	</string>
 	<string name="ATTACH_RUARM">
 		Right Upper Arm
@@ -1711,16 +1711,16 @@
 		The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.
 	</string>
 	<string name="MuteByName">
-		(By name)
+		（由名稱）
 	</string>
 	<string name="MuteAgent">
-		(Resident)
+		（居民）
 	</string>
 	<string name="MuteObject">
-		(Object)
+		（物件）
 	</string>
 	<string name="MuteGroup">
-		(Group)
+		（社團）
 	</string>
 	<string name="MuteExternal">
 		(External)
@@ -1733,12 +1733,12 @@
 	</string>
 	<string name="covenant_last_modified" value="Last Modified:"/>
 	<string name="none_text" value="（無）"/>
-	<string name="never_text" value="(never)"/>
+	<string name="never_text" value="（絕不）"/>
 	<string name="GroupOwned">
-		Group Owned
+		社團所擁有
 	</string>
 	<string name="Public">
-		Public
+		公開
 	</string>
 	<string name="ClassifiedClicksTxt">
 		Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile
@@ -1822,14 +1822,14 @@
 		取銷
 	</string>
 	<string name="UploadingCosts">
-		Uploading [NAME] costs L$ [AMOUNT]
+		花費 L$ [AMOUNT] 上傳 [NAME]
 	</string>
 	<string name="BuyingCosts">
-		Buying this costs L$ [AMOUNT]
+		花費 L$ [AMOUNT] 購買這個
 	</string>
 	<string name="UnknownFileExtension">
-		Unknown file extension .%s
-Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+		未知的副檔名 .%s
+預期為 .wav, .tga, .bmp, .jpg, .jpeg, or .bvh　類型
 	</string>
 	<string name="MuteObject2">
 		Block
@@ -1844,10 +1844,10 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 		Unblock
 	</string>
 	<string name="AddLandmarkNavBarMenu">
-		Add to My Landmarks...
+		添加到我的地標...
 	</string>
 	<string name="EditLandmarkNavBarMenu">
-		Edit my Landmark...
+		編輯我的地標...
 	</string>
 	<string name="accel-mac-control">
 		⌃
@@ -1871,10 +1871,10 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 		Shift+
 	</string>
 	<string name="FileSaved">
-		File Saved
+		檔案已儲存
 	</string>
 	<string name="Receiving">
-		Receiving
+		接收中
 	</string>
 	<string name="AM">
 		AM
@@ -1994,7 +1994,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 		Any
 	</string>
 	<string name="You">
-		You
+		你
 	</string>
 	<string name=":">
 		:
@@ -2128,7 +2128,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		5 O&apos;Clock Shadow
 	</string>
 	<string name="All White">
-		All White
+		全白
 	</string>
 	<string name="Anime Eyes">
 		Anime Eyes
@@ -3544,16 +3544,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Wrinkles
 	</string>
 	<string name="LocationCtrlAddLandmarkTooltip">
-		Add to My Landmarks
+		添加到我的地標
 	</string>
 	<string name="LocationCtrlEditLandmarkTooltip">
-		Edit my Landmark
+		編輯我的地標
 	</string>
 	<string name="LocationCtrlInfoBtnTooltip">
-		See more info about the current location
+		察看更多關於目前位置的資訊
 	</string>
 	<string name="LocationCtrlComboBtnTooltip">
-		My location history
+		我的位置歷史紀錄
 	</string>
 	<string name="LocationCtrlForSaleTooltip">
 		購買這塊土地
@@ -3562,7 +3562,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Voice not available here
 	</string>
 	<string name="LocationCtrlFlyTooltip">
-		Flying not allowed
+		不允許飛行
 	</string>
 	<string name="LocationCtrlPushTooltip">
 		No pushing
@@ -3664,7 +3664,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		[NAME] started a voice call
 	</string>
 	<string name="ringing-im">
-		Joining voice call...
+		加入語音通話...
 	</string>
 	<string name="connected-im">
 		Connected, click Leave Call to hang up
@@ -3808,7 +3808,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Giving L$ [AMOUNT]
 	</string>
 	<string name="uploading_costs">
-		Uploading costs L$ [AMOUNT]
+		上傳花費 L$ [AMOUNT]
 	</string>
 	<string name="this_costs">
 		This costs L$ [AMOUNT]
@@ -3832,21 +3832,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Online
 	</string>
 	<string name="uploading_abuse_report">
-		Uploading...
+		上傳中...
   
-Abuse Report
+舉報濫用
 	</string>
 	<string name="New Shape">
-		New Shape
+		新體形
 	</string>
 	<string name="New Skin">
-		New Skin
+		新皮膚
 	</string>
 	<string name="New Hair">
-		New Hair
+		新頭髮
 	</string>
 	<string name="New Eyes">
-		New Eyes
+		新眼睛
 	</string>
 	<string name="New Shirt">
 		新襯衫
@@ -3879,7 +3879,7 @@ Abuse Report
 		New Alpha
 	</string>
 	<string name="New Tattoo">
-		New Tattoo
+		新刺青
 	</string>
 	<string name="New Physics">
 		New Physics
@@ -3888,37 +3888,37 @@ Abuse Report
 		Invalid Wearable
 	</string>
 	<string name="New Gesture">
-		New Gesture
+		新姿勢
 	</string>
 	<string name="New Script">
-		New Script
+		新腳本
 	</string>
 	<string name="New Note">
-		New Note
+		新記事卡
 	</string>
 	<string name="New Folder">
 		新資料夾
 	</string>
 	<string name="Contents">
-		Contents
+		內容
 	</string>
 	<string name="Gesture">
 		Gesture
 	</string>
 	<string name="Male Gestures">
-		Male Gestures
+		男性姿勢
 	</string>
 	<string name="Female Gestures">
-		Female Gestures
+		女性姿勢
 	</string>
 	<string name="Other Gestures">
-		Other Gestures
+		其他姿勢
 	</string>
 	<string name="Speech Gestures">
-		Speech Gestures
+		演說姿勢
 	</string>
 	<string name="Common Gestures">
-		Common Gestures
+		一般姿勢
 	</string>
 	<string name="Male - Excuse me">
 		Male - Excuse me
@@ -4093,7 +4093,7 @@ Abuse Report
 		Delete selected item?
 	</string>
 	<string name="EmptyOutfitText">
-		There are no items in this outfit
+		沒有任何物品在這個裝扮內
 	</string>
 	<string name="ExternalEditorNotSet">
 		Select an editor using the ExternalEditor setting.
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index 33640f5fee..9702832f44 100644
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -39,7 +39,7 @@ Try again in a moment.
 			Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
 		</message>
 		<message name="no_inventory_host">
-			The inventory system is currently unavailable.
+			收納區功能目前無法使用。
 		</message>
 	</message_set>
 	<message_set name="progress">
@@ -53,28 +53,28 @@ Try again in a moment.
 			Relaying to destination.
 		</message>
 		<message name="sending_home">
-			Sending home location request.
+			傳送家位置的要求。
 		</message>
 		<message name="sending_landmark">
-			Sending landmark location request.
+			地標位置要求瞬間傳送中。
 		</message>
 		<message name="completing">
-			Completing teleport.
+			瞬間傳送完成。
 		</message>
 		<message name="completed_from">
-			Teleport completed from [T_SLURL]
+			由 [T_SLURL] 瞬間傳送完成。
 		</message>
 		<message name="resolving">
-			Resolving destination.
+			目的地解決中。
 		</message>
 		<message name="contacting">
-			Contacting new region.
+			聯繫到新的地區。
 		</message>
 		<message name="arriving">
 			抵達中...
 		</message>
 		<message name="requesting">
-			Requesting Teleport...
+			瞬間傳送要求中...
 		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/minimal/xui/es/floater_camera.xml b/indra/newview/skins/minimal/xui/es/floater_camera.xml
index ccf3d4bf91..87177e285c 100644
--- a/indra/newview/skins/minimal/xui/es/floater_camera.xml
+++ b/indra/newview/skins/minimal/xui/es/floater_camera.xml
@@ -13,7 +13,7 @@
 		Modos de cámara
 	</floater.string>
 	<floater.string name="pan_mode_title">
-		Orbital - Zoom - Panóramica
+		Orbital - Zoom - Panorámica
 	</floater.string>
 	<floater.string name="presets_mode_title">
 		Vistas predefinidas
@@ -59,7 +59,7 @@
 	</panel>
 	<panel name="buttons">
 		<button label="" name="presets_btn" tool_tip="Vistas predefinidas"/>
-		<button label="" name="pan_btn" tool_tip="Orbital - Zoom - Panóramica"/>
+		<button label="" name="pan_btn" tool_tip="Orbital - Zoom - Panorámica"/>
 		<button label="" name="avatarview_btn" tool_tip="Modos de cámara"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/minimal/xui/es/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/es/menu_attachment_other.xml
index 00bdb74881..b8ae93afd2 100644
--- a/indra/newview/skins/minimal/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/minimal/xui/es/menu_attachment_other.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="Ver el perfil" name="Profile..."/>
 	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
 	<menu_item_call label="MI" name="Send IM..."/>
-	<menu_item_call label="Llamada" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Invitar al grupo" name="Invite..."/>
 	<menu_item_call label="Ignorar" name="Avatar Mute"/>
 	<menu_item_call label="Denunciar" name="abuse"/>
diff --git a/indra/newview/skins/minimal/xui/es/menu_avatar_other.xml b/indra/newview/skins/minimal/xui/es/menu_avatar_other.xml
index 7df2d7c4e0..5fb3e51575 100644
--- a/indra/newview/skins/minimal/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/minimal/xui/es/menu_avatar_other.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="Ver el perfil" name="Profile..."/>
 	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
 	<menu_item_call label="MI" name="Send IM..."/>
-	<menu_item_call label="Llamada" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Invitar al grupo" name="Invite..."/>
 	<menu_item_call label="Ignorar" name="Avatar Mute"/>
 	<menu_item_call label="Denunciar" name="abuse"/>
diff --git a/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml
index b4b964d096..728637de78 100644
--- a/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Ver el perfil" name="view_profile"/>
 	<menu_item_call label="Añadir como amigo" name="add_friend"/>
 	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Llamar" name="call"/>
 	<menu_item_call label="Teleportar" name="teleport"/>
 	<menu_item_call label="Ignorar" name="block"/>
 	<menu_item_call label="Designorar" name="unblock"/>
diff --git a/indra/newview/skins/minimal/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/es/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..254cf58437
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/es/panel_adhoc_control_panel.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<layout_stack name="vertical_stack">
+		<layout_panel name="call_btn_panel">
+			<button label="Llamar" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Colgar" name="end_call_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/es/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/es/panel_bottomtray.xml
index f782d66ae7..0989a3d0a1 100644
--- a/indra/newview/skins/minimal/xui/es/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_bottomtray.xml
@@ -4,26 +4,32 @@
 	<string name="SpeakBtnToolTip" value="Activa/Desactiva el micrófono"/>
 	<string name="VoiceControlBtnToolTip" value="Muestra/Oculta el panel del control de voz"/>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<button label="Hablar" name="speak_btn" tool_tip="Activar y desactivar tu micrófono"/>
+		</layout_panel>
+		<layout_panel name="speak_flyout_panel">
+			<button label="" name="flyout_btn" tool_tip="Cambiar tus preferencias de sonido"/>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gestos" name="Gesture" tool_tip="Muestra/Oculta los gestos"/>
+			<gesture_combo_list label="Gestos" name="Gesture" tool_tip="Hacer que tu avatar realice distintas acciones"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="Visión" name="camera_btn" tool_tip="Muestra/Oculta los controles de la cámara"/>
+			<bottomtray_button label="Visión" name="camera_btn" tool_tip="Controlar el ángulo de tu cámara"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Destinos" name="destination_btn" tool_tip="Muestra la ventana de gente"/>
+		<layout_panel name="destinations_panel">
+			<bottomtray_button label="Destinos" name="destination_btn" tool_tip="Viajar por Second Life"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Mi avatar" name="avatar_btn"/>
+		<layout_panel name="avatar_panel">
+			<bottomtray_button label="Mi avatar" name="avatar_btn" tool_tip="Cambiar tu aspecto"/>
 		</layout_panel>
 		<layout_panel name="people_panel">
-			<bottomtray_button label="Gente" name="show_people_button" tool_tip="Muestra la ventana de gente"/>
+			<bottomtray_button label="Gente" name="show_people_button" tool_tip="Encontrar a gente en Second Life"/>
 		</layout_panel>
 		<layout_panel name="profile_panel">
-			<bottomtray_button label="Perfil" name="show_profile_btn" tool_tip="Muestra la ventana del perfil"/>
+			<bottomtray_button label="Perfil" name="show_profile_btn" tool_tip="Consultar y editar tu perfil"/>
 		</layout_panel>
 		<layout_panel name="howto_panel">
-			<bottomtray_button label="Indicaciones" name="show_help_btn" tool_tip="Abrir los temas sobre indicaciones de Second Life"/>
+			<bottomtray_button label="Indicaciones" name="show_help_btn" tool_tip="Ver la información de ayuda de Second Life"/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
diff --git a/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml
index 7d4db6a630..1be6997813 100644
--- a/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml
@@ -8,7 +8,7 @@
 			<button label="Añadir como amigo" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
+			<button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="Compartir" name="share_btn"/>
diff --git a/indra/newview/skins/minimal/xui/es/panel_people.xml b/indra/newview/skins/minimal/xui/es/panel_people.xml
index 7d3157ef45..1e1c3411ae 100644
--- a/indra/newview/skins/minimal/xui/es/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_people.xml
@@ -53,6 +53,9 @@
 				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
+				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
 				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/fr/menu_inspect_avatar_gear.xml
index 231a175ee5..c3240fa541 100644
--- a/indra/newview/skins/minimal/xui/fr/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/fr/menu_inspect_avatar_gear.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Voir le profil" name="view_profile"/>
 	<menu_item_call label="Devenir amis" name="add_friend"/>
 	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Appeler" name="call"/>
 	<menu_item_call label="Téléporter" name="teleport"/>
 	<menu_item_call label="Ignorer" name="block"/>
 	<menu_item_call label="Ne plus ignorer" name="unblock"/>
diff --git a/indra/newview/skins/minimal/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/fr/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..376a7d2b72
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/fr/panel_adhoc_control_panel.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_im_control_panel">
+	<layout_stack name="vertical_stack">
+		<layout_panel name="call_btn_panel">
+			<button label="Appeler" name="call_btn"/>
+		</layout_panel>
+		<layout_panel name="end_call_btn_panel">
+			<button label="Quitter l&apos;appel" name="end_call_btn"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/fr/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/fr/panel_bottomtray.xml
index ef62901e99..094d3e66de 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_bottomtray.xml
@@ -4,26 +4,32 @@
 	<string name="SpeakBtnToolTip" value="Active/Désactive le micro"/>
 	<string name="VoiceControlBtnToolTip" value="Affiche/Masque le panneau de contrôle de la voix"/>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<button label="Parler" name="speak_btn" tool_tip="Activer/désactiver le micro."/>
+		</layout_panel>
+		<layout_panel name="speak_flyout_panel">
+			<button label="" name="flyout_btn" tool_tip="Modifier les préférences audio."/>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/>
+			<gesture_combo_list label="Geste" name="Gesture" tool_tip="Faire faire des gestes à votre avatar."/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="Affichage" name="camera_btn" tool_tip="Affiche/Masque le contrôle de la caméra"/>
+			<bottomtray_button label="Affichage" name="camera_btn" tool_tip="Contrôler l&apos;angle de la caméra."/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Destinations" name="destination_btn" tool_tip="Afficher la fenêtre des personnes."/>
+		<layout_panel name="destinations_panel">
+			<bottomtray_button label="Destinations" name="destination_btn" tool_tip="Voyager à travers Second Life."/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Mon avatar" name="avatar_btn"/>
+		<layout_panel name="avatar_panel">
+			<bottomtray_button label="Mon avatar" name="avatar_btn" tool_tip="Modifier votre apparence."/>
 		</layout_panel>
 		<layout_panel name="people_panel">
-			<bottomtray_button label="Personnes" name="show_people_button" tool_tip="Afficher la fenêtre des personnes."/>
+			<bottomtray_button label="Personnes" name="show_people_button" tool_tip="Trouver des personnes dans Second Life."/>
 		</layout_panel>
 		<layout_panel name="profile_panel">
-			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Afficher la fenêtre de profil."/>
+			<bottomtray_button label="Profil" name="show_profile_btn" tool_tip="Afficher et modifier votre profil."/>
 		</layout_panel>
 		<layout_panel name="howto_panel">
-			<bottomtray_button label="Aide rapide" name="show_help_btn" tool_tip="Ouvrir les rubriques d&apos;aide rapide Second Life."/>
+			<bottomtray_button label="Aide rapide" name="show_help_btn" tool_tip="Afficher des infos d&apos;aide sur Second Life."/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
diff --git a/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml
index 1f2169e22c..fdc5aeca49 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml
@@ -9,7 +9,7 @@
 			<button label="Devenir amis" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="Téléporter" name="teleport_btn" tool_tip="Proposer de téléporter cette personne"/>
+			<button label="Téléporter" name="teleport_btn" tool_tip="Proposer de téléporter cette personne."/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="Partager" name="share_btn"/>
diff --git a/indra/newview/skins/minimal/xui/fr/panel_people.xml b/indra/newview/skins/minimal/xui/fr/panel_people.xml
index 88409a2a86..72fb4d807f 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_people.xml
@@ -53,6 +53,9 @@ Vous recherchez des résidents avec qui passer du temps ? Essayez avec le bouto
 				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/>
 			</layout_panel>
 			<layout_panel name="chat_btn_lp">
+				<button label="Appeler" name="call_btn" tool_tip="Appeler ce résident."/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
 				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/minimal/xui/it/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/it/panel_bottomtray.xml
index 0eb0d0ee22..ab9b175f16 100644
--- a/indra/newview/skins/minimal/xui/it/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/it/panel_bottomtray.xml
@@ -4,26 +4,32 @@
 	<string name="SpeakBtnToolTip" value="Accende o spegne il microfono"/>
 	<string name="VoiceControlBtnToolTip" value="Mostra o nasconde il pannello di regolazione voce"/>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<button label="Parla" name="speak_btn" tool_tip="Accendi e spegni il microfono"/>
+		</layout_panel>
+		<layout_panel name="speak_flyout_panel">
+			<button label="" name="flyout_btn" tool_tip="Cambia le preferenze per i suoni"/>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra o nasconde le gesture"/>
+			<gesture_combo_list label="Gesture" name="Gesture" tool_tip="Fai fare qualcosa al tuo avatar"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="Visuale" name="camera_btn" tool_tip="Mostra o nasconde le regolazioni della visuale"/>
+			<bottomtray_button label="Visuale" name="camera_btn" tool_tip="Controlla l&apos;angolo di visualizzazione"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Destinazioni" name="destination_btn" tool_tip="Mostra finestra persone"/>
+		<layout_panel name="destinations_panel">
+			<bottomtray_button label="Destinazioni" name="destination_btn" tool_tip="Viaggia in Second Life"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="Il mio avatar" name="avatar_btn"/>
+		<layout_panel name="avatar_panel">
+			<bottomtray_button label="Il mio avatar" name="avatar_btn" tool_tip="Cambia il tuo aspetto"/>
 		</layout_panel>
 		<layout_panel name="people_panel">
-			<bottomtray_button label="Persone" name="show_people_button" tool_tip="Mostra finestra persone"/>
+			<bottomtray_button label="Persone" name="show_people_button" tool_tip="Trova persone in Second Life"/>
 		</layout_panel>
 		<layout_panel name="profile_panel">
-			<bottomtray_button label="Profilo" name="show_profile_btn" tool_tip="Mostra finestra profilo"/>
+			<bottomtray_button label="Profilo" name="show_profile_btn" tool_tip="Visualizza e modifica il tuo profilo"/>
 		</layout_panel>
 		<layout_panel name="howto_panel">
-			<bottomtray_button label="Istruzioni" name="show_help_btn" tool_tip="Apri le Istruzioni Second Life"/>
+			<bottomtray_button label="Istruzioni" name="show_help_btn" tool_tip="Visualizza le informazioni della guida di Second Life"/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
diff --git a/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml
index 76b28eab24..756db84c1c 100644
--- a/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml
@@ -5,7 +5,7 @@
 			<button label="Profilo" name="view_profile_btn"/>
 		</layout_panel>
 		<layout_panel name="add_friend_btn_panel">
-			<button label="Aggiungi amico" name="add_friend_btn"/>
+			<button label="Aggiungi come amico" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
 			<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport a questa persona"/>
diff --git a/indra/newview/skins/minimal/xui/ja/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/ja/panel_bottomtray.xml
index fe81ec47f8..13be2cea0a 100644
--- a/indra/newview/skins/minimal/xui/ja/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/ja/panel_bottomtray.xml
@@ -4,26 +4,32 @@
 	<string name="SpeakBtnToolTip" value="マイクのオン・オフ"/>
 	<string name="VoiceControlBtnToolTip" value="ボイスコントロールパネルの表示・非表示"/>
 	<layout_stack name="toolbar_stack">
+		<layout_panel name="speak_panel">
+			<button label="話す" name="speak_btn" tool_tip="マイクのオン・オフを切り替える"/>
+		</layout_panel>
+		<layout_panel name="speak_flyout_panel">
+			<button label="" name="flyout_btn" tool_tip="サウンド環境設定を変更する"/>
+		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
+			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="アバターの動作を起こす"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="視界" name="camera_btn" tool_tip="カメラコントロールの表示・非表示"/>
+			<bottomtray_button label="視界" name="camera_btn" tool_tip="カメラの角度をコントロール"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="行き先" name="destination_btn" tool_tip="人ウインドウを表示"/>
+		<layout_panel name="destinations_panel">
+			<bottomtray_button label="行き先" name="destination_btn" tool_tip="Second Life 内を旅行する"/>
 		</layout_panel>
-		<layout_panel name="avatar_and_destinations_panel">
-			<bottomtray_button label="マイ アバター" name="avatar_btn"/>
+		<layout_panel name="avatar_panel">
+			<bottomtray_button label="マイ アバター" name="avatar_btn" tool_tip="容姿を変更する"/>
 		</layout_panel>
 		<layout_panel name="people_panel">
-			<bottomtray_button label="人" name="show_people_button" tool_tip="人ウインドウを表示"/>
+			<bottomtray_button label="人" name="show_people_button" tool_tip="Second Life で人を探す"/>
 		</layout_panel>
 		<layout_panel name="profile_panel">
-			<bottomtray_button label="プロフィール" name="show_profile_btn" tool_tip="プロフィールウインドウを表示"/>
+			<bottomtray_button label="プロフィール" name="show_profile_btn" tool_tip="プロフィールを表示・編集"/>
 		</layout_panel>
 		<layout_panel name="howto_panel">
-			<bottomtray_button label="ハウツー" name="show_help_btn" tool_tip="Second Lifeのハウツートピックを開く"/>
+			<bottomtray_button label="ハウツー" name="show_help_btn" tool_tip="Second Life のヘルプ情報を見る"/>
 		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">