diff --git a/.hgtags b/.hgtags
index cfe05e2272ca475ab80db834c6f9a2566415b779..aaca037e2bacb4ad1fc9419bbd7a79b9e57ececf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -130,9 +130,6 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1
0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1
9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start
-8f2da1701c81a62352df2b8d413d27fb2cade9a6 DRTVWR-46_2.6.3-release
-8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release
-43c7ee846b7eed80786acbbf35d03bd016a3e85d DRTVWR-59_2.7.0-beta1
-43c7ee846b7eed80786acbbf35d03bd016a3e85d 2.7.0-beta1
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb DRTVWR-63_2.7.2-beta1
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1
+6a3e7e403bd19e45fdfc2fcc716867af3ab80861 2.7.3-start
diff --git a/BuildParams b/BuildParams
index a064faf870005a9ed4921b279d8ad417c5eefdda..15018bf37e7b4ba14ccbf5a7e85ff5e35c53cc16 100644
--- a/BuildParams
+++ b/BuildParams
@@ -69,8 +69,7 @@ viewer-pre-release.viewer_channel = "Second Life Release"
viewer-pre-release.login_channel = "Second Life Release"
viewer-pre-release.build_debug_release_separately = true
viewer-pre-release.build_viewer_update_version_manager = true
-#viewer-pre-release.release-viewer.jira = DRTVWR-13
-viewer-pre-release.release-viewer.jira = DRTVWR-46
+#viewer-pre-release.release-viewer.jira = DRTVWR-46
# =======================================
diff --git a/doc/contributions.txt b/doc/contributions.txt
index dfbccb5a6c9147218f9650bf8257610f08e7cba6..daaffe2dee29668fff45de00afd806e32446c3be 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -76,6 +76,7 @@ Aleric Inglewood
VWR-13996
VWR-14426
VWR-24247
+ VWR-25654
VWR-24251
VWR-24252
VWR-24254
@@ -209,6 +210,7 @@ Boroondas Gupte
STORM-1182
VWR-233
VWR-20583
+ VWR-25654
VWR-20891
VWR-23455
VWR-24487
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index ca2d3f918156a7f59e2905baa1f29c394c3856a1..e8616a9be6bd8f0455bb0b9229448ef6646e8f25 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -188,22 +188,30 @@ LLOSInfo::LLOSInfo() :
if(osvi.wProductType == VER_NT_WORKSTATION)
mOSStringSimple = "Microsoft Windows XP x64 Edition ";
else
- mOSStringSimple = "Microsoft Windows Server 2003 ";
+ mOSStringSimple = "Microsoft Windows Server 2003 ";
}
- else if(osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 1)
+ else if(osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 2)
{
if(osvi.dwMinorVersion == 0)
{
- mOSStringSimple = "Microsoft Windows Vista ";
+ if(osvi.wProductType == VER_NT_WORKSTATION)
+ mOSStringSimple = "Microsoft Windows Vista ";
+ else
+ mOSStringSimple = "Windows Server 2008 ";
}
else if(osvi.dwMinorVersion == 1)
{
- mOSStringSimple = "Microsoft Windows 7 ";
+ if(osvi.wProductType == VER_NT_WORKSTATION)
+ mOSStringSimple = "Microsoft Windows 7 ";
+ else
+ mOSStringSimple = "Windows Server 2008 R2 ";
}
-
- if(osvi.wProductType != VER_NT_WORKSTATION)
+ else if(osvi.dwMinorVersion == 2)
{
- mOSStringSimple += "Server ";
+ if(osvi.wProductType == VER_NT_WORKSTATION)
+ mOSStringSimple = "Microsoft Windows 8 ";
+ else
+ mOSStringSimple = "Windows Server 2012 ";
}
///get native system info if available..
@@ -308,8 +316,7 @@ LLOSInfo::LLOSInfo() :
std::string compatibility_mode;
if(got_shell32_version)
{
- if(osvi.dwMajorVersion != shell32_major
- || osvi.dwMinorVersion != shell32_minor)
+ if(osvi.dwMajorVersion != shell32_major || osvi.dwMinorVersion != shell32_minor)
{
compatibility_mode = llformat(" compatibility mode. real ver: %d.%d (Build %d)",
shell32_major,
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 67a83c7aa80c32dd9eec977ababa47b4f238195c..fa92a3a75b78d18af3a0d828805ed1594a5179a9 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 = 2;
+const S32 LL_VERSION_PATCH = 3;
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 0fef596df26a4930dd634dd4230a2f6b61c97d6a..0d149b5258deae37fe033a325f6b161f3112319f 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 cea503211107d300538153a87b50515fe1e6088b..9886d49ccce49936734c50d89d8ab9b326f359fd 100644
--- a/indra/llmessage/tests/test_llsdmessage_peer.py
+++ b/indra/llmessage/tests/test_llsdmessage_peer.py
@@ -38,7 +38,7 @@
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 @@ def read_xml(self):
## # 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 @@ def do_POST(self):
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 @@ def answer(self, data):
("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 @@ def log_error(self, format, *args):
# 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 8ff13e04262f6688d809374f0eb020d25a399e9e..f329ec2a0e660363ff2637ed585d34cd9ceb0927 100644
--- a/indra/llmessage/tests/testrunner.py
+++ b/indra/llmessage/tests/testrunner.py
@@ -29,14 +29,21 @@
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/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 90f46316e82385d2febf6efe5f7c3ba658bda6e7..d2582d524d1097ec8ccfbfab16be4fd244a46eff 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3497,7 +3497,7 @@ void LLAppViewer::migrateCacheDirectory()
// Migrate inventory cache to avoid pain to inventory database after mass update
S32 file_count = 0;
std::string file_name;
- std::string mask = delimiter + "*.*";
+ std::string mask = "*.*";
LLDirIterator iter(old_cache_dir, mask);
while (iter.next(file_name))
@@ -3725,8 +3725,7 @@ bool LLAppViewer::initCache()
{
// doesn't exist, look for a data file
std::string mask;
- mask = gDirUtilp->getDirDelimiter();
- mask += VFS_DATA_FILE_BASE;
+ mask = VFS_DATA_FILE_BASE;
mask += "*";
std::string dir;
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 2de7db38ed1cdd653f429312ceab877aa2875b54..2f60b6b90b4aa9c18fb91fbcf299fa7927337393 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -28,6 +28,8 @@
#include "lltranslate.h"
+#include <curl/curl.h>
+
#include "llbufferstream.h"
#include "llui.h"
#include "llversioninfo.h"
@@ -76,7 +78,9 @@ void LLTranslate::translateMessage(LLHTTPClient::ResponderPtr &result, const std
//static
void LLTranslate::getTranslateUrl(std::string &translate_url, const std::string &from_lang, const std::string &to_lang, const std::string &mesg)
{
- std::string escaped_mesg = curl_escape(mesg.c_str(), mesg.size());
+ char * curl_str = curl_escape(mesg.c_str(), mesg.size());
+ std::string const escaped_mesg(curl_str);
+ curl_free(curl_str);
translate_url = m_GoogleURL
+ escaped_mesg + m_GoogleLangSpec
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 e78924a1ab50b5457330a808ff16706016198143..46e1eca126997e88ba0a9ce5782a60ca2a85ec85 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_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index ec6ac5b2a842309134e2f1a221b4328d4bb0ed2d..ec47b2f445b05f15d040bfee30e99d2a1a58b6df 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -52,7 +52,8 @@
Indtast beløbet for at se nyeste valutakurs.
</text>
<text name="purchase_warning_repurchase">
- Bekræftelse af dette køb medfører kun køb af L$, ikke objektet.
+ Bekræftelse af dette køb medfører kun køb af L$, ikke
+objektet.
</text>
<text name="purchase_warning_notenough">
Du køber ikke nok L$. Forøg venligst beløbet.
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 8d9c05500bfc0eb88d723c82249456d61044df77..a6fbc057346844897a029207a3d277ebf20d86a0 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/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index aa02fc14e5e8eb02e046f7312b08b2f383c907bb..b0b4d1ccc6c5f810d4ea3ac950f509cf32fbb8b6 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1455,7 +1455,7 @@
(ukendt)
</string>
<string name="SummaryForTheWeek" value="Opsummering for denne uge, begyndende med "/>
- <string name="NextStipendDay" value="Næste stipendie dag er "/>
+ <string name="NextStipendDay" value=". Næste stipendie dag er "/>
<string name="GroupIndividualShare" value=" Gruppe Individuel Delt"/>
<string name="GroupColumn" value="Gruppe"/>
<string name="Balance">
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 2d8459479a227a31d62e7a15d143e1c001077964..f1e42232c8f0cccf4a76f51b892e73988a2415da 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/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
deleted file mode 100644
index 36515777978d50b9671122bc3c1f4f7e2b360724..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="AUSSEHEN">
- <tab_container name="customize tab container">
- <text label="Körperteile" name="body_parts_placeholder">
- Körperteile
- </text>
- <panel label="Form" name="Shape">
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- <button label="Körper" label_selected="Körper" name="Body"/>
- <button label="Kopf" label_selected="Kopf" name="Head"/>
- <button label="Augen" label_selected="Augen" name="Eyes"/>
- <button label="Ohren" label_selected="Ohren" name="Ears"/>
- <button label="Nase" label_selected="Nase" name="Nose"/>
- <button label="Mund" label_selected="Mund" name="Mouth"/>
- <button label="Kinn" label_selected="Kinn" name="Chin"/>
- <button label="Oberkörper" label_selected="Oberkörper" name="Torso"/>
- <button label="Beine" label_selected="Beine" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item label="Weiblich" name="radio" value="0"/>
- <radio_item label="Männlich" name="radio2" value="1"/>
- </radio_group>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie eine neue Form aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
- </text>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label">
- Form:
- </text>
- <button label="Neue Form/Gestalt" label_selected="Neue Form/Gestalt" name="Create New"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- </panel>
- <panel label="Haut" name="Skin">
- <button label="Hautfarbe" label_selected="Hautfarbe" left="2" name="Skin Color" width="92"/>
- <button label="Gesichtsdetails" label_selected="Gesichtsdetails" left="2" name="Face Detail" width="92"/>
- <button label="Make-Up" label_selected="Make-Up" left="2" name="Makeup" width="92"/>
- <button label="Körperdetails" label_selected="Körperdetails" left="2" name="Body Detail" width="92"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie eine neue Skin (Haut) aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
- </text>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Haut:
- </text>
- <texture_picker label="Kopftattoo" name="Head Tattoos" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <texture_picker label="Obere Tattoos" name="Upper Tattoos" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <texture_picker label="Untere Tattoos" name="Lower Tattoos" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <button label="Neue Haut" label_selected="Neue Haut" name="Create New"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Haar" name="Hair">
- <button label="Farbe" label_selected="Farbe" name="Color"/>
- <button label="Stil" label_selected="Stil" name="Style"/>
- <button label="Augenbrauen" label_selected="Augenbrauen" name="Eyebrows"/>
- <button label="Gesichtshaar" label_selected="Gesichtshaar" name="Facial"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch neues Haar erstellen und anlegen.
- </text>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Haare:
- </text>
- <texture_picker label="Textur" name="Texture" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <button label="Neue Haare" label_selected="Neue Haare" name="Create New"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Augen" name="Eyes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch neue Augen erstellen und diese anlegen.
- </text>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Augen:
- </text>
- <texture_picker label="Iris" name="Iris" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <button label="Neue Augen" label_selected="Neue Augen" name="Create New"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <text label="Kleidung" name="clothes_placeholder">
- Kleidung
- </text>
- <panel label="Hemd" name="Shirt">
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button label="Neues Hemd" label_selected="Neues Hemd" name="Create New"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Hemd erstellen und dieses anlegen.
- </text>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Hemd:
- </text>
- </panel>
- <panel label="Hose" name="Pants">
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button label="Neue Hose" label_selected="Neue Hose" name="Create New"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
- </text>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Hose:
- </text>
- </panel>
- <panel label="Schuhe" name="Shoes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue Schuhe erstellen und diese anlegen.
- </text>
- <button label="Neue Schuhe" label_selected="Neue Schuhe" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Schuhe:
- </text>
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Socken" name="Socks">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie neue Socken aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen.
- </text>
- <button label="Neue Socken" label_selected="Neue Socken" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Socken:
- </text>
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Jacke" name="Jacket">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
- </text>
- <button label="Neue Jacke" label_selected="Neue Jacke" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Jacke:
- </text>
- <texture_picker label="Stoff: oben" name="Upper Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <texture_picker label="Stoff: unten" name="Lower Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Handschuhe" name="Gloves">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen.
- </text>
- <button label="Neue Handschuhe" label_selected="Neue Handschuhe" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Handschuhe:
- </text>
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Unterhemd" name="Undershirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Unterhemd erstellen und dieses anziehen.
- </text>
- <button label="Neues Unterhemd" label_selected="Neues Unterhemd" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Unterhemd:
- </text>
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Unterhose" name="Underpants">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
- </text>
- <button label="Neue Unterhose" label_selected="Neue Unterhose" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Unterhose:
- </text>
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Rock" name="Skirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [DESC]: wird geladen...
- </text>
- <text name="title_not_worn">
- [DESC]: nicht getragen
- </text>
- <text name="path">
- In [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch einen neuen Rock erstellen und diesen anziehen.
- </text>
- <button label="Neuer Rock" label_selected="Neuer Rock" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label" right="100">
- Rock:
- </text>
- <texture_picker label="Stoff" name="Fabric" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
- <color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
- <button font="SansSerifSmall" label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button font="SansSerifSmall" label="Speichern" label_selected="Speichern" left="107" name="Save"/>
- <button font="SansSerifSmall" label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button font="SansSerifSmall" label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Tätowierung" name="Tattoo">
- <text name="title">
- Tätowierung
- </text>
- <text name="title_no_modify">
- [BESCHR]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [BESCHR]: wird geladen...
- </text>
- <text name="title_not_worn">
- [BESCHR]: nicht getragen
- </text>
- <text name="path">
- Befindet sich in [PATH]
- </text>
- <text name="not worn instructions">
- Ziehen Sie eine neue Tätowierung aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
- </text>
- <button label="Neue Tätowierung erstellen" label_selected="Neue Tätowierung erstellen" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label">
- Tätowierung:
- </text>
- <texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <button label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button label="Speichern" label_selected="Speichern" name="Save"/>
- <button label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- <panel label="Alpha" name="Alpha">
- <text name="title">
- Alpha
- </text>
- <text name="title_no_modify">
- [BESCHR]: bearbeiten nicht möglich
- </text>
- <text name="title_loading">
- [BESCHR]: wird geladen...
- </text>
- <text name="title_not_worn">
- [BESCHR]: nicht getragen
- </text>
- <text name="path">
- Befindet sich in [PATH]
- </text>
- <text name="not worn instructions">
- Sie können eine neue Alpha-Maske anlegen, indem Sie eine von Ihrem Inventar auf Ihren Avatar ziehen. Sie können aber auch eine neue erstellen und diese anlegen.
- </text>
- <button label="Neue Alpha erstellen" label_selected="Neue Alpha erstellen" name="Create New"/>
- <text name="no modify instructions">
- Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
- </text>
- <text name="Item Action Label">
- Alpha:
- </text>
- <texture_picker label="Alpha: Unten" name="Lower Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Alpha: Oben" name="Upper Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Kopf: Alpha" name="Head Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Alpha: Augen" name="Eye Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <texture_picker label="Alpha: Haare" name="Hair Alpha" tool_tip="Zum Auswählen eines Bildes hier klicken"/>
- <button label="Ausziehen" label_selected="Ausziehen" name="Take Off"/>
- <button label="Speichern" label_selected="Speichern" name="Save"/>
- <button label="Speichern unter..." label_selected="Speichern unter..." name="Save As"/>
- <button label="Zurücksetzen" label_selected="Zurücksetzen" name="Revert"/>
- </panel>
- </tab_container>
- <button label="Skriptinfo" label_selected="Skriptinfo" name="script_info" tool_tip="Skripts, die an Ihren Avatar angehängt sind, anzeigen"/>
- <button label="Outfit erstellen" label_selected="Outfit erstellen" name="make_outfit_btn"/>
- <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
- <button label="OK" label_selected="OK" name="Ok"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
deleted file mode 100644
index f9b3552e8b04e23268dae65b6f622c3e6ec9f1b5..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Speichern" label_selected="Speichern" name="Save"/>
- <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
- <text name="Save item as:">
- Objekt in meinem Inventar speichern als:
- </text>
- <line_editor name="name ed">
- Neu [DESC]
- </line_editor>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_friends.xml b/indra/newview/skins/default/xui/de/panel_friends.xml
deleted file mode 100644
index 50013a2b240c0adb6de9e3a47748b678236004a3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/de/panel_friends.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="friends">
- <string name="Multiple">
- Mehrere Freunde
- </string>
- <scroll_list name="friend_list" tool_tip="Halten Sie die Tasten „Umschalt“ oder „Strg“ gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
- <column name="icon_online_status" tool_tip="Online-Status"/>
- <column label="Name" name="friend_name" tool_tip="Name"/>
- <column name="icon_visible_online" tool_tip="Freund kann sehen, wenn Sie online sind"/>
- <column name="icon_visible_map" tool_tip="Freund kann Sie auf der Karte finden"/>
- <column name="icon_edit_mine" tool_tip="Freunde können Objekte bearbeiten, löschen und an sich nehmen"/>
- <column name="icon_edit_theirs" tool_tip="Sie können die Objekte dieses Freunds bearbeiten"/>
- </scroll_list>
- <panel name="rights_container">
- <text name="friend_name_label">
- Wählen Sie den/die Freund(e) aus, dessen/deren Rechte Sie ändern möchten...
- </text>
- <check_box label="Kann meinen Online-Status sehen" name="online_status_cb" tool_tip="Festlegen, ob dieser Freund meinen Online-Status auf seiner Freundesliste oder Visitenkarte einsehen kann"/>
- <check_box label="Kann mich auf der Weltkarte sehen" name="map_status_cb" tool_tip="Festlegen, ob dieser Freund auf seiner Karte meinen Standort sehen kann"/>
- <check_box label="Kann meine Objekte verändern" name="modify_status_cb" tool_tip="Festlegen, ob dieser Freund meine Objekte verändern kann"/>
- <text name="process_rights_label">
- Rechte werden geändert...
- </text>
- </panel>
- <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung"/>
- <button label="Profil" name="profile_btn" tool_tip="Bilder, Gruppen und andere Informationen anzeigen"/>
- <button label="Teleportieren" name="offer_teleport_btn" tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an"/>
- <button label="Bezahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben"/>
- <button label="Entfernen" name="remove_btn" tool_tip="Diese Person von Ihrer Freundesliste entfernen"/>
- <button label="Hinzufügen" name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 9f6eac198b0b38f8f5deddcba4eafb6e35e71bb5..49ca6cc8baebd253a00c474212b8d9872475641e 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -247,10 +247,10 @@ Re-enter amount to see the latest exchange rate.
follows="top|left"
layout="topleft"
halign="right"
- top="213"
+ top="208"
left="10"
width="310"
- height="30"
+ height="35"
name="purchase_warning_repurchase">
Confirming this purchase only buys L$, not the object.
</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 38b305db7eec3c15c6921cd6fcc85952e5eea710..52de9ddd4730be22c7cd71b034f252c721829ed9 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/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 249ad95c41d1fc97630427f85315aae98999cdfc..7923dd87fac0d041819d1c10bde6594d6745c143 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -22,13 +22,13 @@
left="10"
name="KeyFramePresetsText"
top="34"
- width="85">
+ width="135">
Sky Presets:
</text>
<combo_box
height="23"
layout="topleft"
- left_delta="85"
+ left_delta="135"
name="WLPresetsCombo"
top_delta="-4"
width="150" />
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index bb845e1ee04cfd97389c6d707695de9c05417d70..125eb79d0495082cbc37bd594c4355a1a6fc74e9 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 c3f431010382166f45377e6ed87baddaccd8930f..1c4b965f4694c805a02c2fdc10f6774a7ae197c5 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 > 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 > 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 98604ad5f4de95a7f07b48a5218d0aea5fd07d6a..3563d4bd0f59b7fe0a5ce5be86452d865fc924f0 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:
+ <nolink>[NOMBRE]</nolink> contiene:
</text>
<text name="buy_text">
¿Comprar por [AMOUNT] L$ a [NAME]?
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index a8fa03084692cd3623cb5b6f0e056cd5ac7d9288..2f92cb55ebc8be255450db8db1a44b4a733dc76a 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -51,8 +51,9 @@
<text name="exchange_rate_note">
Vuelve a escribir la cantidad para ver el tipo de cambio más reciente.
</text>
- <text name="purchase_warning_repurchase" right="-10">
- Confirmando que con esta compra sólo se compran L$, no el objeto.
+ <text name="purchase_warning_repurchase">
+ Confirmando que con esta compra sólo se compran L$,
+no el objeto.
</text>
<text name="purchase_warning_notenough">
No estás comprando suficientes L$. Por favor, aumenta la cantidad.
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
index 87177e285c96db6054971f4204e6074c24e5b887..04f743b6590b04c6c0d2ab19d2f719ca1aa96265 100644
--- a/indra/newview/skins/default/xui/es/floater_camera.xml
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
@@ -42,7 +42,7 @@
<panel name="camera_modes_list">
<panel_camera_item name="object_view">
<panel_camera_item.text name="object_view_text">
- Vista de objeto
+ Vista objetiva
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item name="mouselook_view">
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
deleted file mode 100644
index 77b670d5f0c98b719eed42ad1799b513a47f94d1..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="APARIENCIA">
- <tab_container name="customize tab container">
- <text label="Partes del cuerpo" name="body_parts_placeholder">
- Partes del cuerpo
- </text>
- <panel label="Forma" name="Shape">
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- <button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
- <button label="Cabeza" label_selected="Cabeza" name="Head"/>
- <button label="Ojos" label_selected="Ojos" name="Eyes"/>
- <button label="Orejas" label_selected="Orejas" name="Ears"/>
- <button label="Nariz" label_selected="Nariz" name="Nose"/>
- <button label="Boca" label_selected="Boca" name="Mouth"/>
- <button label="Barbilla" label_selected="Barbilla" name="Chin"/>
- <button label="Torso" label_selected="Torso" name="Torso"/>
- <button label="Piernas" label_selected="Piernas" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item label="Mujer" name="radio" value="0"/>
- <radio_item label="Varón" name="radio2" value="1"/>
- </radio_group>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una anatomÃa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label">
- Forma:
- </text>
- <button label="Crear una forma nueva" label_selected="Crear una forma nueva" name="Create New"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- </panel>
- <panel label="Piel" name="Skin">
- <button label="Color de piel" label_selected="Color de piel" name="Skin Color" width="115"/>
- <button label="Detalles faciales" label_selected="Detalles faciales" name="Face Detail" width="115"/>
- <button label="Maquillaje" label_selected="Maquillaje" name="Makeup" width="115"/>
- <button label="Detalles del cuerpo" label_selected="Detalles del cuerpo" name="Body Detail" width="115"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Piel:
- </text>
- <texture_picker label="Tatuaje: cabeza" name="Head Tattoos" tool_tip="Pulse para elegir una imagen" width="90"/>
- <texture_picker label="Tatuaje: superior" name="Upper Tattoos" tool_tip="Pulse para elegir una imagen" width="90"/>
- <texture_picker label="Tatuaje: inferior" name="Lower Tattoos" tool_tip="Pulse para elegir una imagen" width="90"/>
- <button label="Crear una piel nueva" label_selected="Crear una piel nueva" name="Create New"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Pelo" name="Hair">
- <button label="Color" label_selected="Color" name="Color"/>
- <button label="Peinado" label_selected="Peinado" name="Style"/>
- <button label="Cejas" label_selected="Cejas" name="Eyebrows"/>
- <button label="Facial" label_selected="Facial" name="Facial"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situado en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien puedes crear uno nuevo partiendo de cero.
- </text>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Pelo:
- </text>
- <texture_picker label="Textura" name="Texture" tool_tip="Pulse para elegir una imagen"/>
- <button label="Crear un pelo nuevo" label_selected="Crear un pelo nuevo" name="Create New"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Ojos" name="Eyes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificables
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situados en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
- </text>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Ojos:
- </text>
- <texture_picker label="Iris" name="Iris" tool_tip="Pulse para elegir una imagen"/>
- <button label="Crear unos ojos nuevos" label_selected="Crear unos ojos nuevos" name="Create New"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <text label="Ropa" name="clothes_placeholder">
- Ropas
- </text>
- <panel label="Camisa" name="Shirt">
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Camisa:
- </text>
- </panel>
- <panel label="Pantalones" name="Pants">
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Crear unos pantalones nuevos" label_selected="Crear unos pantalones nuevos" name="Create New" width="185"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificables
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situados en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
- </text>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Pantalones:
- </text>
- </panel>
- <panel label="Zapatos" name="Shoes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificables
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situados en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
- </text>
- <button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Zapatos:
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Calcetines" name="Socks">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificables
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situados en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
- </text>
- <button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New" width="185"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Calcetines:
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Chaqueta" name="Jacket">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Chaqueta:
- </text>
- <texture_picker label="Tela superior" name="Upper Fabric" tool_tip="Pulse para elegir una imagen"/>
- <texture_picker label="Tela inferior" name="Lower Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Guantes" name="Gloves">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificables
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situados en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
- </text>
- <button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Guantes:
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Camiseta" name="Undershirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Camiseta:
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Ropa interior" name="Underpants">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New" width="185"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Ropa interior:
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Falda" name="Skirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no lleva
- </text>
- <text name="path">
- Situada en [PATH]
- </text>
- <text name="not worn instructions">
- Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
- <text name="no modify instructions">
- No tiene permiso para modificar este Ãtem.
- </text>
- <text name="Item Action Label" right="107">
- Falda:
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" left="113" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Tatuaje" name="Tattoo">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no puesto
- </text>
- <text name="path">
- Situado en [PATH]
- </text>
- <text name="not worn instructions">
- Pon un tatuaje nuevo arrastrándolo desde tu inventario a tu avatar. O bien puedes crear uno nuevo partiendo de cero.
- </text>
- <button label="Crear un tatuaje nuevo" label_selected="Crear un tatuaje nuevo" name="Create New"/>
- <text name="no modify instructions">
- No tienes permiso para modificar este artÃculo.
- </text>
- <text name="Item Action Label">
- Tatuaje:
- </text>
- <texture_picker label="Tatuaje de la cabeza" name="Head Tattoo" tool_tip="Pulsa para elegir una imagen"/>
- <texture_picker label="Tatuaje superior" name="Upper Tattoo" tool_tip="Pulsa para elegir una imagen"/>
- <texture_picker label="Tatuaje inferior" name="Lower Tattoo" tool_tip="Pulsa para elegir una imagen"/>
- <button label="Quitarme" label_selected="Quitarme" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Revertir" label_selected="Revertir" name="Revert"/>
- </panel>
- <panel label="Alfa" name="Alpha">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: no modificable
- </text>
- <text name="title_loading">
- [DESC]: cargando...
- </text>
- <text name="title_not_worn">
- [DESC]: no puesto
- </text>
- <text name="path">
- Situado en [PATH]
- </text>
- <text name="not worn instructions">
- Pon una capa Alfa nueva arrastrándola desde tu inventario a tu avatar. O bien puedes crear una nueva partiendo de cero.
- </text>
- <button label="Crear una capa Alfa nueva" label_selected="Crear una capa Alfa nueva" name="Create New"/>
- <text name="no modify instructions">
- No tienes permiso para modificar este artÃculo.
- </text>
- <text name="Item Action Label">
- Alfa:
- </text>
- <texture_picker label="Alfa inferior" name="Lower Alpha" tool_tip="Pulsa para elegir una imagen"/>
- <texture_picker label="Alfa superior" name="Upper Alpha" tool_tip="Pulsa para elegir una imagen"/>
- <texture_picker label="Alfa de la cabeza" name="Head Alpha" tool_tip="Pulsa para elegir una imagen"/>
- <texture_picker label="Alfa de los ojos" name="Eye Alpha" tool_tip="Pulsa para elegir una imagen"/>
- <texture_picker label="Alfa del pelo" name="Hair Alpha" tool_tip="Pulsa para elegir una imagen"/>
- <button label="Quitarme" label_selected="Quitarme" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como..." label_selected="Guardar como..." name="Save As"/>
- <button label="Revertir" label_selected="Revertir" name="Revert"/>
- </panel>
- </tab_container>
- <scroll_container name="panel_container"/>
- <button label="Información del script" label_selected="Información del script" name="script_info" tool_tip="Mostrar los scripts anexados a tu avatar"/>
- <button label="Hacer un vestuario" label_selected="Hacer un vestuario" name="make_outfit_btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="OK" label_selected="OK" name="Ok"/>
-</floater>
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 0000000000000000000000000000000000000000..7e9a00797a897670ef77f0a7f46eb5053c1d277c
--- /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 c9d639d8cf630fa33124b26049afa94097aefbd7..600403450401966a1cc71969c526fda765056fa2 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 0000000000000000000000000000000000000000..6208db75f93fe0205edb8be99079262edff78eff
--- /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 0000000000000000000000000000000000000000..019c2d382909c33c12dea09eaf58a772fe4d7b79
--- /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="<< Atrás" name="back"/>
+ <button label="Siguiente >>" 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_preview_classified.xml b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
deleted file mode 100644
index d9c9c51ba8d647a98b6a4df46384ec054865b63e..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_preview_classified.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="classified_preview" title="INFORMACIÓN DEL CLASIFICADO">
- <floater.string name="Title">
- Clasificado: [NAME]
- </floater.string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_event.xml b/indra/newview/skins/default/xui/es/floater_preview_event.xml
deleted file mode 100644
index 7edd4f9e3fdc08abe68d03c91a4515eebf8803e8..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/floater_preview_event.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="event_preview" title="INFORMACIÓN DEL EVENTO">
- <floater.string name="Title">
- Evento: [NAME]
- </floater.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 0000000000000000000000000000000000000000..8d6cdc86c0bb0ec5c33bd51e54fd27e47ca54fe1
--- /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 0000000000000000000000000000000000000000..a5ffbd517a1b22996a615d70b98d96b2946ba952
--- /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 13be47f700bb0f6377726e34dab307f60f88c4e9..9d29bc40bfa0adb047430487c506fc0bcb8dab21 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 615a1a09b7e61728a128749460a8c83b945d03c7..f17cfe4ceb8b2801e90f80c04572cadbc2d8234f 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 0000000000000000000000000000000000000000..0d4f1314c968a6f2c1453bc73f74bc8f0241f19c
--- /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 1c45d368138e1ebe12e2bc3b70c26696771f62bf..0824e386d5f125a5f85450d1dabdef75a754c446 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 ce9273ab5000c6ac58a890d3d19ea9c4e85a16bb..9674f73241108e75da2c198faf4881adb4ca8d6c 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 '[NAME]' 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 ('multitexture support'). Si la tienes, comprueba que tienes los últimos 'drivers' para tu tarjeta gráfica, asà como los últimos parches y 'service packs' para tu sistema operativo.
diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml
deleted file mode 100644
index e1cac7c2c364f8cfbe8ccb8962cf2e0239122b7b..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/es/panel_friends.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="friends">
- <string name="Multiple">
- Varios amigos
- </string>
- <scroll_list name="friend_list" tool_tip="Para seleccionar a varios amigos, mantenga pulsado Ctrl o Mays. mientras les va pulsando.">
- <column name="icon_online_status" tool_tip="Estado de conexión"/>
- <column label="Nombre" name="friend_name" tool_tip="Nombre"/>
- <column name="icon_visible_online" tool_tip="El amigo puede ver cuándo está conectado"/>
- <column name="icon_visible_map" tool_tip="El amigo puede localizarle en el mapa"/>
- <column name="icon_edit_mine" tool_tip="El amigo puede editar, borrar o tomar sus objetos"/>
- <column name="icon_edit_theirs" tool_tip="Puede editar los objetos de este amigo"/>
- </scroll_list>
- <button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de mensajes instantáneos"/>
- <button label="Perfil" name="profile_btn" tool_tip="Mostrar la imagen, los grupos, y otra información"/>
- <button label="Teleporte" name="offer_teleport_btn" tool_tip="Ofrecer a este amigo teleportarle hasta su posición"/>
- <button label="Pagar" name="pay_btn" tool_tip="Dar dólares Linden (L$) a este amigo"/>
- <button label="Quitar" name="remove_btn" tool_tip="Quitar a esta persona de su lista de amigos"/>
- <button label="Añadir" name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
index 46326d1e8bd8c76408cf62b9c0222a7a95591a75..afc11a42506e311f7d8b98cf5b8fd2160bf0dab5 100644
--- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
@@ -20,7 +20,8 @@
<check_box initial_value="false" label="Zoom automático" name="auto_zoom"/>
<check_box initial_value="false" label="Ejecutar automáticamente los media" name="auto_play"/>
<text name="media_setting_note">
- Nota: los residentes pueden elegir una configuración distinta de ésta
+ Nota: los residentes pueden elegir una configuración distinta
+de ésta
</text>
<check_box initial_value="false" label="Ajustar automáticamente los media en la cara del objeto" name="auto_scale"/>
<text name="size_label">
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 7c2c9f505e619ef9eb9a086a47937e58eef8ba97..96e63e6fa027c0827485e295b726d67f4b27a4a0 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 f7bc1f6aadc0675afd8f19d2155d388e6628a339..d8fd43469d42c93ed10047440ea210fcf9ce2fb2 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 a7fb2d9af858d00003d2d6561ab9eb22280fd1a5..e6e4c132038c654f95d5be28a9cd283ae923db15 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 ac405870332d989eebbf635b66dbdff0414ea4b5..281b871fed155c43c6a3ac3ce227e52ea81a1217 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 fe7f51c74e822b24675c508be55788140cbfe866..453d1fe43c8fe44a047b4a54098629259848e674 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 0000000000000000000000000000000000000000..acf5c68cdadc46215bda49a7b8a571560abeeeb0
--- /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 27ca0e3bbb25338cb4f615b3affd14dec0ac14ec..3731b6b57c54dd235c56665a67b268c99f0c20da 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>
@@ -1466,8 +1605,8 @@
<string name="Unknown">
(Desconocido)
</string>
- <string name="SummaryForTheWeek" value="Resumen de esta semana, empezando el"/>
- <string name="NextStipendDay" value="El próximo dÃa de pago es el"/>
+ <string name="SummaryForTheWeek" value="Resumen de esta semana, empezando el "/>
+ <string name="NextStipendDay" value=". El próximo dÃa de pago es el "/>
<string name="GroupIndividualShare" value="Grupo Aportaciones individuales"/>
<string name="GroupColumn" value="Grupo"/>
<string name="Balance">
@@ -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 f963a40cd31f48ef768d8ec964eb48aff55a0705..e3e3169161fee717b64a1016a4cabb6a14286e3e 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'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 7aa142b13e7ade4a0576c3a6aff56d1765682f0b..0436dc8a91e0fdba86713074a90bb01a45cc0434 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 :
+ <nolink>[NAME]</nolink> contient :
</text>
<text name="buy_text">
Acheter [AMOUNT] L$ Ã [NAME] ?
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
deleted file mode 100644
index ff407b25c1657e0e62bb952892540104b05c04d6..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="APPARENCE">
- <tab_container name="customize tab container" tab_min_width="150">
- <text label="Parties du corps" name="body_parts_placeholder">
- Parties du corps
- </text>
- <panel label="Silhouette" left="154" name="Shape" width="389">
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- <button label="Corps" label_selected="Corps" name="Body"/>
- <button label="Tête" label_selected="Tête" name="Head"/>
- <button label="Yeux" label_selected="Yeux" name="Eyes"/>
- <button label="Oreilles" label_selected="Oreilles" name="Ears"/>
- <button label="Nez" label_selected="Nez" name="Nose"/>
- <button label="Bouche" label_selected="Bouche" name="Mouth"/>
- <button label="Menton" label_selected="Menton" name="Chin"/>
- <button label="Torse" label_selected="Torse" name="Torso"/>
- <button label="Jambes" label_selected="Jambes" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item label="Femme" name="radio" value="0"/>
- <radio_item label="Homme" name="radio2" value="1"/>
- </radio_group>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portée
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de silhouette, faites-en glisser une de votre inventaire à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Silhouette :
- </text>
- <button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- </panel>
- <panel label="Peau" name="Skin">
- <button label="Couleur" label_selected="Couleur" name="Skin Color" width="84"/>
- <button label="Détails visage" label_selected="Détails visage" name="Face Detail" width="84"/>
- <button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84"/>
- <button label="Détails corps" label_selected="Détails corps" name="Body Detail" width="84"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portée
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de peau, faites-en glisser une à partir de votre inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Peau :
- </text>
- <texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
- <texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
- <texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
- <button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Cheveux" name="Hair">
- <button label="Couleur" label_selected="Couleur" name="Color"/>
- <button label="Style" label_selected="Style" name="Style"/>
- <button label="Sourcils" label_selected="Sourcils" name="Eyebrows"/>
- <button label="Pilosité" label_selected="Pilosité" name="Facial"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portés
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de cheveux, faites-en glisser à partir de votre inventaire. Vous pouvez aussi en créer de nouveaux et les porter.
- </text>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Cheveux :
- </text>
- <texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
- <button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Yeux" name="Eyes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portés
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer d'yeux, faites-en glisser une paire de votre inventaire à votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
- </text>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Yeux :
- </text>
- <texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
- <button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <text label="Habits" name="clothes_placeholder">
- Habits
- </text>
- <panel label="Chemise" name="Shirt">
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portée
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de chemise, faites-en glisser une à partir de votre inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Chemise :
- </text>
- </panel>
- <panel label="Pantalon" name="Pants">
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non porté
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de pantalon, faites-en glisser un à partir de votre inventaire. Vous pouvez aussi en créer un nouveau et le porter.
- </text>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Pantalon :
- </text>
- </panel>
- <panel label="Chaussures" name="Shoes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portées
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de chaussures, faites-en glisser une paire de votre inventaire à votre avatar. Vous pouvez aussi en créer des nouvelles et les porter.
- </text>
- <button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Chaussures :
- </text>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Chaussettes" name="Socks">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portées
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de chaussettes, faites-en glisser une paire à partir de votre inventaire. Vous pouvez aussi en créer des nouvelles et les porter.
- </text>
- <button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Chaussettes :
- </text>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Veste" name="Jacket">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portée
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de veste, faites-en glisser une à partir de votre inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Veste :
- </text>
- <texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
- <texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="81"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Gants" name="Gloves">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portés
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de gants, faites-en glisser une paire à partir de votre inventaire. Vous pouvez aussi en créer de nouveaux et les porter.
- </text>
- <button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Gants :
- </text>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Débardeur" name="Undershirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non porté
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de débardeur, faites-en glisser un à partir de votre inventaire. Vous pouvez aussi en créer un nouveau et le porter.
- </text>
- <button label="Créer un débardeur" label_selected="Créer un débardeur" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label">
- Débardeur :
- </text>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Caleçon" name="Underpants">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non porté
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de caleçon, faites-en glisser un à partir de votre inventaire. Vous pouvez aussi en créer un nouveau et le porter.
- </text>
- <button label="Créer un caleçon" label_selected="Créer un caleçon" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label">
- Caleçon :
- </text>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Jupe" name="Skirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non portée
- </text>
- <text name="path">
- Emplacement : [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de jupe, faites-en glisser une à partir de votre inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <text name="Item Action Label" right="92">
- Jupe :
- </text>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Tatouage" name="Tattoo">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non porté
- </text>
- <text name="path">
- Dans [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de tatouage, faites-en glisser un de votre inventaire à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
- </text>
- <button label="Créer un nouveau tatouage" label_selected="Créer un nouveau tatouage" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas le droit de modifier cet objet.
- </text>
- <text name="Item Action Label">
- Tatouage :
- </text>
- <texture_picker label="Tatouage tête" name="Head Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
- <texture_picker label="Tatouage haut" name="Upper Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
- <texture_picker label="Tatouage bas" name="Lower Tattoo" tool_tip="Cliquez pour sélectionner une image"/>
- <button label="Enlever" label_selected="Enlever" name="Take Off"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- <panel label="Alpha" name="Alpha">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: impossible de modifier
- </text>
- <text name="title_loading">
- [DESC]: en cours de chargement...
- </text>
- <text name="title_not_worn">
- [DESC]: non porté
- </text>
- <text name="path">
- Dans [PATH]
- </text>
- <text name="not worn instructions">
- Pour changer de masque alpha, faites-en glisser un de votre inventaire à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
- </text>
- <button label="Créer un nouvel alpha" label_selected="Créer un nouvel alpha" name="Create New"/>
- <text name="no modify instructions">
- Vous n'avez pas le droit de modifier cet objet.
- </text>
- <text name="Item Action Label">
- Alpha :
- </text>
- <texture_picker label="Alpha bas" name="Lower Alpha" tool_tip="Cliquez pour sélectionner une image"/>
- <texture_picker label="Alpha haut" name="Upper Alpha" tool_tip="Cliquez pour sélectionner une image"/>
- <texture_picker label="Alpha tête" name="Head Alpha" tool_tip="Cliquez pour sélectionner une image"/>
- <texture_picker label="Alpha yeux" name="Eye Alpha" tool_tip="Cliquez pour sélectionner une image"/>
- <texture_picker label="Alpha cheveux" name="Hair Alpha" tool_tip="Cliquez pour sélectionner une image"/>
- <button label="Enlever" label_selected="Enlever" name="Take Off"/>
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Enregistrer sous..." label_selected="Enregistrer sous..." name="Save As"/>
- <button label="Rétablir" label_selected="Rétablir" name="Revert"/>
- </panel>
- </tab_container>
- <scroll_container left="251" name="panel_container"/>
- <button label="Infos scripts" label_selected="Infos scripts" name="script_info" tool_tip="Afficher les scripts attachés à votre avatar"/>
- <button label="Créer tenue" label_selected="Créer une tenue..." name="make_outfit_btn"/>
- <button label="Annuler" label_selected="Annuler" name="Cancel"/>
- <button label="OK" label_selected="OK" name="Ok"/>
-</floater>
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 0000000000000000000000000000000000000000..03804c4bd5fe1717bd23f418f0134e3252d6bd2b
--- /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'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 1ee85a77ce686d50782c5b24adaae0d2f982753c..7567817f3a8084a8a3d64a08f8a15cf5f1aabe1d 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 0000000000000000000000000000000000000000..213847bbd0b0153fb7bf965a474972d4938fd662
--- /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'application de texture est associé aux niveaux de détail.
+ </string>
+ <string name="mesh_status_mesh_mismatch">
+ Un nombre différent d'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'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'erreur
+ </combo_item>
+ </combo_box>
+ <text name="build_operator_text">
+ Opér. construction :
+ </text>
+ <text name="queue_mode_text">
+ Mode fil d'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'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 0000000000000000000000000000000000000000..bb64361959928686fe178feb4b2756258e345a6b
--- /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'améliorer les performances. Vous pouvez ajuster les résultats du processus d'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'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'interaction de l'objet avec les autres objets et avatars. Réglez le curseur sur le niveau de détail le plus approprié à l'utilisation de l'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'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'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="<< Préc." name="back"/>
+ <button label="Suiv. >>" 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'application de texture est associé aux niveaux de détail.
+ </string>
+ <string name="mesh_status_mesh_mismatch">
+ Un nombre différent d'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 0000000000000000000000000000000000000000..a6e598dd2b97cbfc31505c513f81198a5018bbfb
--- /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'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 b835cc6d87c4f443c5bf3baa3b6e773619615183..c5fb0ea0d46a6a1a756ff83949f253c840745137 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 0000000000000000000000000000000000000000..9e2e4333aa090180bb4ebacd72a82d5a6903f0bb
--- /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 fd72e6ac1531c137063257fb68f0df3f1cec53ef..09d77a8d34ca757309e5d12d4690334d36b39861 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/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
deleted file mode 100644
index 5dda347fcfbddcab62c247300ed09ed401d2931f..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container">
- <button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
- <button label="Annuler" label_selected="Annuler" name="Cancel"/>
- <text name="Save item as:">
- Enregistrer l'objet dans mon inventaire comme :
- </text>
- <line_editor name="name ed">
- Nouveau [DESC]
- </line_editor>
-</floater>
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 5d2b554dc352f89394bf96a5034e15ebba246224..1076af44d996908324c8771a53649cc444144fc3 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 0000000000000000000000000000000000000000..af6bfcd028fece6d98e46516ac59a0d4a6b87a1f
--- /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 1dd6da9d6fe4c3df8e4b3ca529ce7aa68c4bf502..d614cfe00c2f69113b31d73f55a6aaf3522b8071 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'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'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 78890caabb1baacd2a9693261c160373a8a4e1ac..6bfab25087a177f65f7051083b3d8e78cbb9b2ae 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'impacter votre mot de passe.
<notification name="RezItemNoPermissions">
Droits insuffisants pour rezzer l'objet.
</notification>
+ <notification name="IMAcrossParentEstates">
+ Impossible d'envoyer d'IM entre domaines parents.
+ </notification>
+ <notification name="TransferInventoryAcrossParentEstates">
+ Impossible de transférer l'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'é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'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'un délai de récupération à 0 L$ de [RECLAIM_PERIOD] heures avant qu'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'achat auprès de tous.
+ </notification>
<notification name="AvatarRezNotification">
([EXISTENCE] secondes d'existence)
Nuage de l'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'application afin de changer de mode ? Le sélecteur de mode se trouve sur l'écran de connexion.
<usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
</notification>
+ <notification label="" name="NoPlaceInfo">
+ L'affichage du profil du lieu est uniquement disponible en mode Avancé. Voulez-vous quitter l'application afin de changer de mode ? Le sélecteur de mode se trouve sur l'é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'application afin de changer de mode ? Le sélecteur de mode se trouve sur l'é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'autres résidents, vous devez utiliser le mode Avancé. Voulez-vous quitter l'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'affichage de l'inventaire est uniquement disponible en mode Avancé. Voulez-vous quitter l'application afin de changer de mode ?
+ <usetemplate name="okcancelbuttons" notext="Ne pas quitter" yestext="Quitter"/>
+ </notification>
+ <notification label="" name="NoAppearance">
+ L'Éditeur d'apparence est uniquement disponible en mode Avancé. Voulez-vous quitter l'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'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'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 abdffd232a3531ee8fb8617a0724b03ee55a464c..e50fd2b6f3efa5834f96e7e9e13c17562a9a1d21 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 025a72a1d21454f6459620edc45c74d28f1d407d..5bf2ef72f557eb74148355dd9bd0d43bd2aea069 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'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 ada45836486765a3ec7ca72b0c01c0dcd55e374b..b5795bebe2917c4d3f50f026cdf8511ece15f7d2 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'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 0000000000000000000000000000000000000000..a9802312dc4242dc86a2f8e34d5f2704edb7b2b2
--- /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 a3369e6730fbde0c4bff6f02e8bf686a8337a2e9..3ec85551da755cbecb32024873d2dd866c247e4f 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'accéder à Second Life. Téléchargez un nouveau client à la page suivante :
+http://secondlife.com/download
+
+Pour plus d'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'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'utilisateur (par exemple, bobsmith12 ou steller.sunshine)
+ * Mot de passe
+Assurez-vous également que la touche Verr. maj n'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'informations.
+ </string>
+ <string name="LoginFailedPremiumOnly">
+ Les connexions à Second Life sont temporairement limitées afin de s'assurer que l'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'accéder à Second Life depuis cet ordinateur.
+Si vous pensez qu'il s'agit d'une erreur, contactez
+l'Assistance à l'adresse suivante : support@secondlife.com.
+ </string>
+ <string name="LoginFailedAcountSuspended">
+ Votre compte est inaccessible jusqu'Ã
+[TIME], heure du Pacifique.
+ </string>
+ <string name="LoginFailedAccountDisabled">
+ Nous n'avons pas réussi à traiter votre demande.
+Pour obtenir de l'aide, veuillez contacter l'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'Ã
+[TIME], heure du Pacifique.
+Si vous pensez qu'il s'agit d'une erreur, contactez l'Assistance à l'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'Ã
+[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'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'il s'agit d'une erreur, contactez l'Assistance à l'adresse suivante : support@secondlife.com
+ </string>
+ <string name="LoginFailedIncorrectParameters">
+ Paramètres incorrects.
+Si vous pensez qu'il s'agit d'une erreur, contactez l'Assistance à l'adresse suivante : support@secondlife.com
+ </string>
+ <string name="LoginFailedFirstNameNotAlphanumeric">
+ Le paramètre Prénom doit être alphanumérique.
+Si vous pensez qu'il s'agit d'une erreur, contactez l'Assistance à l'adresse suivante : support@secondlife.com
+ </string>
+ <string name="LoginFailedLastNameNotAlphanumeric">
+ Le paramètre Nom doit être alphanumérique.
+Si vous pensez qu'il s'agit d'une erreur, contactez l'Assistance à l'adresse suivante : support@secondlife.com
+ </string>
+ <string name="LogoutFailedRegionGoingOffline">
+ La région est en train d'ê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'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>
@@ -1494,7 +1633,7 @@
(Inconnu)
</string>
<string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
- <string name="NextStipendDay" value="Prochaine prime le "/>
+ <string name="NextStipendDay" value=". Prochaine prime le "/>
<string name="GroupIndividualShare" value=" Groupe Part individuelle"/>
<string name="GroupColumn" value="Groupe"/>
<string name="Balance">
@@ -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'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 140f7bdc145802f9d2c069971a5360de2b801ab1..214ae96373648d513854f3302136cceac13526be 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 b713bb8143ebdd6ac12ff51ddd415d4afbf37c80..a96433d7aa97c71aca13d063e554e417369d1c3e 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 > 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 a54751e6290f256e4050a829c691b49a3e2793bd..84ed85e362bfb0744fa196d8ba2a7d96d39d8d78 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:
+ <nolink>[NAME]</nolink> contiene:
</text>
<text name="buy_text">
Compra per [AMOUNT]L$ da [NAME]?
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index 0a499a6c44faa3046252204bf65a5b9c15b32599..635b56d37a2ec2c028fe52ff0c6ebd06b07687b9 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -52,7 +52,8 @@
Riscrivi l'importo per vedere l'ultimo tasso al cambio.
</text>
<text name="purchase_warning_repurchase">
- La conferma di questo acquisto compra solo L$, non l'oggetto.
+ La conferma di questo acquisto compra solo L$, non
+l'oggetto.
</text>
<text bottom_delta="16" name="purchase_warning_notenough">
Non stai acquistando abbastanza L$. Aumenta l'importo.
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 0000000000000000000000000000000000000000..eb4d0c0fdbf787a8855120a6be51ad53564189b4
--- /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 49130285f2adc5340e09c59ef95e9659fcb5e4dd..cf790ee62e746e3cad25502f2eb4a6f3c1cc6001 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 0000000000000000000000000000000000000000..a17b8b36c2674a97231122addae15a4c39986558
--- /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 0000000000000000000000000000000000000000..b17f731089d85e3b2a6d566b77daca912a56982d
--- /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'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'oggetto interagisce con altri oggetti e avatar. Impostare il comando a scorrimento sul livello di dettaglio appropriato per l'uso dell'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="<< Indietro" name="back"/>
+ <button label="Avanti >>" 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 0000000000000000000000000000000000000000..06c838a981d4553735c732f38f30f73b2487e233
--- /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'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 0000000000000000000000000000000000000000..df4b8f4878a55852f2bebf1c5e4cd89b053a0a02
--- /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 52b5566006bcd9a6b961124915d6ddf19b9f1315..23e01a3943d8d4ed218636f0f5a037d7e9a1bfb4 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 a2535ce48de789195f9144ec14fd77bd4b0632a8..62da61cd6b5efd0890e3b425ee1ac65339ccbeca 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 0000000000000000000000000000000000000000..5012e6450f27952c6ea85eb1862b4904d2e1c91a
--- /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 6599810a671f03e355e5211f29f4074d9be453aa..e4df0630d927001dbd7c4cd34dcd244c90ebe9d5 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'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 6619260670c7d2881021e0ded4c5d6a94946bcdd..f50051c00449daa3f1248da182e682c92d4404d8 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'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² '[PARCEL_NAME]' è 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² '[PARCEL_NAME]' è stato rilasciato.
+
+Ora è disponibile per l'acquisto da parte di chiunque.
+ </notification>
<notification name="AvatarRezNotification">
( in esistenza da [EXISTENCE] secondi )
Nuvola avatar '[NAME]' 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'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'editor dell'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 167de5d028311c91caf13faa6638489d70a1cf8a..016970d9a31c8b366f3bbdd4610be225a9a6896f 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 7d21b8ccc70a3fa72f8bf6c2bb9236b88435f0e3..1f2b97af45003962a62feac2e817705948608846 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 6ca5dd878ef384e61bae764b136a18b8c1e72eb9..c550e005ae97fee0b38e324372c83be2aa53ba79 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 0000000000000000000000000000000000000000..8e7f0c8dc55034e889d1f1f2abcd63c680b7bbf7
--- /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 aa23eef438428d716fd828782bf83e9030c38d6a..cbe8ef24c44e6c112e511a9135f898e6dd9f1c5e 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'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'inconveniente.
+ </string>
+ <string name="LoginFailedEmployeesOnly">
+ Second Life è chiuso temporaneamente per manutenzione.
+Al momento, solo i dipendenti possono eseguire l'accesso.
+Visita www.secondlife.com/status per aggiornamenti.
+ </string>
+ <string name="LoginFailedPremiumOnly">
+ L'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'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'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'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'agente non è nella regione.
+Prova ad accedere nuovamente tra un minuto.
+ </string>
+ <string name="LogoutFailedPendingLogin">
+ La regione ha eseguito l'accesso in un'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'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'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>
@@ -1472,8 +1611,8 @@
<string name="Unknown">
(Sconosciuto)
</string>
- <string name="SummaryForTheWeek" value="Riassunto della settimana, partendo dal"/>
- <string name="NextStipendDay" value="Il prossimo giorno di stipendio è"/>
+ <string name="SummaryForTheWeek" value="Riassunto della settimana, partendo dal "/>
+ <string name="NextStipendDay" value=". Il prossimo giorno di stipendio è "/>
<string name="GroupIndividualShare" value="Gruppo Dividendi individuali"/>
<string name="GroupColumn" value="Gruppo"/>
<string name="Balance">
@@ -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 61fedede3526e3a8092de507b15904bd1ba07e71..56708001c2fbac9e8a1ab273b51855a55863a343 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 ed17736eb383e71ec8ab1199271e26fe97f80895..7e4932c78fe62e5cf60402e73b788d67f82c9e7a 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] ã®ä¸èº«ï¼š
+ <nolink>[NAME]</nolink> ã«å«ã¾ã‚Œã‚‹ã‚‚ã®ï¼š
</text>
<scroll_list name="item_list" width="310"/>
<text name="buy_text" width="320">
diff --git a/indra/newview/skins/default/xui/ja/floater_customize.xml b/indra/newview/skins/default/xui/ja/floater_customize.xml
deleted file mode 100644
index cc0032e1ab037237d9e94f7afcec1bcef81280b0..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_customize.xml
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="容姿">
- <tab_container name="customize tab container">
- <text label="身体部ä½" name="body_parts_placeholder">
- 身体部ä½
- </text>
- <panel label="シェイプ" name="Shape">
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- <button label="身体" label_selected="身体" name="Body"/>
- <button label="é " label_selected="é " name="Head"/>
- <button label="眼" label_selected="眼" name="Eyes"/>
- <button label="耳" label_selected="耳" name="Ears"/>
- <button label="é¼»" label_selected="é¼»" name="Nose"/>
- <button label="å£" label_selected="å£" name="Mouth"/>
- <button label="ã‚ã”" label_selected="ã‚ã”" name="Chin"/>
- <button label="胴体" label_selected="胴体" name="Torso"/>
- <button label="両脚" label_selected="両脚" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item label="女性" name="radio" value="0"/>
- <radio_item label="男性" name="radio2" value="1"/>
- </radio_group>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„シェイプをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- シェイプ：
- </text>
- <button label="æ–°ã—ã„シェイプ(体型)を作æˆ" label_selected="æ–°ã—ã„シェイプ(体型)を作æˆ" name="Create New"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- </panel>
- <panel label="スã‚ン" name="Skin">
- <button label="スã‚ンã®è‰²" label_selected="スã‚ンã®è‰²" name="Skin Color"/>
- <button label="é¡”ã®ç´°éƒ¨" label_selected="é¡”ã®ç´°éƒ¨" name="Face Detail"/>
- <button label="メイク" label_selected="メイク" name="Makeup"/>
- <button label="身体細部" label_selected="身体細部" name="Body Detail"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„スã‚ンをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- スã‚ン：
- </text>
- <texture_picker label="é 部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Head Tattoos" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <texture_picker label="上åŠèº«ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Upper Tattoos" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <texture_picker label="下部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Lower Tattoos" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <button label="æ–°ã—ã„スã‚ンを作æˆ" label_selected="æ–°ã—ã„スã‚ンを作æˆ" name="Create New"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="髪" name="Hair">
- <button label="色" label_selected="色" name="Color"/>
- <button label="スタイル" label_selected="スタイル" name="Style"/>
- <button label="眉毛" label_selected="眉毛" name="Eyebrows"/>
- <button label="é¡”" label_selected="é¡”" name="Facial"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„髪をã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- 髪型：
- </text>
- <texture_picker label="テクスãƒãƒ£" name="Texture" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <button label="æ–°ã—ã„髪を作æˆ" label_selected="æ–°ã—ã„髪を作æˆ" name="Create New"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="眼" name="Eyes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„目をã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- 目：
- </text>
- <texture_picker label="虹彩" name="Iris" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <button label="æ–°ã—ã„眼を作æˆ" label_selected="æ–°ã—ã„眼を作æˆ" name="Create New"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <text label="æœ" name="clothes_placeholder">
- 衣類
- </text>
- <panel label="シャツ" name="Shirt">
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="æ–°ã—ã„シャツを作æˆ" label_selected="æ–°ã—ã„シャツを作æˆ" name="Create New"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„シャツをç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- シャツ：
- </text>
- </panel>
- <panel label="パンツ" name="Pants">
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="æ–°ã—ã„パンツを作æˆ" label_selected="æ–°ã—ã„パンツを作æˆ" name="Create New"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„パンツを履ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- パンツ：
- </text>
- </panel>
- <panel label="é´" name="Shoes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„é´ã‚’å±¥ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„é´ã‚’作æˆ" label_selected="æ–°ã—ã„é´ã‚’作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- é´ï¼š
- </text>
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="é´ä¸‹" name="Socks">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„é´ä¸‹ã‚’å±¥ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„é´ä¸‹ã‚’作æˆ" label_selected="æ–°ã—ã„é´ä¸‹ã‚’作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- é´ä¸‹ï¼š
- </text>
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="上ç€" name="Jacket">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„ジャケットをç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„上ç€ã‚’作æˆ" label_selected="æ–°ã—ã„上ç€ã‚’作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- 上ç€ï¼š
- </text>
- <texture_picker label="上åŠèº«ã®ç”Ÿåœ°" name="Upper Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <texture_picker label="下層生地" name="Lower Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="手袋" name="Gloves">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„手袋をã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„手袋を作æˆ" label_selected="æ–°ã—ã„手袋を作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- 手袋：
- </text>
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="下ç€ã‚·ãƒ£ãƒ„" name="Undershirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«1ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„下ç€ï¼ˆä¸Šï¼‰ã‚’ç€ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„下ç€ã‚·ãƒ£ãƒ„を作æˆ" label_selected="æ–°ã—ã„下ç€ã‚·ãƒ£ãƒ„を作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- 下ç€ã‚·ãƒ£ãƒ„：
- </text>
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="下ç€ãƒ‘ンツ" name="Underpants">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„下ç€ï¼ˆä¸‹ï¼‰ã‚’å±¥ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„パンツを作æˆ" label_selected="æ–°ã—ã„パンツを作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- 下ç€ãƒ‘ンツ：
- </text>
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="スカート" name="Skirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: ä¿®æ£ã§ãã¾ã›ã‚“。
- </text>
- <text name="title_loading">
- [DESC]: ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
- <text name="title_not_worn">
- [DESC]: 未装ç€ã€‚
- </text>
- <text name="path">
- [PATH] ã«æ‰€åœ¨
- </text>
- <text name="not worn instructions">
- æŒã¡ç‰©ã‹ã‚‰ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã« 1 ã¤ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„スカートを履ãã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="スカートを作æˆ" label_selected="スカートを作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã‚ãªãŸã¯ã“ã®æœã®ä¿®æ£ã‚’許ã•ã‚Œã¦ã„ã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- スカート：
- </text>
- <texture_picker label="生地" name="Fabric" tool_tip="写真をクリックã—ã¦é¸æŠž"/>
- <color_swatch label="色ï¼æ˜Žæš—" name="Color/Tint" tool_tip="クリックã—ã¦ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="戻ã™" label_selected="戻ã™" name="Revert"/>
- </panel>
- <panel label="タトゥ" name="Tattoo">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]： ä¿®æ£ä¸å¯
- </text>
- <text name="title_loading">
- [DESC]： ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...
- </text>
- <text name="title_not_worn">
- [DESC]： 未ç€ç”¨
- </text>
- <text name="path">
- å‚ç…§ [PATH]
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„タトゥをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„タトゥを作æˆ" label_selected="æ–°ã—ã„タトゥを作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã“ã®ç€ç”¨ç‰©ã‚’ä¿®æ£ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- タトゥ：
- </text>
- <texture_picker label="é 部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Head Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <texture_picker label="上部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Upper Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <texture_picker label="下部ã®ã‚¿ãƒˆã‚¥ãƒ¼" name="Lower Tattoo" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="å…ƒã«æˆ»ã™" label_selected="å…ƒã«æˆ»ã™" name="Revert"/>
- </panel>
- <panel label="アルファ" name="Alpha">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]： ä¿®æ£ä¸å¯
- </text>
- <text name="title_loading">
- [DESC]： ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...
- </text>
- <text name="title_not_worn">
- [DESC]： 未ç€ç”¨
- </text>
- <text name="path">
- å‚ç…§ [PATH]
- </text>
- <text name="not worn instructions">
- ã‚ãªãŸã®æŒã¡ç‰©ã‹ã‚‰ã‚¢ãƒã‚¿ãƒ¼ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã€æ–°ã—ã„アルファマスクをã¤ã‘ã¾ã™ã€‚ 代ã‚ã‚Šã«ã€ã¯ã˜ã‚ã‹ã‚‰æ–°ã—ã作æˆã—ã¦ç€ç”¨ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
- </text>
- <button label="æ–°ã—ã„アルファを作æˆ" label_selected="æ–°ã—ã„アルファを作æˆ" name="Create New"/>
- <text name="no modify instructions">
- ã“ã®ç€ç”¨ç‰©ã‚’ä¿®æ£ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。
- </text>
- <text name="Item Action Label">
- アルファ：
- </text>
- <texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <texture_picker label="é 部ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Head Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <texture_picker label="ç›®ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Eye Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <texture_picker label="髪ã®ã‚¢ãƒ«ãƒ•ã‚¡" name="Hair Alpha" tool_tip="クリックã—ã¦å†™çœŸã‚’é¸æŠžã—ã¾ã™"/>
- <button label="å–り外ã™" label_selected="å–り外ã™" name="Take Off"/>
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="別åã§ä¿å˜..." label_selected="別åã§ä¿å˜..." name="Save As"/>
- <button label="å…ƒã«æˆ»ã™" label_selected="å…ƒã«æˆ»ã™" name="Revert"/>
- </panel>
- </tab_container>
- <button label="ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±" label_selected="ã‚¹ã‚¯ãƒªãƒ—ãƒˆæƒ…å ±" name="script_info" tool_tip="ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã«ä»˜ã„ã¦ã„るスクリプトを表示ã—ã¾ã™"/>
- <button label="アウトフィット作æˆ" label_selected="アウトフィット作æˆ" name="make_outfit_btn"/>
- <button label="ã‚ャンセル" label_selected="ã‚ャンセル" name="Cancel"/>
- <button label="OK" label_selected="OK" name="Ok"/>
-</floater>
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 0000000000000000000000000000000000000000..65edafb1697520aab60d2ece8d46a54fcb6caf48
--- /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 47a63e5e2025478750da7b4c2e66b8f7c774184e..47d57da0310451c1888e0e7a9762d2263f09d522 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 0000000000000000000000000000000000000000..5eb141a28cf994e219e1b7c583f2bb36e3087d98
--- /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 0000000000000000000000000000000000000000..a785172f20c064fd0e52bc2e03351cee652d4c1b
--- /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="<< 戻る" name="back"/>
+ <button label="次ã¸>>" 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 0000000000000000000000000000000000000000..10a46247a70f7e74dcec86d954a7022a73512edd
--- /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 1e884af5f2d8644132329b9eb30239fac083a9ca..aa368eef113fd4f95cdf6137a6d0a210eb78630f 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 0000000000000000000000000000000000000000..28d2388bed5bea42880bf1d6c489905880295a91
--- /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 211d1c3714f6f0955f4712748cdceb574e73f3b4..0b14f92ae798b2c421c2fb0d4b09e47d89129b71 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/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
deleted file mode 100644
index de8b590a802b12e284c31df67ffc0257dd439235..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="ä¿å˜" label_selected="ä¿å˜" name="Save"/>
- <button label="å–り消ã—" label_selected="å–り消ã—" name="Cancel"/>
- <text name="Save item as:">
- アイテムを別åã§æŒã¡ç‰©ã«ä¿å˜ï¼š
- </text>
- <line_editor name="name ed">
- New [DESC]
- </line_editor>
-</floater>
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 6c754e5d0874cdf9627379f2df4565fd723fef30..ae5ddbb78f1b3302c771151c1f266ed40b4dbd7f 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 0000000000000000000000000000000000000000..43f86e84bf728c9058b91ca04412d2305dc4b9af
--- /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 b8efc200499e43f092cbd806bd1d3f3c2842b5d7..ec9db02522bc67e86699278e8753f9b5015eb108 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 f93e032ffc66709866c624210a097b24c50d8dd9..d63ca8403513552dc42fbc88bc210221ab467baf 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]秒経éŽï¼‰
'[NAME]'ã¨ã„ã†ã‚¢ãƒã‚¿ãƒ¼ã¯[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 e1dea89ca0ebf668718c899011d1571c4e83d182..9f6abf8fcbc1b25070318fbc4b21b81ea3bab76c 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 b4430fa39dcc0c132efe8f1d1dacd86c1d6ab9ed..1786b4befc9925829a645a39f4cd9d303501e84c 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 54ec24773f0fe55132c7eafb5930348d3c016ac3..65148cf1eee554c772b693c81ec7c9d477a04e10 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 0000000000000000000000000000000000000000..da103a2d6003654c2085e64eeff0b80c6d199e31
--- /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 cb248b8b4fd4e4a3a56833bdc6e12d8e55bfbcf3..a6691fb7649efb061b457f860b262fd379f32362 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 d51ea1c0f85e9af6ea2d7acd128629ba20e27b87..f336e53e05bc1aacd591d76818b73e8973b55ef2 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/nl/floater_windlight_options.xml b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
index d97c9679a91a79e4694b70be149c54cb67c20e0a..b26dd7916ecaea9389b90ea123b82c89e8b62d18 100644
--- a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="WindLight floater" title="GEAVANCEERDE LUCHT EDITOR">
- <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
- left_delta="116" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
- width="150" />
+ <combo_box allow_text_entry="false" follows="left|top" mouse_opaque="true" name="WLPresetsCombo"/>
<text name="KeyFramePresetsText">
Lucht voorinstellingen
</text>
<button label="Nieuw" label_selected="Nieuw" name="WLNewPreset"/>
<button label="Opslaan" label_selected="Opslaan" name="WLSavePreset"/>
- <button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset" width="80"/>
+ <button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset"/>
<button label="Dag cyclus editor" label_selected="Dag cyclus editor" name="WLDayCycleMenuButton"/>
<tab_container name="WindLight Tabs">
<panel label="Atmosfeer" name="Atmosphere">
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index 87e3638a49e81b7a911a99ecb6f769e55b67cfe0..a53c0769dc873cb55ced11143741b7a76a8be91c 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -1231,8 +1231,8 @@
<string name="Unknown">
(Unknown)
</string>
- <string name="SummaryForTheWeek" value="Samenvatting voor deze week, vanaf"/>
- <string name="NextStipendDay" value="The next stipend day is"/>
+ <string name="SummaryForTheWeek" value="Samenvatting voor deze week, vanaf "/>
+ <string name="NextStipendDay" value=". The next stipend day is "/>
<string name="GroupIndividualShare" value="Groep Individueel Aandeel"/>
<string name="Balance">
Banksaldo
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 528e5a416b7368213d5409f0fac959d1f4b25474..2201c4b0adf659428917ad7451b1fea6034e7534 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 0c285e65460146032a213209f50dab28673c9021..9ec3c480b7a15827f9ec4059b934936b78d0f4f5 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/ 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/ 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/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 94708ba448a5374c25fda7b7e2380ae24aa34d60..6eceed46d3acf981d678bb5b04bb507914b6a061 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1464,7 +1464,7 @@
(nieznane)
</string>
<string name="SummaryForTheWeek" value="Podsumowanie dla tego tygodnia, poczÄ…wszy od "/>
- <string name="NextStipendDay" value="Następna wypłata będzie w "/>
+ <string name="NextStipendDay" value=". Następna wypłata będzie w "/>
<string name="GroupIndividualShare" value=" Groupa Udziały Indywidualne"/>
<string name="GroupColumn" value="Grupa"/>
<string name="Balance">
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index a9da2a18af988d95d0ecdaa496ded45a484c3009..6ea2daced95fbd65ce8c9db5d1df9e6fdd881fd5 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -54,27 +54,13 @@ Agradecemos também aos seguintes residentes por sua colaboração na mais nova
</panel>
<panel label="Licenças" 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.
-
- Todos os direitos reservados. Veja licenças.txt para detalhes.
+ 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion 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)
+O Second Life Viewer usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenciadores). Todos os direitos reservados. Mais detalhes em www.havok.com
+
+Todos os direitos reservados. Mais detalhes em licenses.txt.
+
+Codificação do áudio de bate-papo 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/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 7761c79864258ab17bbaac878f8780af6d995271..e48cac7d1fe13f7c345cdad2f1c3b8f442cbf9ee 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 > 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/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index c64523ceb38c1616d7892a2eb91eb1dd52353d34..b9e7a044126592ed26c6707de639bcff2a49fd52 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_buy_contents" title="COMPRAR CONTEÚDO">
<text name="contains_text">
- [NAME] contém:
+ <nolink>[NAME]</nolink> contains:
</text>
<text name="buy_text">
Comprar por L$[AMOUNT] de(a) [NAME]?
diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml
deleted file mode 100644
index a9ec0b9b1ff84d140e2d5dfb7d361dbc3c70f3be..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="APARÊNCIA">
- <tab_container name="customize tab container" tab_min_width="115">
- <text label="Corpo" name="body_parts_placeholder">
- Partes do corpo
- </text>
- <panel label="Forma" name="Shape">
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- <button label="Corpo" label_selected="Corpo" name="Body"/>
- <button label="Cabeça" label_selected="Cabeça" name="Head"/>
- <button label="Olhos" label_selected="Olhos" name="Eyes"/>
- <button label="Orelhas" label_selected="Orelhas" name="Ears"/>
- <button label="Nariz" label_selected="Nariz" name="Nose"/>
- <button label="Boca" label_selected="Boca" name="Mouth"/>
- <button label="Queixo" label_selected="Queixo" name="Chin"/>
- <button label="Tórax" label_selected="Tórax" name="Torso"/>
- <button label="Pernas" label_selected="Pernas" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item label="Feminino" name="radio" value="0"/>
- <radio_item label="Masculino" name="radio2" value="1"/>
- </radio_group>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter um fÃsico novo, arraste um do inventário para o seu avatar. Ou crie um novo.
- </text>
- <text name="no modify instructions">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Forma:
- </text>
- <button label="Nova" label_selected="Nova" name="Create New"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- </panel>
- <panel label="Pele" name="Skin">
- <button label="Cor de pele" label_selected="Cor de pele" name="Skin Color" width="115"/>
- <button label="Detalhes faciais" label_selected="Detalhes faciais" name="Face Detail" width="115"/>
- <button label="Maquilagem" label_selected="Maquilagem" name="Makeup" width="115"/>
- <button label="Detalhes do corpo" label_selected="Detalhes do corpo" name="Body Detail" width="115"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando..
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizada em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter uma pele nova, arraste uma do inventário para o seu avatar. Ou crie uma pele nova.
- </text>
- <text name="no modify instructions">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Pele:
- </text>
- <texture_picker label="Tattoo: cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho" width="86"/>
- <texture_picker label="Tattoo: superior" name="Upper Tattoos" tool_tip="Clique para escolher um desenho" width="86"/>
- <texture_picker label="Tattoo: inferior" name="Lower Tattoos" tool_tip="Clique para escolher um desenho" width="86"/>
- <button label="Novo" label_selected="Novo" name="Create New"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Cabelo" name="Hair">
- <button label="Cor" label_selected="Cor" name="Color" width="115"/>
- <button label="Estilo" label_selected="Estilo" name="Style" width="115"/>
- <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows" width="115"/>
- <button label="Rosto" label_selected="Rosto" name="Facial" width="115"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter um cabelo novo, arraste um tipo de cabelo do inventário para o seu avatar. Ou crie um cabelo novo.
- </text>
- <text name="no modify instructions">
- Você não ter permissão para modificar essa vestimenta.
- </text>
- <text name="Item Action Label">
- Cabelo:
- </text>
- <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
- <button label="Criar novo cabelo" label_selected="Criar novo cabelo" name="Create New"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Olhos" name="Eyes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos.
- </text>
- <text name="no modify instructions">
- Você não tem permissão para alterar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Olhos:
- </text>
- <texture_picker label="Ãris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
- <button label="Criar novos olhos" label_selected="Criar novos olhos" name="Create New"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <text label="Roupas" name="clothes_placeholder">
- Roupa
- </text>
- <panel label="Camisa" name="Shirt">
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Criar nova camisa" label_selected="Criar nova camisa" name="Create New"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter uma camisa nova, arraste uma do inventário para o seu avatar. Ou crie uma camisa nova.
- </text>
- <text name="no modify instructions">
- Você não ter permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Camisa:
- </text>
- </panel>
- <panel label="Calças" name="Pants">
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Criar novas calças" label_selected="Criar novas calças" name="Create New"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestindo
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter calças novas, arraste uma do inventário para o seu avatar. Ou crie calças novas.
- </text>
- <text name="no modify instructions">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Calças:
- </text>
- </panel>
- <panel label="Sapatos" name="Shoes">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos.
- </text>
- <button label="Criar novos sapatos" label_selected="Criar novos sapatos" name="Create New" width="166"/>
- <text name="no modify instructions">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Sapatos:
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Meias" name="Socks">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido.
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter meias novas, arraste um par do inventário para o seu avatar. Ou crie meias novas.
- </text>
- <button label="Criar novas meias" label_selected="Criar novas meias" name="Create New"/>
- <text name="no modify instructions">
- Você não tem permissão para modificar essa vestimenta.
- </text>
- <text name="Item Action Label">
- Meias:
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Jaqueta" name="Jacket">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: Não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para por uma jaqueta nova, arraste uma do inventário para o seu avatar. Ou crie uma jaqueta nova.
- </text>
- <button label="Criar nova jaqueta" label_selected="Criar nova jaqueta" name="Create New"/>
- <text name="no modify instructions">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Jaqueta:
- </text>
- <texture_picker label="Tecido superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
- <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Luvas" name="Gloves">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando....
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter luvas novas, arraste um par do inventário para o seu avatar. Ou crie luvas novas.
- </text>
- <button label="Criar novas luvas" label_selected="Criar novas luvas" name="Create New"/>
- <text name="no modify instructions">
- Você não tem permissão para modificar essa vestimenta.
- </text>
- <text name="Item Action Label">
- Luvas:
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Camiseta" name="Undershirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter uma camiseta nova, arraste uma do inventário para o seu avatar. Ou crie uma camiseta nova.
- </text>
- <button label="Criar nova camiseta" label_selected="Criar nova camiseta" name="Create New"/>
- <text name="no modify instructions">
- Você não ter permissão para modificar essa vestimenta.
- </text>
- <text name="Item Action Label">
- Camiseta:
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Roupas de Baixo" name="Underpants">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter roupa de baixo nova, arraste um modelo do inventário para o seu avatar. Ou crie uma roupa de baixo nova.
- </text>
- <button label="Criar novas" label_selected="Criar novas" name="Create New" width="180"/>
- <text name="no modify instructions">
- Você não tem permissão para modificar essa vestimenta.
- </text>
- <text name="Item Action Label">
- Roupas de baixo:
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Saia" name="Skirt">
- <text name="title">
- [DESC]
- </text>
- <text name="title_no_modify">
- [DESC]: não foi possÃvel modificar
- </text>
- <text name="title_loading">
- [DESC]: carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localizado em [PATH]
- </text>
- <text name="not worn instructions">
- Para obter um saia nova, arraste uma saia do inventário para o seu avatar. Ou crie uma saia nova.
- </text>
- <button label="Criar nova saia" label_selected="Criar nova saia" name="Create New"/>
- <text name="no modify instructions">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <text name="Item Action Label">
- Saia:
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Tatuagem" name="Tattoo">
- <text name="title">
- [DESC]:
- </text>
- <text name="title_no_modify">
- [DESC]: não pode ser modificado
- </text>
- <text name="title_loading">
- [DESC]: Carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localização: [PATH]
- </text>
- <text name="not worn instructions">
- Para por uma tatuagem nova, arraste uma tatuagem do inventário para o seu avatar. Ou crie uma tatuagem nova.
- </text>
- <button label="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/>
- <text name="no modify instructions">
- Você não está autorizado a modificar este acessório.
- </text>
- <text name="Item Action Label">
- Tatuagem:
- </text>
- <texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Selecionar imagem"/>
- <texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Selecionar imagem"/>
- <texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Selecionar imagem"/>
- <button label="Tirar" label_selected="Tirar" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Alpha" name="Alpha">
- <text name="title">
- [DESC]:
- </text>
- <text name="title_no_modify">
- [DESC]: não pode ser modificado
- </text>
- <text name="title_loading">
- [DESC]: Carregando...
- </text>
- <text name="title_not_worn">
- [DESC]: não vestido
- </text>
- <text name="path">
- Localização: [PATH]
- </text>
- <text name="not worn instructions">
- Para por uma máscara alpha nova, arraste a máscara do inventário para o seu avatar. Ou crie uma máscara nova.
- </text>
- <button label="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/>
- <text name="no modify instructions">
- Você não está autorizado a modificar este acessório.
- </text>
- <text name="Item Action Label">
- Alpha:
- </text>
- <texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/>
- <button label="Tirar" label_selected="Tirar" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- </tab_container>
- <scroll_container left="249" name="panel_container"/>
- <button label="Dados do script" label_selected="Dados do script" name="script_info" tool_tip="Mostrar scripts anexados ao seu avatar"/>
- <button label="Criar look" label_selected="Criar look" name="make_outfit_btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="OK" label_selected="OK" name="Ok"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_device_settings.xml b/indra/newview/skins/default/xui/pt/floater_device_settings.xml
deleted file mode 100644
index 48a4a6ef6f4539b3fee8e94cf4758f89593afb0d..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_device_settings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_device_settings" title="CONFIGURAÇÃO DE DISPOSITIVO DE VOZ"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_import_collada.xml b/indra/newview/skins/default/xui/pt/floater_import_collada.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad55d416c38989f472991340badc8691c83302bb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="Importar cena">
+ <text name="mesh count">
+ Meshes: [COUNT]
+ </text>
+ <text name="texture count">
+ Texturas: [COUNT]
+ </text>
+ <text name="status">
+ Status: [STATUS]
+ </text>
+ <button label="Cancelar" name="cancel"/>
+ <button label="OK" name="ok"/>
+ <string name="status_idle">
+ Inativo
+ </string>
+ <string name="status_uploading">
+ Carregando [NAME]
+ </string>
+ <string name="status_creating">
+ Criando objeto [NAME]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index d21e5740112de598d23722b8baff70b1690adf52..71759abdc243009414433c78d69033a5816ebf0d 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
<check_box label="Roupas" name="check_clothing"/>
<check_box label="Gestos" name="check_gesture"/>
<check_box label="Landmarks" name="check_landmark"/>
+ <check_box label="Meshes:" name="check_mesh"/>
<check_box label="Anotações" name="check_notecard"/>
<check_box label="Objetos" name="check_object"/>
<check_box label="Scripts" name="check_script"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cdad55bded57e8b2d9d1d819b773bc96c2d2186d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="Carregar modelo">
+ <string name="status_idle">
+ Inativo
+ </string>
+ <string name="status_reading_file">
+ Carregando...
+ </string>
+ <string name="status_generating_meshes">
+ Gerando meshes...
+ </string>
+ <string name="status_vertex_number_overflow">
+ Erro: Número de Vertex acima de 65534. Abortado.
+ </string>
+ <string name="high">
+ Alto
+ </string>
+ <string name="medium">
+ Média
+ </string>
+ <string name="low">
+ Baixo
+ </string>
+ <string name="lowest">
+ Mais baixo
+ </string>
+ <string name="mesh_status_good">
+ Entregar!
+ </string>
+ <string name="mesh_status_na">
+ N/D
+ </string>
+ <string name="mesh_status_none">
+ Nenhum
+ </string>
+ <string name="mesh_status_submesh_mismatch">
+ Cada nÃvel de detalhamento têm um número de faces para textura.
+ </string>
+ <string name="mesh_status_mesh_mismatch">
+ Cada nÃvel de detalhamento têm um número de faces para textura.
+ </string>
+ <string name="mesh_status_too_many_vertices">
+ O nÃvel de detalhamento possui vértices demais.
+ </string>
+ <string name="mesh_status_missing_lod">
+ Falta o nÃvel de detalhamento necessário.
+ </string>
+ <string name="layer_all">
+ Tudo
+ </string>
+ <string name="decomposing">
+ Analisando...
+ </string>
+ <string name="simplifying">
+ Simplificando...
+ </string>
+ <text name="name_label">
+ Nome:
+ </text>
+ <text name="lod_label">
+ Visualizar
+ </text>
+ <combo_box name="preview_lod_combo" tool_tip="LOD para ver no renderizador de pré-visualização">
+ <combo_item name="high">
+ NÃvel de detalhamento: Alto
+ </combo_item>
+ <combo_item name="medium">
+ NÃvel de detalhamento: Média
+ </combo_item>
+ <combo_item name="low">
+ NÃvel de detalhamento: Baixo
+ </combo_item>
+ <combo_item name="lowest">
+ NÃvel de detalhamento: Mais baixo
+ </combo_item>
+ </combo_box>
+ <panel>
+ <text name="streaming cost">
+ Custo do recurso: [COST]
+ </text>
+ <text name="physics cost">
+ Custo fÃsico: [COST]
+ </text>
+ <text name="upload fee">
+ Taxa de upload: N/D
+ </text>
+ </panel>
+ <text name="status">
+ [STATUS]
+ </text>
+ <button label="Padrão" name="reset_btn" tool_tip="Valores padrão"/>
+ <button label="Upload" name="ok_btn" tool_tip="Carregar no simulador"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <tab_container name="import_tab">
+ <panel label="NÃvel de detalhamento:" name="lod_panel">
+ <text name="lod_table_header">
+ Selecione o nÃvel de detalhamento:
+ </text>
+ <text name="high_label" value="Alto"/>
+ <text name="high_triangles" value="0"/>
+ <text name="high_vertices" value="0"/>
+ <text name="medium_label" value="Médio"/>
+ <text name="medium_triangles" value="0"/>
+ <text name="medium_vertices" value="0"/>
+ <text name="low_label" value="Baixo"/>
+ <text name="low_triangles" value="0"/>
+ <text name="low_vertices" value="0"/>
+ <text name="lowest_label" value="Mais baixo"/>
+ <text name="lowest_triangles" value="0"/>
+ <text name="lowest_vertices" value="0"/>
+ <text name="lod_table_footer">
+ NÃvel de detalhamento: [DETAIL]
+ </text>
+ <radio_group name="lod_file_or_limit" value="lod_from_file">
+ <radio_item label="Carregar de arquivo" name="lod_from_file"/>
+ <radio_item label="Gerar automaticamente" name="lod_auto_generate"/>
+ <radio_item label="Nenhum" name="lod_none"/>
+ </radio_group>
+ <button label="Procurar..." name="lod_browse"/>
+ <combo_box name="lod_mode">
+ <combo_item name="triangle_limit">
+ Limite de triângulo
+ </combo_item>
+ <combo_item name="error_threshold">
+ Limite de erro
+ </combo_item>
+ </combo_box>
+ <text name="build_operator_text">
+ Operador de construção:
+ </text>
+ <text name="queue_mode_text">
+ Modo de fila:
+ </text>
+ <combo_box name="build_operator">
+ <combo_item name="edge_collapse">
+ Queda na borda
+ </combo_item>
+ <combo_item name="half_edge_collapse">
+ Meia queda na borda
+ </combo_item>
+ </combo_box>
+ <combo_box name="queue_mode">
+ <combo_item name="greedy">
+ EgoÃsta
+ </combo_item>
+ <combo_item name="lazy">
+ Preguiçoso
+ </combo_item>
+ <combo_item name="independent">
+ Independente
+ </combo_item>
+ </combo_box>
+ <text name="border_mode_text">
+ Modo da borda:
+ </text>
+ <text name="share_tolderance_text">
+ Tolerância com compartilhamento:
+ </text>
+ <combo_box name="border_mode">
+ <combo_item name="border_unlock">
+ Desbloquear
+ </combo_item>
+ <combo_item name="border_lock">
+ Bloquear
+ </combo_item>
+ </combo_box>
+ <text name="crease_label">
+ Ângulo da dobra:
+ </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="Arquivo:" name="physics_load_from_file"/>
+ <radio_item label="NÃvel de detalhamento:" name="physics_use_lod"/>
+ </radio_group>
+ <combo_box name="physics_lod_combo" tool_tip="LOD para forma fÃsica">
+ <combo_item name="physics_lowest">
+ Mais baixo
+ </combo_item>
+ <combo_item name="physics_low">
+ Baixo
+ </combo_item>
+ <combo_item name="physics_medium">
+ Médio
+ </combo_item>
+ <combo_item name="physics_high">
+ Alto
+ </combo_item>
+ </combo_box>
+ <button label="Procurar..." name="physics_browse"/>
+ </panel>
+ <panel name="physics analysis">
+ <slider label="Alisar:" name="Smooth"/>
+ <check_box label="Tapar buracos (lento)" name="Close Holes (Slow)"/>
+ <button label="Analisar" name="Decompose"/>
+ <button label="Cancelar" name="decompose_cancel"/>
+ </panel>
+ <panel name="physics simplification">
+ <slider label="Demãos:" name="Combine Quality"/>
+ <slider label="Escala do detalhamento:" name="Detail Scale"/>
+ <slider label="Manter:" name="Retain%"/>
+ <button label="Simplificar" name="Simplify"/>
+ <button label="Cancelar" name="simplify_cancel"/>
+ </panel>
+ <panel name="physics info">
+ <slider label="Visualizar:" name="physics_explode"/>
+ <text name="physics_triangles">
+ Triângulos: [TRIANGLES]
+ </text>
+ <text name="physics_points">
+ Vértices: [POINTS]
+ </text>
+ <text name="physics_hulls">
+ Hulls: [HULLS]
+ </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 da pele" name="upload_skin"/>
+ <check_box label="Posição das juntas" name="upload_joints"/>
+ <spinner name="pelvis_offset" value="0.0"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1064e16e8339fa001782c20c52a8465832923d77
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Wizard" title="CARREGAR ASSISTENTE DE MODELAGEM">
+ <button label="5. Carregar" name="upload_btn"/>
+ <button label="4. Revisar" name="review_btn"/>
+ <button label="3. FÃsica" name="physics2_btn"/>
+ <button label="3. FÃsica" name="physics_btn"/>
+ <button label="2. Otimizar" name="optimize_btn"/>
+ <button label="1. Selecionra arquivo" name="choose_file_btn"/>
+ <panel name="choose_file_panel">
+ <panel name="header_panel">
+ <text name="header_text">
+ Carregar modelo
+ </text>
+ </panel>
+ <text name="description">
+ O assistente ajuda você a importar modelos mesh para o Second Life. Para começar, especifique o arquivo com o modelo a ser importado. O Second Life suporta arquivos COLLADA (.dae).
+ </text>
+ <panel name="content">
+ <text name="Cache location">
+ Nome do arquivo:
+ </text>
+ <button label="Procurar..." label_selected="Procurar..." 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">
+ Otimizar
+ </text>
+ </panel>
+ <text name="description">
+ O assistente otimizou seu modelo para melhorar o desempenho. Ajuste os resultados da otimização abaixou ou clique em Próximo para prosseguir.
+ </text>
+ <panel name="content">
+ <text name="high_detail_text">
+ Gerar nÃvel de detalhamento: Alto
+ </text>
+ <text name="medium_detail_text">
+ Gerar nÃvel de detalhamento: Médio
+ </text>
+ <text name="low_detail_text">
+ Gerar nÃvel de detalhamento: Baixo
+ </text>
+ <text name="lowest_detail_text">
+ Gerar nÃvel de detalhamento: Mais baixo
+ </text>
+ </panel>
+ <panel name="content2">
+ <text name="lod_label">
+ Visualizar modelo:
+ </text>
+ <combo_box name="preview_lod_combo2" tool_tip="LOD para ver no renderizador de pré-visualização">
+ <combo_item name="high">
+ Alto
+ </combo_item>
+ <combo_item name="medium">
+ Médio
+ </combo_item>
+ <combo_item name="low">
+ Baixo
+ </combo_item>
+ <combo_item name="lowest">
+ Mais baixo
+ </combo_item>
+ </combo_box>
+ <text name="streaming cost">
+ Custo do recurso: [COST]
+ </text>
+ <text name="dimensions">
+ X Y: Z:
+ </text>
+ <text name="dimension_dividers">
+ | |
+ </text>
+ </panel>
+ </panel>
+ <panel name="physics_panel">
+ <panel name="header_panel">
+ <text name="header_text">
+ FÃsica
+ </text>
+ </panel>
+ <text name="description">
+ O assistente cria uma forma fÃsica que determina como o objeto interage com outros objetos e avatares. Ajuste a barra para o nÃvel de detalhamento mais apropriado para a finalidade do seu objeto:
+ </text>
+ <panel name="content">
+ <text name="streaming cost">
+ Custo do recurso: [COST]
+ </text>
+ </panel>
+ </panel>
+ <panel name="physics2_panel">
+ <panel name="header_panel">
+ <text name="header_text">
+ FÃsica
+ </text>
+ </panel>
+ <text name="description">
+ Veja a forma fÃsica abaixo e clique em Próximo para prosseguir. Para modificar o formato fÃsico, clique em Anterior.
+ </text>
+ <panel name="content">
+ <text name="lod_label">
+ Visualizar modelo:
+ </text>
+ <combo_box name="preview_lod_combo3" tool_tip="LOD para ver no renderizador de pré-visualização">
+ <combo_item name="high">
+ Alto
+ </combo_item>
+ <combo_item name="medium">
+ Médio
+ </combo_item>
+ <combo_item name="low">
+ Baixo
+ </combo_item>
+ <combo_item name="lowest">
+ Mais baixo
+ </combo_item>
+ </combo_box>
+ <text name="dimensions">
+ X Y: Z:
+ </text>
+ <text name="dimension_dividers">
+ | |
+ </text>
+ <text name="streaming cost">
+ Custo do recurso: [COST]
+ </text>
+ </panel>
+ </panel>
+ <panel name="review_panel">
+ <panel name="header_panel">
+ <text name="header_text">
+ Revisar
+ </text>
+ </panel>
+ <text name="description">
+ Veja os detalhes abaixo e clique em Carregar para carregar seu modelo. Seu saldo L$ será cobrado quando você clicar em Carregar.
+ </text>
+ <panel name="content">
+ <text name="lod_label">
+ Visualizar modelo:
+ </text>
+ <combo_box name="preview_lod_combo" tool_tip="LOD para ver no renderizador de pré-visualização">
+ <combo_item name="high">
+ Alto
+ </combo_item>
+ <combo_item name="medium">
+ Médio
+ </combo_item>
+ <combo_item name="low">
+ Baixo
+ </combo_item>
+ <combo_item name="lowest">
+ Mais baixo
+ </combo_item>
+ </combo_box>
+ <text name="dimensions">
+ X Y: Z:
+ </text>
+ <text name="dimension_dividers">
+ | |
+ </text>
+ </panel>
+ <text name="streaming cost">
+ Custo do recurso: [COST]
+ </text>
+ <text name="physics cost">
+ Custo fÃsico: [COST]
+ </text>
+ </panel>
+ <panel name="upload_panel">
+ <panel name="header_panel">
+ <text name="header_text">
+ Carregado!
+ </text>
+ </panel>
+ <text name="description">
+ Parabéns! Seu modelo foi carregado com êxito. Procure-o na pasta Objetos de seu inventário.
+ </text>
+ </panel>
+ <button label="<< Voltar" name="back"/>
+ <button label="Próximo >>" name="next"/>
+ <button label="Carregar" name="upload" tool_tip="Carregar no simulador"/>
+ <button label="Cancelar" name="cancel"/>
+ <button label="Fechar" name="close"/>
+ <spinner name="import_scale" value="1.0"/>
+ <string name="status_idle">
+ Inativo
+ </string>
+ <string name="status_reading_file">
+ Carregando...
+ </string>
+ <string name="status_generating_meshes">
+ Gerando meshes...
+ </string>
+ <string name="status_vertex_number_overflow">
+ Erro: Número de Vertex acima de 65534. Abortado.
+ </string>
+ <string name="high">
+ Alto
+ </string>
+ <string name="medium">
+ Médio
+ </string>
+ <string name="low">
+ Baixo
+ </string>
+ <string name="lowest">
+ Mais baixo
+ </string>
+ <string name="mesh_status_good">
+ Entregar!
+ </string>
+ <string name="mesh_status_na">
+ N/D
+ </string>
+ <string name="mesh_status_none">
+ Nenhum
+ </string>
+ <string name="mesh_status_submesh_mismatch">
+ Cada nÃvel de detalhamento têm um número de faces para textura.
+ </string>
+ <string name="mesh_status_mesh_mismatch">
+ Cada nÃvel de detalhamento têm um número de faces para textura.
+ </string>
+ <string name="mesh_status_too_many_vertices">
+ O nÃvel de detalhamento possui vértices demais.
+ </string>
+ <string name="mesh_status_missing_lod">
+ Falta o nÃvel de detalhamento necessário.
+ </string>
+ <string name="layer_all">
+ Tudo
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_classified.xml b/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
deleted file mode 100644
index bb626430ed2ab59fddc05e0f9e8e33878238c2c3..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="classified_preview" title="INFORMAÇÕES CLASSIFICADAS">
- <floater.string name="Title">
- Classificados: [NAME]
- </floater.string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_event.xml b/indra/newview/skins/default/xui/pt/floater_preview_event.xml
deleted file mode 100644
index b422580f3b83fe1160e30647990b69e69721c428..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_preview_event.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="event_preview" title="DADOS DO EVENTO">
- <floater.string name="Title">
- Evento: [NAME]
- </floater.string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b078962feba04d9e1413d410dbaee1c2fa45b968
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/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 ANÚNCIO">
+ <text name="explanation_text">
+ Seu anúncio será publicado por uma semana a partir da data de publicação.
+
+A posição do seu anúncio nos classificados depende de quanto você paga.
+
+Os anúncios de maior valor vão para o topo da lista e aparecem mais no topo dos resultados de busca.
+ </text>
+ <text name="price_text">
+ Preço do anúncio:
+ </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/pt/floater_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0e6d923778dc33effb74808a7ea6e7232ebcf744
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/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 áudio">
+ <text name="voice_label">
+ Bate-papo de voz
+ </text>
+ <check_box label="Ativado" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_statistics.xml b/indra/newview/skins/default/xui/pt/floater_statistics.xml
deleted file mode 100644
index ecbf638157fb3f2216761ea0c41fc8f45c60359a..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/floater_statistics.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="stats floater" title="ESTATÃSTICAS"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 7289b592fddc2299dca6cca9bd39752625083ef3..ed273d9f28c55b40410b2d2fc4b117b1be92e0e8 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -125,6 +125,18 @@
<text left="134" name="prim_count">
Prims: [COUNT]
</text>
+ <text name="linked_set_count">
+ Conjuntos linkados: [COUNT]
+ </text>
+ <text name="linked_set_cost" tool_tip="Custo dos conjuntos selecionados [prims],[complexidade fÃsica]">
+ Custo: [COST] / [PHYSICS]
+ </text>
+ <text name="object_count">
+ Objetos: [COUNT]
+ </text>
+ <text name="object_cost" tool_tip="Custo dos objetos selecionados [prims] / [complexidade fÃsica]">
+ Custo: [COST] / [PHYSICS]
+ </text>
<tab_container name="Object Info Tabs" tab_max_width="60" tab_min_width="30" width="288">
<panel label="Comum" name="General">
<panel.string name="text deed continued">
@@ -269,15 +281,6 @@
<combo_box.item label="Anel" name="Ring"/>
<combo_box.item label="Esculpida" name="Sculpted"/>
</combo_box>
- <combo_box name="material">
- <combo_box.item label="Pedra" name="Stone"/>
- <combo_box.item label="Metal" name="Metal"/>
- <combo_box.item label="Vidro" name="Glass"/>
- <combo_box.item label="Madeira" name="Wood"/>
- <combo_box.item label="Carne" name="Flesh"/>
- <combo_box.item label="Plástico" name="Plastic"/>
- <combo_box.item label="Couro" name="Rubber"/>
- </combo_box>
<text name="text cut">
Path Cut (begin/end)
</text>
@@ -350,9 +353,19 @@
<combo_box.item label="Toróide" name="Torus"/>
<combo_box.item label="Plano" name="Plane"/>
<combo_box.item label="Cilindro" name="Cylinder"/>
+ <combo_box.item label="Mesh" name="Mesh"/>
</combo_box>
</panel>
<panel label="Recursos" name="Features">
+ <panel.string name="None">
+ Nenhum
+ </panel.string>
+ <panel.string name="Prim">
+ Prim
+ </panel.string>
+ <panel.string name="Convex Hull">
+ Hull convexo
+ </panel.string>
<text name="select_single" width="272">
Selecione apenas um prim para editar suas caracterÃsticas.
</text>
@@ -377,6 +390,23 @@
<spinner label="Enfocar" name="Light Focus"/>
<spinner label="Queda" name="Light Falloff"/>
<spinner label="Ambiente" name="Light Ambiance"/>
+ <text name="label physicsshapetype">
+ Tipo de formato fÃsico:
+ </text>
+ <combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Selecione o tipo de formato fÃsico"/>
+ <combo_box name="material">
+ <combo_box.item label="Pedra" name="Stone"/>
+ <combo_box.item label="Metal" name="Metal"/>
+ <combo_box.item label="Vidro" name="Glass"/>
+ <combo_box.item label="Madeira" name="Wood"/>
+ <combo_box.item label="Carne" name="Flesh"/>
+ <combo_box.item label="Plástico" name="Plastic"/>
+ <combo_box.item label="Borrracha" name="Rubber"/>
+ </combo_box>
+ <spinner label="Gravidade" name="Physics Gravity"/>
+ <spinner label="Fricção" name="Physics Friction"/>
+ <spinner label="Densidade" name="Physics Density"/>
+ <spinner label="Restituição" name="Physics Restitution"/>
</panel>
<panel label="Textura" name="Texture">
<panel.string name="string repeats per meter">
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
index 9f345b5b6ed3f97a01171cc6669f0c1d64e80291..7a7ebc50af162a884dc818c508dc2c9c2bc0747c 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
@@ -4,6 +4,8 @@
<menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/>
<menu_item_call label="Som (L$[COST])..." name="Upload Sound"/>
<menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/>
+ <menu_item_call label="Modelar..." name="Upload Model"/>
+ <menu_item_call label="Assistente de modelagem..." name="Upload Model Wizard"/>
<menu_item_call label="Volume (L$[COST] per file)..." name="Bulk Upload"/>
<menu_item_call label="Autorizações de upload padrão" name="perm prefs"/>
</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000000000000000000000000000000000..079f876add8685180f54792b217c33f79967cdcf
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/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 bordas" name="show_edges"/>
+ <menu_item_check label="Mostrar fÃsica" name="show_physics"/>
+ <menu_item_check label="Mostrar texturas" name="show_textures"/>
+ <menu_item_check label="Mostrar peso da pele" name="show_skin_weight"/>
+ <menu_item_check label="Mostrar posição das juntas" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 0a2a2994f6f9d350dfbf215995108097b41a10fd..4213db7440ccc414b4d9d159f7301f1173e0f055 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -120,6 +120,8 @@
<menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/>
<menu_item_call label="Som (L$[COST])..." name="Upload Sound"/>
<menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/>
+ <menu_item_call label="Modelar..." name="Upload Model"/>
+ <menu_item_call label="Assistente de modelagem..." name="Upload Model Wizard"/>
<menu_item_call label="Volume (L$[COST] por arquivo)..." name="Bulk Upload"/>
</menu>
<menu_item_call label="Desfazer" name="Undo"/>
@@ -159,7 +161,7 @@
<menu_item_check label="Alpha" name="Alpha"/>
<menu_item_check label="Ãrvore" name="Tree"/>
<menu_item_check label="Avatares" name="Character"/>
- <menu_item_check label="SurfacePath" name="SurfacePath"/>
+ <menu_item_check label="Patch de superfÃcie" name="Surface Patch"/>
<menu_item_check label="Céu" name="Sky"/>
<menu_item_check label="Ãgua" name="Water"/>
<menu_item_check label="Chão" name="Ground"/>
@@ -217,6 +219,7 @@
<menu_item_check label="Painel de texturas" name="Texture Category"/>
<menu_item_check label="Tempos" name="Fast Timers"/>
<menu_item_check label="Memória" name="Memory"/>
+ <menu_item_check label="EstatÃsticas da cena" name="Scene Statistics"/>
<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
<menu_item_check label="Câmera:" name="Camera"/>
<menu_item_check label="Vento" name="Wind"/>
@@ -224,6 +227,7 @@
</menu>
<menu label="Show Info" name="Display Info">
<menu_item_check label="Mostrar hora" name="Show Time"/>
+ <menu_item_check label="Mostar custo do upload" name="Show Upload Cost"/>
<menu_item_check label="Dados de renderização" name="Show Render Info"/>
<menu_item_check label="Mostrar info da textura" name="Show Texture Info"/>
<menu_item_check label="Mostrar cor sob o cursor" name="Show Color Under Cursor"/>
@@ -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="Normais" name="Normals"/>
+ <menu_item_check label="Formas fÃsicas" name="Physics Shapes"/>
<menu_item_check label="Tipo de atualização" name="Update Type"/>
+ <menu_item_check label="Dados LOD" name="LOD Info"/>
+ <menu_item_check label="Fila de construção" 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="Depurar texturas do avatar" name="Debug Avatar Textures"/>
</menu>
<menu_item_check label="Texturas HTTP" name="HTTP Textures"/>
+ <menu_item_check label="Inventário 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="Sair do modo admin" name="Leave Admin Options"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 0786a62f13ae3f6a24d12dc981e93d01417f53b9..56a33f51e8cd06cf2febf880afcb5efe7a0b7ad7 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2148,6 +2148,12 @@ Ela pode afetar a digitação da senha.
<notification name="RezItemNoPermissions">
Sem permissões suficientes para criar objetos.
</notification>
+ <notification name="IMAcrossParentEstates">
+ Não é possÃvel enviar MIs entre propriedades-pai.
+ </notification>
+ <notification name="TransferInventoryAcrossParentEstates">
+ Não é possÃvel transferir o inventário para propriedades-pai.
+ </notification>
<notification name="UnableToLoadNotecard">
Não é possÃvel carregar notas neste momento.
</notification>
@@ -2718,6 +2724,10 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
Sua voz foi silenciada pelo moderador.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
+ <notification name="UploadCostConfirmation">
+ O carregamento custa L$[PRICE]. Deseja prosseguir?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Carregar"/>
+ </notification>
<notification name="ConfirmClearTeleportHistory">
Tem certeza que deseja apagar todo o seu histórico de teletransporte?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -2729,6 +2739,9 @@ O botão será exibido quando houver espaço suficente.
<notification name="ShareNotification">
Selecione os residentes com quem compartilhar.
</notification>
+ <notification name="MeshUploadError">
+ [LABEL] não foi carregado: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+ </notification>
<notification name="ShareItemsConfirmation">
Tem certeza de que quer compartilhar os itens abaixo?
@@ -2745,6 +2758,19 @@ Com os seguintes residentes:
<notification name="DeedToGroupFail">
Ocorreu uma falha durante a doação ao grupo.
</notification>
+ <notification name="ReleaseLandThrottled">
+ O lote [PARCEL_NAME] não pode ser abandonado.
+ </notification>
+ <notification name="ReleasedLandWithReclaim">
+ O lote de [AREA] m² '[PARCEL_NAME]' foi liberado.
+
+Você tem [RECLAIM_PERIOD] para reivindicá-lo por L$0. Depois o lote será colocado à venda para qualquer interessado.
+ </notification>
+ <notification name="ReleasedLandNoReclaim">
+ O lote de [AREA] m² '[PARCEL_NAME]' foi liberado.
+
+Ele está à venda para qualquer interessado.
+ </notification>
<notification name="AvatarRezNotification">
( [EXISTENCE] segundos de vida )
O avatar de '[NAME]' emergiu em [TIME] segundos.
@@ -2883,6 +2909,10 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
É preciso usar o modo Avançado para criar e editar grupos. Desejar sair para mudar o modo? Selecione o modo na tela de login.
<usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
</notification>
+ <notification label="" name="NoPlaceInfo">
+ É preciso estar no modo Avançado para visualizar o perfil de um lugar. Deseja sair para mudar o modo? Selecione o modo na tela de login.
+ <usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
+ </notification>
<notification label="" name="NoPicks">
É preciso usar o modo Avançado para criar e editar Destaques. Desejar sair para mudar o modo? Selecione o modo na tela de login.
<usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
@@ -2903,9 +2933,18 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
É preciso usar o modo Avançado para fazer pagamentos a outros residentes. Desejar sair para mudar o modo?
<usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
</notification>
- <global name="UnsupportedCPU">
- - A velocidade da sua CPU não suporta os requisitos mÃnimos exigidos.
- </global>
+ <notification label="" name="NoInventory">
+ É preciso estar no modo Avançado para visualizar o inventário. Deseja sair para mudar o modo?
+ <usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
+ </notification>
+ <notification label="" name="NoAppearance">
+ É preciso usar o modo Avançado para usar o editor de visual. Deseja sair para mudar o modo?
+ <usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
+ </notification>
+ <notification label="" name="NoSearch">
+ É preciso estar no modo Avançado para fazer pesquisas. Deseja sair para mudar o modo?
+ <usetemplate name="okcancelbuttons" notext="Não sair" yestext="Sair"/>
+ </notification>
<global name="UnsupportedGLRequirements">
Aparentemente a sua máquina não atende os requisitos de hardware do [APP_NAME]. [APP_NAME] requer placas de vÃdeo OpenGL com suporte a multitexturas. Se sua place de vÃdeo tiver este perfil, atualize o driver da placa de vÃdeo, assim como patches e service packs do sistema operacional.
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
deleted file mode 100644
index 34073f9ce1c9589227d213e5fb5463130b5cc352..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="friends">
- <string name="Multiple">
- Diversos amigos
- </string>
- <scroll_list name="friend_list" tool_tip="Aperte shift ou control enquanto clica para selecionar múltiplos amigos">
- <column name="icon_online_status" tool_tip="Status Online"/>
- <column label="Nome" name="friend_name" tool_tip="Nome"/>
- <column name="icon_visible_online" tool_tip="Amigo pode ver quando você está online"/>
- <column name="icon_visible_map" tool_tip="Amigo pode localizá-lo no mapa"/>
- <column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar seus objetos"/>
- <column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
- </scroll_list>
- <button label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea" width="86"/>
- <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações" width="86"/>
- <button label="Teletransportar" name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual" width="86"/>
- <button label="Pagar" name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo" width="86"/>
- <button label="Tirar" name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos" width="86"/>
- <button label="Adicionar" name="add_btn" tool_tip="Oferecer amizade para um residente" width="86"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
index 46d9517a9817c2f76aa2c742c4c556317f507a79..d6c6f66e37d0facbc7aa61fcfe7b769fdd59e40b 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
<text name="text_box5">
Erros
</text>
+ <text name="text_box10">
+ Direto
+ </text>
<text name="text_box7">
Proprietário
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 4b03c79a9edd0a49fecc3f7b1db584c93d3f2739..28e71843267de71f36b0901b07f222cb45e0e4d1 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -28,8 +28,20 @@ rápido
</text>
<check_box initial_value="verdadeiro" label="Ãgua transparente" name="TransparentWater"/>
<check_box initial_value="true" label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
+ <check_box initial_value="verdadeiro" label="Luzes locais" name="LocalLights"/>
<check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/>
<check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
+ <check_box initial_value="verdadeiro" label="Iluminação e sombras" name="UseLightShaders"/>
+ <check_box initial_value="verdadeiro" label="Oclusão ambiental" name="UseSSAO"/>
+ <check_box initial_value="verdadeiro" label="Profundidade" name="UseDoF"/>
+ <text name="shadows_label">
+ Sombras:
+ </text>
+ <combo_box name="ShadowDetail">
+ <combo_box.item label="Nenhum" name="0"/>
+ <combo_box.item label="Sol/Lua" name="1"/>
+ <combo_box.item label="Sol/Lua + Projetores" name="2"/>
+ </combo_box>
<text name="reflection_label">
Reflexo de água:
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
index e06f3c74bf7f79fd7680a61f7d741a5097cfc41d..4be1cd11c00480b93110688368499abcd4fcea25 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml
@@ -25,6 +25,7 @@
<check_box label="Permitir revenda do terreno" name="allow_land_resell_check"/>
<check_box label="Permitir junção/divisão do terreno" name="allow_parcel_changes_check"/>
<check_box label="Bloquear exibição do terreno na busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/>
+ <check_box label="Permitir objetos mesh" name="mesh_rez_enabled_check" tool_tip="Permitir que que outras pessoas renderizem objectos mesh nessa região"/>
<spinner label="Limite do agente" name="agent_limit_spin"/>
<spinner label="Bônus de objetos" name="object_bonus_spin"/>
<text label="Maturidade" name="access_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb612ca19b3c2e07413347a4ebc6169810e13109
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="Configuração de dispositivos" name="device_settings_panel">
+ <panel.string name="default_text">
+ Padrão
+ </panel.string>
+ <text name="Input">
+ Entrada
+ </text>
+ <text name="My volume label">
+ Meu volume:
+ </text>
+ <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Mude o volume usando o controle deslizante"/>
+ <text name="wait_text">
+ Aguarde
+ </text>
+ <text name="Output">
+ SaÃda
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 1dbbcafb0e91170d297f4f6959c25bdd18a8407a..c5268966c1f1eefd6092bca27abd825c67051959 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -118,6 +118,100 @@
<string name="create_account_url">
http://join.secondlife.com/index.php?lang=pt-BR
</string>
+ <string name="LoginFailedViewerNotPermitted">
+ O visualizador utilizado já não é compatÃvel com o Second Life. Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
+
+Para saber mais, visite as perguntas frequentes abaixo: http://secondlife.com/viewer-access-faq
+ </string>
+ <string name="LoginIntermediateOptionalUpdateAvailable">
+ Existe uma versão atualizada do seu visualizador: [VERSION]
+ </string>
+ <string name="LoginFailedRequiredUpdate">
+ Atualização de visualizador obrigatória: [VERSION]
+ </string>
+ <string name="LoginFailedAlreadyLoggedIn">
+ Este agente já fez login.
+ </string>
+ <string name="LoginFailedAuthenticationFailed">
+ Desculpe! Não foi possÃvel fazer seu login. Verifique se digitou o nome de usuário correto* (como kiki45 ou astro.fÃsica) * e senha. Verifique também que a tecla Maiúscula está desativada.
+ </string>
+ <string name="LoginFailedPasswordChanged">
+ Como medida de precaução, sua senha foi alterada. Visite sua conta em http://secondlife.com/password e responda a pergunta de segurança para mudar sua senha. Lamentamos qualquer inconveniente.
+ </string>
+ <string name="LoginFailedPasswordReset">
+ Fizemos algumas alterações a seu sistema. Você precisa selecionar outra senha. Visite sua conta em http://secondlife.com/password e responda a pergunta de segurança para mudar sua senha. Lamentamos qualquer inconveniente.
+ </string>
+ <string name="LoginFailedEmployeesOnly">
+ O Second Life está fechado para manutenção no momento. Somente funcionários podem acessá-lo. Consulte www.secondlife.com/status para as últimas atualizações.
+ </string>
+ <string name="LoginFailedPremiumOnly">
+ O acesso ao Second Life está sendo restrito por alguns instantes para que todos tenham a melhor experiência possÃvel.
+
+Titulares de contas gratuitas não poderão acessar o Second Life para acomodar os assinantes do Second Life.
+ </string>
+ <string name="LoginFailedComputerProhibited">
+ O Second Life não pode ser acessado deste computador. Se você acredita que houve algum equÃvoco, contate support@secondlife.com.
+ </string>
+ <string name="LoginFailedAcountSuspended">
+ Sua conta não está disponÃvel para acesso até [TIME], horário do PacÃfico nos EUA (GMT-08).
+ </string>
+ <string name="LoginFailedAccountDisabled">
+ Não é possÃvel concluir a solicitação neste momento. Para obter mais ajuda, conte o suporte em http://secondlife.com/support. Caso você não possa mudar sua senha, ligue para (866) 476-9763.
+ </string>
+ <string name="LoginFailedTransformError">
+ Dados discrepantes detectados durante o login. Contate support@secondlife.com.
+ </string>
+ <string name="LoginFailedAccountMaintenance">
+ Sua conta está passando por um breve perÃodo de manutenção. Sua conta não está disponÃvel para acesso até [TIME], horário do PacÃfico nos EUA (GMT-08). Se você acredita que houve algum equÃvoco, contate support@secondlife.com.
+ </string>
+ <string name="LoginFailedPendingLogoutFault">
+ Reação à solicitação de saÃda foi uma falha do simulador.
+ </string>
+ <string name="LoginFailedPendingLogout">
+ O sistema está passando para o modo offline. Sua conta não está disponÃvel para acesso até [TIME], horário do PacÃfico nos EUA (GMT-08).
+ </string>
+ <string name="LoginFailedUnableToCreateSession">
+ ImpossÃvel criar sessão válida.
+ </string>
+ <string name="LoginFailedUnableToConnectToSimulator">
+ Não foi possÃvel conectar o simulador.
+ </string>
+ <string name="LoginFailedRestrictedHours">
+ Sua conta possui acesso ao Second Life das [START] à s [END], horário da costa leste dos EUA. Volte novamente durante seu horário de acesso. Se você acredita que houve algum equÃvoco, contate support@secondlife.com.
+ </string>
+ <string name="LoginFailedIncorrectParameters">
+ Parâmetros incorretos. Se você acredita que houve algum equÃvoco, contate support@secondlife.com.
+ </string>
+ <string name="LoginFailedFirstNameNotAlphanumeric">
+ O parâmetro de primeiro nome deve ser alfanumérico. Se você acredita que houve algum equÃvoco, contate support@secondlife.com.
+ </string>
+ <string name="LoginFailedLastNameNotAlphanumeric">
+ O parâmetro de sobrenome deve ser alfanumérico. Se você acredita que houve algum equÃvoco, contate support@secondlife.com.
+ </string>
+ <string name="LogoutFailedRegionGoingOffline">
+ Região passando para modo offline. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LogoutFailedAgentNotInRegion">
+ Não há agente na região. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LogoutFailedPendingLogin">
+ A região estava acessada por outra sessão. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LogoutFailedLoggingOut">
+ A região estava passando para o modo offline na sessão anterior. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LogoutFailedStillLoggingOut">
+ A região estava passando para o modo offline na sessão anterior. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LogoutSucceeded">
+ A região passou para o modo offline na última sessão. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LogoutFailedLogoutBegun">
+ A região inicou o modo offline. Tente novamente dentro de alguns instantes.
+ </string>
+ <string name="LoginFailedLoggingOutSession">
+ O sistema iniciou o modo offline em sua sessão anterior. Tente novamente dentro de alguns instantes.
+ </string>
<string name="AgentLostConnection">
Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
</string>
@@ -426,6 +520,9 @@
<string name="symbolic folder link">
link da pasta
</string>
+ <string name="mesh">
+ mesh
+ </string>
<string name="AvatarAway">
Distante
</string>
@@ -1153,6 +1250,9 @@
<string name="InvFolder Accessories">
Acessórios
</string>
+ <string name="InvFolder Meshes">
+ Meshes:
+ </string>
<string name="InvFolder Friends">
Amigos
</string>
@@ -1466,8 +1566,8 @@
<string name="Unknown">
(Desconhecido)
</string>
- <string name="SummaryForTheWeek" value="Resumo para esta semana, com inÃcio em"/>
- <string name="NextStipendDay" value="Próximo dia de salário é"/>
+ <string name="SummaryForTheWeek" value="Resumo para esta semana, com inÃcio em "/>
+ <string name="NextStipendDay" value=". Próximo dia de salário é "/>
<string name="GroupIndividualShare" value="Grupo Divisão individualI"/>
<string name="GroupColumn" value="Grupo"/>
<string name="Balance">
@@ -3662,6 +3762,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="session_initialization_timed_out_error">
A inicialização da sessão expirou
</string>
+ <string name="Home position set.">
+ Posição inicial definida.
+ </string>
<string name="voice_morphing_url">
http://secondlife.com/landing/voicemorphing
</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml
index c62fc8b5d13a3dc7f295d56ba9d20b0b57ac851c..0d110c0456776d6e7ec316b38ee97b5941a588c0 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 825fe13e92cb4347f46effc6c8274ccbde741760..229297e39b4ef873646e701063fe22f98c40bcfe 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 4e5c4f96f03abce0fd3d43b18f2a6a34b59aa105..c0c5494c91e13e65b836b984474eafea0c16b7b8 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'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'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 0f1feaa8439bff403d3bd17a26b79aa725384b68..bcb5606b6003bc5e020a98ad424825d9c9f4f63f 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 f895fa2e9dd121185aa1e51d20c8d2a810ee2135..fb17c0bb8a6132ec01c32df05292e9250188a490 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 98fa6804bac9451421f44f119146448620322c7f..ffdd957f9100135762bccfd3bd48a68e14675004 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 de3c0aa075c7882785d1bcd18d58f3f0e345facb..a00f069e6ce46c245c1336568d6f0df4e241ada2 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 d665a16639ea78db8c385e6f67df2f9147a61ecb..a75d33136db6697cf86772cf1225707af5b8f100 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 ec67f8d4faf9a8ebffccefff5dc81f55608486c2..dea0a7c318909c6ba15aa95832abc213741373e5 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 df9c780cbf8a6e763a72800594ab3c13578e006b..f6f2f0187dc4b984c3ae098a97b4421d0546ca0c 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 c6ab787625b25466e3bedd7f909881e0a64bae2a..8adc094fca5a2cb0aab1509e67f5a09d49dc4829 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 22e7451d131b6058bbdce0d5742a263125c66d17..901770586a077f5af2e0b9ba92ba64b4deea5d1c 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 b01d346a6402c19568df2459fe221a8592f89563..a501a4257aaf0dc0efbf0c289ee5c4860b4d6fae 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's Map Visibility Caches" label_selected="Flush This Region's Map Visibility Caches" name="Flush This Region'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 75403a79ddca71f1e11b62e56e158560be1be104..1465dcb256fbb6642ba3169e97462c94f6d64f12 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 957c37bd6357e17c6efc9c0afd5a9666d65e6d86..e605d5f19ceaad0243b499672f5995fd2d5108b9 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 e458913452f0c3afb7d2244af3b00a0ab3fc51a1..a788961e9566b1c030facbb22075d2ceed0c9b88 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 5ea073365e3422546ce9aa0216190203aa3e727d..2d66c659fe8329a287508b8eae555323e1e94f58 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 92d5c3df73030265302ae7ef83de3c52e93f4e16..98e4e5c2cd71296d188164b0c55242a3c3a9f28d 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 9ca08c06b184ee46cb6d1f030572f65d04ecc404..4f678dbd9da18eb675f90325257f91c89b943595 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 7f23bba37a9e480da0159d5ad86ee04c2e661ea8..295538f797a6f22b842d2bae033aee21c29aa25b 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's owner"/>
- <button label="See Creator Profile..." name="button creator" tool_tip="See profile of the highlighted object's original creator"/>
+ <button label="察看æ“有者檔案..." name="button owner" tool_tip="See profile of the highlighted object's owner"/>
+ <button label="å¯Ÿçœ‹å‰µé€ è€…æª”æ¡ˆ..." name="button creator" tool_tip="See profile of the highlighted object'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 93cd681126694ff2f4b0c07b3738d31282e00151..da4619c964c8a191ee57bf71dad5f214a99c5f66 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 4fac10df81f1109f0d3c1f5c147101af07876ae7..fcd702b16ddecdd98dc3c6704c667c6d42027569 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 41ea8dc5930738f664d481a5eecdd5442376a6ca..a442eb9cbc75f9bb96fe92b155a814af5b97959a 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 91f2bc6d8123c0aaa26369dccb20bff89542f672..83bd4e2bca3962abe4b2b3b08b5297825469a3c5 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 4ff6c45b17004053b0435710bb467435bdaf9b8e..261ba8ebc332d5fc0a3931a1ea121d688d8af824 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">
>>
@@ -126,26 +126,26 @@
<floater.string name="bigger_label">
<<
</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=">>" name="minimize" tool_tip="Toggle floater size"/>
+ <button label=">>" 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 de551f8c96e7df0cdf78f9c003822e5324ad5f40..3d9d391a215c471f020962ec4e60973628be668a 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 1866592d849620dc3f85fbb221bdb528e4580677..3e44f458e7f49824a48a9e8b85d61aae56fa2763 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 65102216d2f940c0e749812100b9242e9347c8b0..1e0e207fb0e1dcd4108957ecead63b88fe554ec3 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 4e92aa69e086aebe9171c2e0b7180a9698878ba6..3478761b0b75d4fdecb775b9ef3efe9485e4b11e 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 0739e01833fb9b2124955af60624186d69af81ad..024ef0b1023e796d51f36015ea0cd7fe90445f09 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 63c9d6c9505b7c5363d9c95c2d431ff591059b12..feb68f2b0f4e8b8d3b18bb6de6b1a69272db1f32 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'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 a871f821e3e554b42070e52155c025d5318ff745..0cc7bbcfe0ddaa0b1920ab88d31cd6378634e170 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 fe64f757775e97070693420e8f5c471d65cb764a..52e6a9d8e4a82a1dbc32854ddb381f608b583470 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 a3eaa559e04bf0141c750a900191b161bd163aad..08d56be302cc99c51577e5d11a591b29183ddc43 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 53fb7ef2f10f86e71c821ed6d86dbaf88ead3676..02e26cea24eb99947bc902bb58fdc24d67ef41bf 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 c745051c8bbd476808d724252b148a30d870327f..da89cd80ad0e42169d867c54bda0bd989a060ac5 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 > Age play" name="Age__Age_play"/>
<combo_box.item label="Age > Adult Resident on Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
<combo_box.item label="Age > 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 > Encroachment > Particles" name="Land__Encroachment__Particles"/>
<combo_box.item label="Land > Encroachment > 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'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 12d4ed606d7c3e9c81f9d65000915ed77f8fefa7..2d3f5066bc8cb207e3b6ae020f46039159a815de 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 80b9d69a7958565767450f46c67381ab0c6b0bcb..b4216cf5b29a5db5340a441badb99da616d766f4 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 6b6276e88f324aba60332a3ad05388927504745e..54c5ba5cc0ea0016d4f4d904f87956f1d1bfbd56 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 4c6dffea76d1eb958cacfe11384a986f8fb75f9f..aaf6ecd7cfb619301a7018a158f1dfd3dc630279 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 b0d3d6923090a3778785e91aec18deef66c7f0a2..feee659736412c2475c49cb230309179db00a010 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'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 d4a76555cbc65365b2866797f7226bede52c0d67..4d650eaaee5eca021005491013e0e27235860927 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 2e0fcd13a8ec5f05d0701b13c6e508f4c2fdc258..8e790f8dad03aaebb33f3a300c19984f4f52434f 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 2b202a9e6c1b62a655deca326b20d52e595d353f..d292386323e3ded355d101d1dd5817828659d041 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 34b969c2dcee30a7699d089f3cde25500cde03ef..167d4cb858c19ea89b89e0cb482198fea829c106 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 e149285ab2d97bf54df957a1739a940d29a4bfff..47038e3b3d192af8ab1bc6600566f1e61b7b5824 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 df450937fd9885de5cc5b510e269c600a2420a02..02e81983a68632491b67f8ef81fba0b5289f9cdf 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 72e5eade9c00b80449069d67c3935ebe77009903..01649496bc14e743da6d86e6ac752fe2cb2f5615 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 b674ed2763c80219a26de3bc352d0b9441618d78..aa803cc49de543b1661ea371d8c291ef047194db 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 2089f8d58a853271db758cd5286baf480c3dc769..e3a791cde55a102705c7c5e24e29895779f89ee9 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 cce8fa3ca6c244fb1d0d7d39ecdde5bb1143ed0a..1da583b3d0c7be0e11019c4ef1699ca0def75b54 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 db22646cedd1a90a88aa46155d3cef9e8feae5e0..281d357fd3b223b5714257eb5263ed2cdff33390 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 bccae5b5471ef36a72718c2075c8ba1042857483..646edcf563d5ffe3f1d6b19b574baa5cfbedc526 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 >">
- <context_menu label="Clothes" name="Clothes >">
+ <context_menu label="è¡£æœ" name="Clothes >">
<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 7314676c6ceae35be193d62a2822f8fff0da14c8..cd069f96017af11dbac2774059a827b7a467683e 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 1e645acc7a5e2ca04759e569f5f7f40442d4fb5c..5c5c225c59c74a424476650524d6a1bcd295c396 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 042f5c3a930c679875fadbfdbb3a2292336bff90..c60bebd3dcc29956db5f8b006f05999bc7baa165 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 488d80bfadcb5cd31753ec647c57d46d8cdfb29d..8e30a15562250199c9ac4c409c1cc85932cc643c 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 7ca805278a62ba6f46b2bfc0e690f958fa10d060..c208a146d2ff1daf3225c92f381a3ce8a18eaf05 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 d9254f7aff5e12f3bbf93ece0c804c90b1d01099..dc933518c0edfcc0425138e0ef0158fe74043186 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 2ed6cfad8992c7e39f303ce94a7d88bcb4aaff2a..6d8fbba50308d34c52c02dd9174d9b72ebdd29f1 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 41ea648803e8c4815abbc29fa4af6352bf51499c..dab95fcadc8a712105bff2b2237ab8474bd54f17 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 c88826708e43d5280dc9f2b17bf30aa78ddc855f..2d7da70bfc41351e22af380156460c6583a19051 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 >">
- <context_menu label="Clothes" name="Clothes >">
+ <context_menu label="è¡£æœ" name="Clothes >">
<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 086a89fc33115b359c61b41d654a8d4ab8b5a25b..fd8f73e4eacaf6a91b295491c6f06d884e2c45cb 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 1cfba8e989a0d87b021db53e3ce2cdaef97f0c8a..91996082003cf2310db9e87d7f9bc19d119b983a 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 8b0fd8c01408349c8f8e3a9d379fa5e8e5a082dc..8c938222e70fe5e60f629450f66bcfa448d1f93a 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 f91b479fb6157c5f7344063bfefde8924399659e..97b115151e97201e955799ef8c747b9e3b68e576 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 056c11e69d04eb1cc5abb9f4e139651262e2d454..436e86cb74f9b0595861039dc32711e44bfb294d 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 66b5fbe58d044e2ded0f0444a58b94cddb6b18ab..69df4929f2aa490f142b1c7c354848558f19dfe4 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 6e525cccd5555277e287597a9b098a0cdc78e6b0..7d8997fafe37bee4edb00dc8457f94936c14a99d 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 6107318a0e7231ff0496254acda2123352bf5f69..869c5f66fe5640669a27df88eacbad1279c78327 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 7cf6289bd17bc3a9300933d813bf93a317670d54..d27e75b83091c4fb5eccbd196cd638bed3cecff4 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 6befd163b3bf6d2314e1be3904a65a249dbef018..169dbf2187fa4df744833e7d82f0aef42c7ad570 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 9254aadf561be22e2748de887dda7b4c3735927b..a4614710f4be8b0c39aac4b1588cc26e37421534 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 c487c35588fc5a9412a4a93e1593db45da65498d..7b6f6f954e45c43d16d579bb835854103055b302 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 c2d7182a6c0c4d52d3372c16c01617d1e15b67ad..1d78c1de0ac5e2dce4fbcbdef3fb48a98f15ef6b 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 2c84a858af99069b45e4be53c2223d4f91f84ebe..06247ab2495585db028365a4ee5e002fda5be4c2 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 2ca0ad6a89c8d499db57da8ccdffe0ac780588b5..73b754e0594c52ae94a9221e28ca8db3b54a2052 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 a71609170be94e2d180c3ede69d98b44a26b5a77..4ffbcaff83cc718864029946fae26091a51155e7 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 5a4729abde6beb22d3a669a42fea8a0389152f8e..5b6e7335d65d8bba8aeb7ce9a61e9f4438bf50b0 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 & 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 3c78e9f92073191733e65392b75c239063700c89..2e88ac2d39b38a0ef3c468383fe12267cc80bad9 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 63e44d808ccf4074adaa6e01214c61692c6b2c2d..6ffdf329df6b973cebfaba2ae4c4ff4caa7bd4fa 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 e86fe7367ec9f00dfbc27f681695322bb081d441..d0b9438cfccb7e8a21a5e73fe3366dc7cde8ae82 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 e9658f72a2e033c517f8815c6d2cbde5d7d5cc20..7f1d091f440c7381428731c2ed76bd7b4c953233 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 66247d3fe6ed4dd7e2f1a0e8c5ffa5a5a58a53e2..8578751a28c59d8ead702855243987a20b04ff43 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 9c52ddfd187798cbe729945e0f4a673a0df7d4b6..2c5e3153bf8195cb8b015249cc56c9736250cfb3 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 7291239383b7ddb39c77cd3f83932687c2cbd338..2cea18105a74382a19b07f934ac385be68b2bb53 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 12989ea59c17bd15ef2c437d57d31b62f8ed8297..d188840588593e0c8a457e09197c2b630c5b7063 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 4d1aa5f74a31e7ed3f3037dbba966adb741bd43b..c636e108ad90752665dc6e347a3914111518d537 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 dc3981a4d8e993cc2708efed79ab95ad40a6b8a2..debaafaa1073e3fc08fe74403ee085db3aec7921 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 9f56edb9594189724a9ab78ce13ed555479ef4e3..3b667d429c7c6c881e9ff8247e3fd816e269f8c8 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 c574090a4a2fc099dcc29e13c6dd609cccd61494..2cbdd602cb6e34ee9a15da52b7ad1b99c656c6b8 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 1e56aa1a47722697cba74636f63e40a890233102..8eaea68c6f017e5ac8ae1e4a608c041e8afa6ac2 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 fc8922318fbefe88ff69336bc68e2fb4f2cfeffe..fbda20fd2f393a5787479c0fc1fabc48aae178e6 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 8ad8e4ba845ee39bb0020d53af7c77c3efa25474..d2f0b81a9d5ca95e37f56bd1c971c8a1f7098c50 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 d011ba8208e0ea486cac14e384e35bad2bb602d8..330c28238f74b761933395692a94846f3cf844d1 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 10d7c9cba00dc0a0c8c3d61cbe5d16ea83319404..afc15ce13ca44e1573d83678e500636788eafc66 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 cf4ff9f8ee2f671c489f652713712bb9838bb473..2fb247f250947ee5581bd0de9a7c42da0aa53647 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 c1035824873c8c5ef26a539f8ad070800337fa04..e3e4b4716d4dac378f78e809e3013f04a759ecdd 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 3b1f7820afd9618d72c20f349fa71fd88f43cf1e..6f6ca064c803f8aa58863e4948c5e104c2043b52 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 97f18f0936e972949c55af1ebd08e9b08d475462..c5c1f661fbd8a34a7be6f145e697176fb2aa5c2e 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 ebf9b80d277dff1e4a1df29072ca98640da10b9e..d9f4acb27b28afac3b5c27d2286f344875bffb10 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 5e82cb087f47a29e9faa89f597f6e9d5eb4fc618..c7d2853995f76ef8f446748cdf44a0fe19e3e297 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 1c9b68da1a8a730c5b52d751d378035ac1aa4098..ecc14867b85cc942f4476520a5887db44f55ba17 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 1c9b68da1a8a730c5b52d751d378035ac1aa4098..ecc14867b85cc942f4476520a5887db44f55ba17 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 b6c8784759569c1964bc5dde835ecc7dc64aa23f..51f242a1c2c1201bf9b36893eed52292988887a2 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 8b26c704305d9c9f0ff49af74017ab99c81e71d2..7652c1a1d02a05211c96050a09414aff3fd723cc 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 "[LANDMARK_NAME]" to your [FOLDER_NAME] folder.
+ ä½ å·²ç¶“æ·»åŠ "[LANDMARK_NAME]" åˆ°ä½ çš„ [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't allow it.
+ ä½ ä¸èƒ½å‰µé€ åœ°æ¨™ï¼Œå› ç‚ºåœ°ä¸»ä¸¦ä¸å…è¨±ä½ é€™æ¨£åšã€‚
</notification>
<notification name="CannotRecompileSelectObjectsNoScripts">
Not able to perform 'recompilation'.
@@ -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'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 "Apply" 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 'Revert' tool?
@@ -1259,7 +1259,7 @@ Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
Can't add estate owner to estate 'Banned Resident' list.
</notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
- Can'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 <nolink>[LOCATION]</nolink>?
- <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] <icon>[MATURITY_ICON]</icon>
<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 '[BODYREGION]' 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'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 0905cc30b6189c0987ab5941c046381218d7769e..42a4aa9e85f70feeb6aed0540c2798aedc0c01e1 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 641d0eba930cbc95924cefefc15d79fe93eea673..c9e47984e222153144f35d2d01a764b352003cfa 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 e7a94eafa88d7bcb65184cc27cd987747c0693c8..23b76eea9be90a7a818d11b4c106f712647aad58 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'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'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 d8327683dd10d674c0f96250c5c78f129688ee33..9ef4258f0bd3d58bc9deeae448de223c09a90f9c 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 4e7f261e63fbee73316a877cfd6e9f8d064ef03f..4c0174559efcc09c03c7d34c472bb3d931864fc0 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 6ddfbdaf4f7e4f353e3d2c0f088b49ba5e4294a0..94edb7ab712cf2078fa3c3897f579f56558575f7 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 eba6fa7c293f78416cf4482b4147a2d879ba1508..1185336a2d60db26f9e991b6b0552d3c5b6b3f78 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'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 9e63b9a3a8753c44ddc61694e6717a74bf48261c..309ab1c0d483c7885b7cd4d983703451018e6124 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 59bff5f3e99c82d2699081bda4a5572cfec0c3f8..a9e65419c268385bbfdff498f9463a6fd59d1f61 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 6558eda2538e4b71ba60f4f9dcf9156ed0717e87..6377bf413525337f574256ce0c57da67a8b02246 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 c6648808981b34406ae9849a29008226852595f6..9c542366bcb6c320168c9a953e5b133c3a0a9e8f 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 0709ad4e67a3f136b48867e42cf24743c2b457c4..0578fe9ef19a492823c34e76257a6b90af8664cb 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 388fee9eb3f65947dafa18e83b373e044ca6473a..df85f7deb2a06e96e039318085cf1a5d4d9a389d 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 d21c1181957f55d08e3c0cf321c6794bdf423d69..b453fdc7581be25436bd5d26cfb9362c9841395e 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 24ed9b9acb9780daa147115e857efd6fb6aa8793..7fb8392836b9b5130891fa9a4a9009b83791c8ec 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 44b93504d1d52b06adf1ea3edc5205ebf3a4c70d..321fb68756b73fe4c52671535b6998a48be635ae 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 d1ba9625f18ce8bf8162d8c2a0bd09cb087c0d63..7bf923b4ca4d8085e627107aa5c91c9f73e9ec9f 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 303aa80e114d407ae3e8a3eb682b0be0dfeb9904..096a83c87165ecd0f747e2bbb1efff3378ef61f2 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 1e61a65788ec5c6068b37e09c7821b7a2b484ab8..dab132bad2df5ead414e5ac2628b986cf244daa9 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 47d5db4fca9e7b3d517f640a0d9df7e24313cefc..82ab70bafc4a3911ae8b1de13af2859b870dacd9 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 cbfdcaae8e0ee4b214dcb2cbfe952c215029aafe..b28466877711cb81bb89f017cf840d8fd43d4a70 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 d68767d4d2f38a7c817fa8092a165ed93c07db57..21b5c1c6980cb4506e0811c7087e3230ae24bc2a 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 9ba578c1a11f62fa0973b670ac920c9120af842d..1e3c18f522bbbbfce7a8dc17e072afd78539996c 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 c65b139cb5343f61b7923867865da764c10c6fe0..2873d4cabb7a4d1d4a5505b313c194dd1447968d 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'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 90797e1473329dc595073e59ada3c22561601bec..4c65d2484cfdeb0d47273aef84dba786c5ce3f36 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 576760f747a29655bb4ff332065d5868994c3ccd..c9b17b5d67b79e1df1faf667e1b351c50d19d7b6 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 08a5e711d1f28458a7582a71c718d73f840f096c..71f139a3e6478eff408b179e39100b89570efcea 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 147c4859c6c315645854f1d93e762400bfba223c..175293cdf7fa8e9583ef0a99431e300107b53d40 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 a007c860636718644942d8bc81ba28f37f99cbc2..b4d7e3608e6c6edd6c905a6a42f5f3ff1429fbb8 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 2b15f4813aa07f5e4fd28566a50f617975bc2532..91f0f4125fd99592ab664eb711b7a508f553865e 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'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 8fdecad4205dc268ec51e6fd4b02cc978106c188..881f8eac0b819d1b2cdb48ed73a8d45e990e5878 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 16119f9e2cfb790f405c9d718ffdb852fa7b7a3a..d86ba7bc7ce1b5226104e70d8bfc1d549d5e0f6c 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 45f8edc3554e14fd08f962de532a91bd9907d85b..0ea3ea2226f62232809345bccef8c6ce04ca0f3f 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 2533b902033d6de587f6dda70954c86dfc4512a1..f7dada226f04da54ef6b51ec51933ce8bcd16a09 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 7a176a92c69e71e19a69767578646506263315dd..abdbfd7429b1807d895b0628646de14e9235781e 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 9e72dc9daffdc43dd5b0faa2ca96ba7f0cccba6d..f3163e3c19938babaff366c666c9b7cb6e9fbaad 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 b682ffda7dc90ddcc1464cc745f32883ba9f41be..be9711c8a60ee37a6993067e74463a703701b12b 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 & 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 & 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 f36608efb53224dc048ba4bf47cdf76a17f4f82f..e26ccdef73f82b4fbc453205c3994ba47fece2f3 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 c4bcf605e3756e6dfb9e354a8879d510f5cf75f6..26e03c9b3b90deb4a3ccd4bb8f502bc56828d5d6 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 12182b521ef397671c4776e1442a12354001ed94..cf804b517d1e7da74dc141f85bf594b7eb640116 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 fdc489f375ec6eabd344b633f4fb6eb00c3ccef3..a5d3afccb9e91ced3c180021595842f925a05b4a 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 97e423b8cc3821da1ffbca581aeeab3efd1f2841..6ceaf447a753d1a0e1a79f8f6452e6e1c6fb1ede 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 486b81e02405564c3b71356179f1125a07b6858e..dfd81a85cc1ce2717aafe87fcbb5510208ee188b 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 af417a79eff518976e4d4d5d0763ff01208ebb2e..92ec774f9bcd20e0e7f8c3b3fe254558fe0e0e85 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 36770c52c7249f7a98311b95ffcc5dd2137ae75a..a4b041469b609b48bda5ecddf536dc7b3a1647e0 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 49c36614dbbc2d74098e1960954de942f6fbf325..a1fec089407ad8492be73b77611bb5d4d3c90a29 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't find what you'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't find what you'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 75ecdb99a59fb3b4f678730411d15551f56a989e..44ae5703c603b4f1ef4d9f44196b9287bc9bca44 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 28a47ed003334b0f9359649ae6eac2ca85bf7a8a..3b356967f924aacac703dfe6b0e610ebde7e87e9 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 cef56eb907c29240034189b3c31a90b4419a4a4d..b0919c9151286bb118930f5299b8fddb4cb9997e 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 9a038c8b043f8e094e9256078b69a430e175e639..10524bc5f0a14111b893b152da870076f679212e 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 cad8d75470b98b8572dd92ff7a7be22cc1e5f56a..34b0e3800f35435647b5a1b9aeb8fdba7e228b16 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 261622d1365e2bfc6e89c9cd595efd3b1f9cdfb3..8d92eadd203c87be3277a5d0b8d776078f7c0c8b 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 32b3508af5ba3d4c88cc01abcc6c240369742bb4..e53d2a8c06e57f15ae0a859e1baa18cc38d0b77a 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 642edff33644456695f2f1371af3d60b6ca37d0d..68e149d866f5148d01d3fce6d759347a541f823c 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 acd0a54ebfa10039032e02cd83227dc0c241e57e..ff582d774b1ccb573687dbb74109e84eeb92a94d 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 847798e7a02f6a3e84378caea15772158f69f1bd..e0e091187227a67a702d7d8962077b9d9daf1eb2 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 'Start At' 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="登入時顯示我最愛的地標ä½ç½®ï¼ˆç¶“ç”± '開始於' 的下拉å¼é¸å–®ï¼‰" 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 88cd3a0e161f5769535dabe5530c9650000357c2..fafbf855de0069245da62afee670783d9fa6ca3c 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 0f30d5dcbe7feed9ce9e92da4771b1a26dd120fe..a8d7c8d6d119b33cba2d8b6bd1aaee93e8ea989c 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 & 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 892b743f57276d04fabf149e577dd77fe2c69543..dee3e3045fe8524cefeeb0584e8d70637b1baf31 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'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 687135bf659488519d99b476905d758323859db1..c1e43cef48c78e9b0eb0543e69ce87b33a799a7b 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 ce69ec59c4796f57a64bc6edfc4ad406f4af64e3..f2ccb6e1cf0fb1d4ce7d23616e21d993019b09df 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 42d70fddb8a5b4cfa319f85b1a0a5b953b9c278f..7b6152121fb91a44f2e6a0b16f0dbf96aae41cb8 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 b0f1bdb337139d112552810fc0eab3905ec9ac4a..03b845a76c9a8ea6eda1fc13c3702e4dfa5bd935 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 52764661174607880c4df7418db3100b661280f1..32cc2f9a5df4f97db301be519077d3a6c190e74c 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 1dc8278db18c38c73910581d9d5ff3813b2a4c59..cbb40e52def89b41ccd6c6d21c2f9ff629a32770 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 d99450b5be5f1d3e030d184ebc692ba980b44e5c..d0169b7c2d4333ec3aa01c04f13cc73e919aacc0 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 & Objects" name="panel_block_list_sidetray"/>
</panel_container>
</sidetray_tab>
<sidetray_tab description="Find places to go and places you'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 822b2b5894b9a1c2cbe649c9fd5a4d2d61d3fc3d..cdd79da30c3c9e650b76a7ff06d97ca99cf9da8c 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 279a9869a896a5cdfb84664d1e00914580a48c8d..1dd3acef5d0abdf64d2e18c3b1c127b5d247b39b 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 65740f1b6d202df585563afeb591f4f2f27b894f..9a59d627d08818068e8fefcfa51dbb7c153e4a70 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 872a4584bfd4956ec7e85adb0f6aa9c3660b4059..6c81ede76c470efbbc178c1c8eba01e197e590db 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't find what you'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 196f8c7a6a6e889d01c46beef0a63fbfaec46866..91015bb8b069411f121e2badcde90ad5e7f4ca74 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 'Edit Terrain'" longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow edit land" value="23"/>
<action description="Always allow 'Fly'" longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow fly" value="24"/>
<action description="Always allow 'Create Objects'" longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow create" value="25"/>
- <action description="Always allow 'Create Landmark'" longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow landmark" value="26"/>
+ <action description="總是å…許 'å‰µé€ åœ°æ¨™'" longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow landmark" value="26"/>
<action description="Allow 'Set Home to Here' on group land" longdescription="Members in a Role with this Ability can use World menu > Landmarks > Set Home to Here on a parcel deeded to this group." name="land allow set home" value="28"/>
<action description="Allow 'Event Hosting' 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 18328861353178262bd8c63fb6a6da98a7f20ab7..6f8f19b26d16f0cabd1846058e727faa34bded13 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 4230d60c457d6f9600777f1902b85c40710cf9b7..4cc16ed250205303d00fa9aaf7d4062bbf39220d 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 d1332ddb7c339d67bba362a87ebac14027d973e9..15437e3624cd5494379be6341699c812f02b8a9a 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 14d67d52b85b3c7907ebd42a448a9d3bb4881c4a..a011e29184b6f5533721cb5c8b90f24b0330862f 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'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 4eb845d791f739f65546f11c11596e2a6d99be76..c3f669c6869f8af16f551b047121834ae29dc413 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'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="察看全部 >>"/>
- <string name="GetMoreGestures" value="Get More >>"/>
- <string name="Animations" value="Animations,"/>
+ <string name="GetMoreGestures" value="å–得更多 >>"/>
+ <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="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 'busy mode' 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'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 33640f5feea4410060564d661df7f38275f234a6..9702832f44f5f6e0b7b6c0d22d2dde8ccb844f58 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 ccf3d4bf917461dcb594dc8925fa142cf61a9960..87177e285c96db6054971f4204e6074c24e5b887 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 00bdb748813ee6d973b9e63ba014b449da8e429c..b8ae93afd23e580fcece540ab8e9ba6cec714a78 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 7df2d7c4e08ea2e60ad228d224070a5876873f5e..5fb3e51575e6de31033413a2abe1f8a7a520d4ba 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 b4b964d096967a96d0aef66bde4790fb328ff9ee..728637de78ee2b4aae83f0d111b8bc0aca781b80 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 0000000000000000000000000000000000000000..254cf58437a20bbd0f396b41d2c4e7f8382d8c55
--- /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 f782d66ae79609ed747d7ca92b6f7214c9592c48..0989a3d0a1d695766ba86866d5c0df9b4e526187 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 7d4db6a630c22eb0fb771ef1e907ee25205b334e..1be6997813ebdb6ece11ffc7bc78825a2d858be1 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 7d3157ef451a7d86c2313c380b12307e5b8a7ca7..1e1c3411aeb61c09e0e0b012f918497119c989bd 100644
--- a/indra/newview/skins/minimal/xui/es/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_people.xml
@@ -52,6 +52,9 @@
<layout_panel name="chat_btn_lp">
<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
</layout_panel>
+ <layout_panel name="chat_btn_lp">
+ <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>
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 231a175ee5a303f67fd89c63725121ff2f097e6d..c3240fa541d866f6e3ab25f878b8bacb4bfdea43 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 0000000000000000000000000000000000000000..376a7d2b7251a69e32c9ece4950e2d8918131a92
--- /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'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 ef62901e9912a590960bac6c846472280a90d5cd..094d3e66de7806f466dfba6e2b1d1586ebb09041 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'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'aide rapide Second Life."/>
+ <bottomtray_button label="Aide rapide" name="show_help_btn" tool_tip="Afficher des infos d'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 1f2169e22cabe5f802648ff3287c4bc2328196ca..fdc5aeca4948cf1114b86f9299d23422eeef9733 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 88409a2a8678efa7d8d2ea094a58e10f0915b4b9..72fb4d807ff1f490ba96ffdbe8fef5c881072def 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_people.xml
@@ -52,6 +52,9 @@ Vous recherchez des résidents avec qui passer du temps ? Essayez avec le bouto
<layout_panel name="chat_btn_lp">
<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>
diff --git a/indra/newview/skins/minimal/xui/it/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/it/panel_bottomtray.xml
index 0eb0d0ee22ccf0d2b97cac9b85233872fee3d8ef..ab9b175f16bbe23215facd4f5479ea751f4f615a 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'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 76b28eab24a4d6ed54e028e323f9c658d6a97c28..756db84c1c718ef45e3f2628df17842ec07a02dd 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 fe81ec47f864aa28125f0675c60a69ce4934c5ea..13be2cea0af6a8047aeafe843a78f289c800396b 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">
diff --git a/indra/newview/skins/minimal/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/pt/menu_inspect_avatar_gear.xml
index f7fe5640ef55e2ee5882c2b43e5b1201efea749f..90b321e0a2f90d51d75d0803cba304f3ebabdd60 100644
--- a/indra/newview/skins/minimal/xui/pt/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/pt/menu_inspect_avatar_gear.xml
@@ -3,6 +3,7 @@
<menu_item_call label="Ver perfil" name="view_profile"/>
<menu_item_call label="Adicionar amigo..." name="add_friend"/>
<menu_item_call label="MI" name="im"/>
+ <menu_item_call label="Ligar" name="call"/>
<menu_item_call label="Teletransportar" name="teleport"/>
<menu_item_call label="Bloquear" name="block"/>
<menu_item_call label="Desbloquear" name="unblock"/>
diff --git a/indra/newview/skins/minimal/xui/pt/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/pt/panel_bottomtray.xml
index f67823dbd80dfc140b0f20d31f84b7c0eea3a940..9b4eb2c2b8a8b94784da371d25df1079a64be7cb 100644
--- a/indra/newview/skins/minimal/xui/pt/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/pt/panel_bottomtray.xml
@@ -4,26 +4,32 @@
<string name="SpeakBtnToolTip" value="Liga e desliga o microfone"/>
<string name="VoiceControlBtnToolTip" value="Mostra/oculta os controles de voz"/>
<layout_stack name="toolbar_stack">
+ <layout_panel name="speak_panel">
+ <button label="Falar" name="speak_btn" tool_tip="Ligar/desligar seu microfone"/>
+ </layout_panel>
+ <layout_panel name="speak_flyout_panel">
+ <button label="" name="flyout_btn" tool_tip="Mudar as preferências de áudio"/>
+ </layout_panel>
<layout_panel name="gesture_panel">
- <gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
+ <gesture_combo_list label="Gesto" name="Gesture" tool_tip="Fazer seu avatar agir"/>
</layout_panel>
<layout_panel name="cam_panel">
- <bottomtray_button label="Exibir" name="camera_btn" tool_tip="Mostra/oculta os controles da câmera"/>
+ <bottomtray_button label="Exibir" name="camera_btn" tool_tip="Controlar ângulo da câmera"/>
</layout_panel>
- <layout_panel name="avatar_and_destinations_panel">
- <bottomtray_button label="Destinos" name="destination_btn" tool_tip="Exibe janela de pessoas"/>
+ <layout_panel name="destinations_panel">
+ <bottomtray_button label="Destinos" name="destination_btn" tool_tip="Viajar no Second Life"/>
</layout_panel>
- <layout_panel name="avatar_and_destinations_panel">
- <bottomtray_button label="Meu avatar" name="avatar_btn"/>
+ <layout_panel name="avatar_panel">
+ <bottomtray_button label="Meu avatar" name="avatar_btn" tool_tip="Trocar seu visual"/>
</layout_panel>
<layout_panel name="people_panel">
- <bottomtray_button label="Pessoas" name="show_people_button" tool_tip="Exibe as pessoas"/>
+ <bottomtray_button label="Pessoas" name="show_people_button" tool_tip="Encontrar pessoas no Second Life"/>
</layout_panel>
<layout_panel name="profile_panel">
- <bottomtray_button label="Perfil" name="show_profile_btn" tool_tip="Exibe o perfil"/>
+ <bottomtray_button label="Perfil" name="show_profile_btn" tool_tip="Ver e editar seu perfil"/>
</layout_panel>
<layout_panel name="howto_panel">
- <bottomtray_button label="Como..." name="show_help_btn" tool_tip="Abrir "Como..." do Second Life"/>
+ <bottomtray_button label="Como..." name="show_help_btn" tool_tip="Opções de ajuda do Second Life"/>
</layout_panel>
<layout_panel name="im_well_panel">
<chiclet_im_well name="im_well">
diff --git a/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml
index 91b7d1b7cd08fefa9eb85d4d9939d11a80a058b9..d223ee9c696d2297eb5f35a8e2999cc27d208d00 100644
--- a/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml
@@ -5,7 +5,7 @@
<button label="Perfil" name="view_profile_btn"/>
</layout_panel>
<layout_panel name="add_friend_btn_panel">
- <button label="Adicionar amigo" name="add_friend_btn"/>
+ <button label="Adicionar amigo..." name="add_friend_btn"/>
</layout_panel>
<layout_panel name="teleport_btn_panel">
<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
diff --git a/indra/newview/skins/minimal/xui/pt/panel_people.xml b/indra/newview/skins/minimal/xui/pt/panel_people.xml
index 935ade2177b838ed4f04ed7d898be7f2a8de6c57..d46c440eb966d738d2f86635de8a4c101ade417f 100644
--- a/indra/newview/skins/minimal/xui/pt/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/pt/panel_people.xml
@@ -52,6 +52,9 @@ Em busca de alguém para conversar? Confira o botão Destinos abaixo.
<layout_panel name="chat_btn_lp">
<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
</layout_panel>
+ <layout_panel name="chat_btn_lp">
+ <button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
+ </layout_panel>
<layout_panel name="chat_btn_lp">
<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
</layout_panel>