[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, upstream, updated. upstream/1.21.6-13-g1836a2b
Robin Cornelius
robin.cornelius at gmail.com
Tue Apr 14 11:12:10 UTC 2009
The following commit has been merged in the upstream branch:
commit 424b1d31b32ad667924bb896c3653209e937437d
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date: Sat Dec 20 16:58:25 2008 +0000
Imported Upstream version 1.22.4
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e609650..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,36 +0,0 @@
-topic/debian/71_use_debian_alternatives_for_www_browser.diff -p1
-topic/debian/Allow_CXXFLAGS_to_specifiy_the_debug_flag.diff -p1
-topic/debian/VWR-8751-Build-with-a-shared-llmozlib2.diff -p1
-topic/debian/remove_as_needed.diff -p1
-topic/debian/use_debian-included_fonts.diff -p1
-topic/debian/use_debian_channel.diff -p1
-topic/debian/viewericon.diff -p1
-topic/features/jira-backported/VWR-5082_set_bulk_inv_permissions.diff -p1
-topic/features/jira-backported/avatar_list.diff -p1
-topic/features/jira-sent/24_always_test_vectorize.diff -p1
-topic/features/jira-sent/openal_1.21.0.diff -p1
-topic/fixes/jira-backported/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION.diff -p1
-topic/fixes/jira-backported/VWR5717_text_not_replaced_by_input_with_japanses_im.diff -p1
-topic/fixes/jira-backported/glh_linear.diff -p1
-topic/fixes/jira-sent/50_get_cpu_clock_count_for_more_than_just_i386.diff -p1
-topic/fixes/jira-sent/59_need_llpreprocessor_to_access_endian_macros.diff -p1
-topic/fixes/jira-sent/VWR-1815_top_corner_fix.diff -p1
-topic/fixes/jira-sent/VWR-8194_clamp_outline_for_broken_nvidia.diff -p1
-topic/fixes/jira-sent/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.diff -p1
-topic/fixes/jira-sent/correctly_find_dbus_headers_on_standalone.diff -p1
-topic/fixes/jira-sent/dont_depend_on_artwork_to_build.diff -p1
-topic/fixes/jira-sent/gcc_warning_on_llwindowsdl_var_not_set.diff -p1
-topic/fixes/jira-sent/lltemplatemessagereader_memcpy.diff -p1
-topic/fixes/jira-sent/use_c_locale_and_dont_spam_me_because_i_am_not_american.diff -p1
-topic/fixes/new/allow_compilation_when_GST_DISABLE_GST_DEBUG_is_defined.diff -p1
-topic/fixes/new/delete_LLImageTGA_mColorMap_as_array.diff -p1
-topic/fixes/new/delete_LLMediaImplGStreamer_mediaData_as_array.diff -p1
-topic/fixes/thirdparty/0000_keep_statbars_from_overshooting.patch.diff -p1
-topic/fixes/thirdparty/0001_possible_crash_and_leak_llassetstorage.patch.diff -p1
-topic/fixes/thirdparty/0001_possible_crash_in_llviewerpartssim.diff -p1
-topic/fixes/thirdparty/1294_llworkerthread_when_terminating_program.patch.diff -p1
-topic/fixes/thirdparty/1857_apr_thread_mutex_nested.patch.diff -p1
-topic/fixes/thirdparty/2003_possible_crash_draganddrop.patch.diff -p1
-topic/fixes/thirdparty/2543_possible_crash_in_group_voting_propsals.patch.diff -p1
-topic/fixes/thirdparty/2683_possible_crash_update_speaker_list.patch.diff -p1
-topic/pandora/add_support_for_libcwd.diff -p1
diff --git a/debian/patches/topic/debian/71_use_debian_alternatives_for_www_browser.diff b/debian/patches/topic/debian/71_use_debian_alternatives_for_www_browser.diff
deleted file mode 100644
index f748305..0000000
--- a/debian/patches/topic/debian/71_use_debian_alternatives_for_www_browser.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/debian/71_use_debian_alternatives_for_www_browser
-
-Fix the launch_url.sh script to use the debian system prefered browser choice.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/newview/linux_tools/launch_url.sh | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/indra/newview/linux_tools/launch_url.sh b/indra/newview/linux_tools/launch_url.sh
-index d2c8919..33cee0e 100755
---- a/indra/newview/linux_tools/launch_url.sh
-+++ b/indra/newview/linux_tools/launch_url.sh
-@@ -8,6 +8,7 @@
- # On Unixoids we try, in order of decreasing priority:
- # - $BROWSER if set (preferred)
- # - kfmclient openURL
-+# - gnome-open
- # - x-www-browser
- # - opera
- # - firefox
-@@ -54,6 +55,13 @@ if which kfmclient >/dev/null; then
- exit
- fi
-
-+# else gnome-open
-+# (embodies gnome concept of 'preferred browser')
-+if which gnome-open >/dev/null; then
-+ gnome-open "$URL" &
-+ exit
-+fi
-+
- # else x-www-browser
- # (Debianesque idea of a working X browser)
- if which x-www-browser >/dev/null; then
---
-tg: (c4044c3..) topic/debian/71_use_debian_alternatives_for_www_browser (depends on: master)
diff --git a/debian/patches/topic/debian/Allow_CXXFLAGS_to_specifiy_the_debug_flag.diff b/debian/patches/topic/debian/Allow_CXXFLAGS_to_specifiy_the_debug_flag.diff
deleted file mode 100644
index 6fef472..0000000
--- a/debian/patches/topic/debian/Allow_CXXFLAGS_to_specifiy_the_debug_flag.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/debian/Allow_CXXFLAGS_to_specifiy_the_debug_flag
-
-Modify 00-Common.cmake to allow custom CXXFLAGS to take effect
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/cmake/00-Common.cmake | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
-index bf2d2c3..0d1092b 100644
---- a/indra/cmake/00-Common.cmake
-+++ b/indra/cmake/00-Common.cmake
-@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
- set(CMAKE_CXX_FLAGS_RELEASE
- "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-- "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
-+ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
-
-
- # Don't bother with a MinSizeRel build.
-@@ -123,7 +123,6 @@ if (LINUX)
- -fno-math-errno
- -fno-strict-aliasing
- -fsigned-char
-- -g
- -pthread
- )
-
-@@ -158,7 +157,7 @@ if (LINUX)
- endif (NOT STANDALONE)
- endif (VIEWER)
-
-- set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
-+ set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
- endif (LINUX)
-
---
-tg: (0c72528..) topic/debian/Allow_CXXFLAGS_to_specifiy_the_debug_flag (depends on: master)
diff --git a/debian/patches/topic/debian/VWR-8751-Build-with-a-shared-llmozlib2.diff b/debian/patches/topic/debian/VWR-8751-Build-with-a-shared-llmozlib2.diff
deleted file mode 100644
index f9bb7f2..0000000
--- a/debian/patches/topic/debian/VWR-8751-Build-with-a-shared-llmozlib2.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/debian/VWR-8751-Build-with-a-shared-llmozlib2
-
-This allows us to use a dynamic libllmozlib library.
-Upstream are not currently interested in this.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/cmake/Mozlib.cmake | 7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/indra/cmake/Mozlib.cmake b/indra/cmake/Mozlib.cmake
-index e9555df..7073892 100644
---- a/indra/cmake/Mozlib.cmake
-+++ b/indra/cmake/Mozlib.cmake
-@@ -18,13 +18,6 @@ if (MOZLIB)
- link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
- set(MOZLIB_LIBRARIES
- llmozlib2
-- mozjs
-- nspr4
-- plc4
-- plds4
-- xpcom
-- xul
-- profdirserviceprovider_s
- )
- elseif (WINDOWS)
- if (MSVC71)
---
-tg: (737df0b..) topic/debian/VWR-8751-Build-with-a-shared-llmozlib2 (depends on: master)
diff --git a/debian/patches/topic/debian/remove_as_needed.diff b/debian/patches/topic/debian/remove_as_needed.diff
deleted file mode 100644
index f86e0bc..0000000
--- a/debian/patches/topic/debian/remove_as_needed.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/debian/remove_as_needed
-
-This was needed to build on ubuntu, which i am keeping syncronised with as well.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/linux_crash_logger/CMakeLists.txt | 2 --
- indra/newview/CMakeLists.txt | 1 -
- 2 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
-index 6f6754e..0711791 100644
---- a/indra/linux_crash_logger/CMakeLists.txt
-+++ b/indra/linux_crash_logger/CMakeLists.txt
-@@ -38,8 +38,6 @@ list(APPEND linux_crash_logger_SOURCE_FILES
- ${linux_crash_logger_HEADER_FILES}
- )
-
--list(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
--
- add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
-
- target_link_libraries(linux-crash-logger
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..8da6128 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -878,7 +878,6 @@ endif (DARWIN)
- if (LINUX)
- LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
- LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
-- LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
-
- set(viewer_LIBRARIES
- Xinerama
---
-tg: (c93c6d6..) topic/debian/remove_as_needed (depends on: master)
diff --git a/debian/patches/topic/debian/use_debian-included_fonts.diff b/debian/patches/topic/debian/use_debian-included_fonts.diff
deleted file mode 100644
index 53c95c1..0000000
--- a/debian/patches/topic/debian/use_debian-included_fonts.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/debian/use_debian-included_fonts
-
-Choose fonts that are included on a debian system.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/newview/app_settings/settings.xml | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
-index 9dac926..d520f78 100644
---- a/indra/newview/app_settings/settings.xml
-+++ b/indra/newview/app_settings/settings.xml
-@@ -3477,7 +3477,7 @@
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
-- <string>profontwindows.ttf</string>
-+ <string>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</string>
- </map>
- <key>FontSansSerif</key>
- <map>
-@@ -3488,7 +3488,7 @@
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
-- <string>MtBkLfRg.ttf</string>
-+ <string>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</string>
- </map>
- <key>FontSansSerifBold</key>
- <map>
-@@ -3499,7 +3499,7 @@
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
-- <string>MtBdLfRg.ttf</string>
-+ <string>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</string>
- </map>
- <key>FontSansSerifFallback</key>
- <map>
---
-tg: (076afc1..) topic/debian/use_debian-included_fonts (depends on: master)
diff --git a/debian/patches/topic/debian/use_debian_channel.diff b/debian/patches/topic/debian/use_debian_channel.diff
deleted file mode 100644
index a884ea4..0000000
--- a/debian/patches/topic/debian/use_debian_channel.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/debian/use_debian_channel
-
-Patch to use a custom viewer channel to connect to the SecondLife servers
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llcommon/llversionviewer.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
-index 6ff2604..e6b1a0a 100644
---- a/indra/llcommon/llversionviewer.h
-+++ b/indra/llcommon/llversionviewer.h
-@@ -37,6 +37,6 @@ const S32 LL_VERSION_MINOR = 22;
- const S32 LL_VERSION_PATCH = 1;
- const S32 LL_VERSION_BUILD = 0;
-
--const char * const LL_CHANNEL = "Second Life Release";
-+const char * const LL_CHANNEL = "Open Metaverse Viewer";
-
- #endif
---
-tg: (77f403d..) topic/debian/use_debian_channel (depends on: master)
diff --git a/debian/patches/topic/debian/viewericon.diff b/debian/patches/topic/debian/viewericon.diff
deleted file mode 100644
index 813d3d3..0000000
--- a/debian/patches/topic/debian/viewericon.diff
+++ /dev/null
@@ -1,717 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/debian/viewericon
-
-Adds an XPM icon to the build.
-This should be removed and the icon should be added directly in debian/ and not applied as a patch.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/newview/res/viewericon.xpm | 697 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 697 insertions(+), 0 deletions(-)
-
-diff --git a/indra/newview/res/viewericon.xpm b/indra/newview/res/viewericon.xpm
-new file mode 100644
-index 0000000..7cf88ad
---- /dev/null
-+++ b/indra/newview/res/viewericon.xpm
-@@ -0,0 +1,697 @@
-+/* XPM */
-+static char * viewericon_xpm[] = {
-+"32 32 662 2",
-+" c None",
-+". c #2594FF",
-+"+ c #2693FF",
-+"@ c #2894FF",
-+"# c #2996FF",
-+"$ c #2B98FF",
-+"% c #2C9AFF",
-+"& c #2E99FF",
-+"* c #319AFF",
-+"= c #319BFF",
-+"- c #329CFF",
-+"; c #339EFF",
-+"> c #349EFF",
-+", c #329DFF",
-+"' c #3099FF",
-+") c #2D99FF",
-+"! c #2A97FF",
-+"~ c #2191FF",
-+"{ c #2692FF",
-+"] c #2994FF",
-+"^ c #2A96FF",
-+"/ c #2B9AFF",
-+"( c #329BFF",
-+"_ c #359FFF",
-+": c #35A0FF",
-+"< c #36A0FF",
-+"[ c #359EFF",
-+"} c #2E98FF",
-+"| c #2293FF",
-+"1 c #2995FF",
-+"2 c #339DFF",
-+"3 c #369FFF",
-+"4 c #2D9AFF",
-+"5 c #2394FF",
-+"6 c #2F98FF",
-+"7 c #38A2FF",
-+"8 c #39A2FF",
-+"9 c #3BA4FF",
-+"0 c #3AA3FF",
-+"a c #38A1FF",
-+"b c #37A1FF",
-+"c c #309AFF",
-+"d c #2593FF",
-+"e c #2997FF",
-+"f c #349FFF",
-+"g c #3BA3FF",
-+"h c #3CA4FF",
-+"i c #3EA6FF",
-+"j c #3EA7FF",
-+"k c #3FA7FF",
-+"l c #2D91FE",
-+"m c #298BFC",
-+"n c #298AFA",
-+"o c #2989FA",
-+"p c #2889FA",
-+"q c #2688F8",
-+"r c #2486F8",
-+"s c #2386F8",
-+"t c #2488FA",
-+"u c #2E96FE",
-+"v c #2893FF",
-+"w c #3DA5FF",
-+"x c #3FA8FF",
-+"y c #2F96FE",
-+"z c #1978F4",
-+"A c #136DEE",
-+"B c #126AEB",
-+"C c #1269EA",
-+"D c #116AE9",
-+"E c #106AE8",
-+"F c #1069E6",
-+"G c #1068E6",
-+"H c #116AEA",
-+"I c #1C7BF7",
-+"J c #2A94FF",
-+"K c #3AA2FF",
-+"L c #3DA6FF",
-+"M c #40ADFF",
-+"N c #41AEFF",
-+"O c #43B0FF",
-+"P c #2D95FD",
-+"Q c #1472EF",
-+"R c #0F69E6",
-+"S c #0D67E2",
-+"T c #0D66E1",
-+"U c #0C65E0",
-+"V c #0C64E0",
-+"W c #0C63E0",
-+"X c #0E64E2",
-+"Y c #1874F2",
-+"Z c #2C96FF",
-+"` c #2E97FE",
-+" . c #2A91FE",
-+".. c #2C93FE",
-+"+. c #2F94FE",
-+"@. c #3097FE",
-+"#. c #3098FE",
-+"$. c #3197FE",
-+"%. c #359BFE",
-+"&. c #40ACFF",
-+"*. c #44B1FF",
-+"=. c #45B2FF",
-+"-. c #46B2FF",
-+";. c #47B3FF",
-+">. c #3098FD",
-+",. c #1475EE",
-+"'. c #0E6AE6",
-+"). c #0C69E2",
-+"!. c #0C68E1",
-+"~. c #0C67E0",
-+"{. c #0C66E0",
-+"]. c #0B63E0",
-+"^. c #0E65E2",
-+"/. c #1876F2",
-+"(. c #2C97FF",
-+"_. c #309BFF",
-+":. c #1473F6",
-+"<. c #1069F3",
-+"[. c #106CF3",
-+"}. c #1069F4",
-+"|. c #1068F8",
-+"1. c #106CF8",
-+"2. c #106DF6",
-+"3. c #116EF6",
-+"4. c #1475F8",
-+"5. c #39A3FE",
-+"6. c #3099FE",
-+"7. c #1478F0",
-+"8. c #0E6CE7",
-+"9. c #0C6AE4",
-+"0. c #0E67E2",
-+"a. c #1878F3",
-+"b. c #319BFE",
-+"c. c #116DF4",
-+"d. c #106AF3",
-+"e. c #106AF4",
-+"f. c #1067F7",
-+"g. c #106BF8",
-+"h. c #106DF8",
-+"i. c #106DF5",
-+"j. c #1271F7",
-+"k. c #1577F8",
-+"l. c #36A0FE",
-+"m. c #319AFE",
-+"n. c #147AF0",
-+"o. c #0E6EE8",
-+"p. c #0C6CE6",
-+"q. c #0C68E2",
-+"r. c #0E68E4",
-+"s. c #1A7BF4",
-+"t. c #2D97FF",
-+"u. c #329CFE",
-+"v. c #126EF4",
-+"w. c #1068F5",
-+"x. c #1069F8",
-+"y. c #106EF8",
-+"z. c #106EF4",
-+"A. c #1270F7",
-+"B. c #1477F8",
-+"C. c #1578F8",
-+"D. c #369FFE",
-+"E. c #319BFD",
-+"F. c #1479EF",
-+"G. c #0E6EE7",
-+"H. c #0C6BE5",
-+"I. c #0F6AE6",
-+"J. c #1B7CF5",
-+"K. c #1270F4",
-+"L. c #106BF3",
-+"M. c #1374F8",
-+"N. c #369EFE",
-+"O. c #3099FB",
-+"P. c #1272E8",
-+"Q. c #0C6ADF",
-+"R. c #0C6AE0",
-+"S. c #0C6CE4",
-+"T. c #0F6AE7",
-+"U. c #1C7CF5",
-+"V. c #3EA5FF",
-+"W. c #329DFE",
-+"X. c #106DF7",
-+"Y. c #106EF5",
-+"Z. c #1271F8",
-+"`. c #116DF0",
-+" + c #0D62DE",
-+".+ c #0D60DB",
-+"++ c #257DF0",
-+"@+ c #318CF6",
-+"#+ c #318EF9",
-+"$+ c #328EF9",
-+"%+ c #2079EA",
-+"&+ c #0B5ACA",
-+"*+ c #0857C6",
-+"=+ c #0A61D3",
-+"-+ c #0C6CE5",
-+";+ c #1C7AF5",
-+">+ c #3A91FA",
-+",+ c #3D94FA",
-+"'+ c #3A92FA",
-+")+ c #1969EC",
-+"!+ c #1761EE",
-+"~+ c #1764F0",
-+"{+ c #1767EE",
-+"]+ c #1868ED",
-+"^+ c #1A6AEE",
-+"/+ c #0D48BD",
-+"(+ c #0A42AC",
-+"_+ c #0B40AB",
-+":+ c #164DCE",
-+"<+ c #1D54DB",
-+"[+ c #1D54DC",
-+"}+ c #134AC5",
-+"|+ c #083B9F",
-+"1+ c #083CA2",
-+"2+ c #0C4BB6",
-+"3+ c #1261D4",
-+"4+ c #1465DD",
-+"5+ c #1365DE",
-+"6+ c #1564DE",
-+"7+ c #1766E2",
-+"8+ c #2476EF",
-+"9+ c #4599FC",
-+"0+ c #469BFC",
-+"a+ c #3A93FC",
-+"b+ c #5273EE",
-+"c+ c #5574EE",
-+"d+ c #5272EC",
-+"e+ c #2F53D4",
-+"f+ c #2C4ED6",
-+"g+ c #2C52D7",
-+"h+ c #2C52D5",
-+"i+ c #2E54D6",
-+"j+ c #3053D4",
-+"k+ c #1E3BA8",
-+"l+ c #1C38A3",
-+"m+ c #1D38A3",
-+"n+ c #2C40BC",
-+"o+ c #3545C6",
-+"p+ c #3544C6",
-+"q+ c #283EB6",
-+"r+ c #1A349B",
-+"s+ c #193398",
-+"t+ c #1E3AA3",
-+"u+ c #2A4FC1",
-+"v+ c #2C55CA",
-+"w+ c #2B55CC",
-+"x+ c #2C55CC",
-+"y+ c #2C55CD",
-+"z+ c #2F56CF",
-+"A+ c #3E61DA",
-+"B+ c #5C78F0",
-+"C+ c #5E79F2",
-+"D+ c #5272F5",
-+"E+ c #5573EE",
-+"F+ c #5271EC",
-+"G+ c #2C4ED5",
-+"H+ c #2D52D3",
-+"I+ c #2E55D4",
-+"J+ c #3154D3",
-+"K+ c #1E3AA7",
-+"L+ c #1C39A2",
-+"M+ c #1C38A2",
-+"N+ c #2C42BC",
-+"O+ c #3444C4",
-+"P+ c #3344C3",
-+"Q+ c #2D42BF",
-+"R+ c #203AA9",
-+"S+ c #1C36A2",
-+"T+ c #2440B0",
-+"U+ c #385DD0",
-+"V+ c #3C63D6",
-+"W+ c #3B62D6",
-+"X+ c #3C62D7",
-+"Y+ c #3D64D8",
-+"Z+ c #4C6FE4",
-+"`+ c #5C78EE",
-+" @ c #5170F2",
-+".@ c #5272EB",
-+"+@ c #5273EB",
-+"@@ c #5172EA",
-+"#@ c #385CD9",
-+"$@ c #2E51D4",
-+"%@ c #2E54D4",
-+"&@ c #2F54D2",
-+"*@ c #3056D4",
-+"=@ c #3256D2",
-+"-@ c #1E3AA6",
-+";@ c #1D39A2",
-+">@ c #1F3BA9",
-+",@ c #2C43BE",
-+"'@ c #3244C2",
-+")@ c #3244C1",
-+"!@ c #3247C5",
-+"~@ c #314CCA",
-+"{@ c #385AD4",
-+"]@ c #557DEF",
-+"^@ c #557EEF",
-+"/@ c #547DEE",
-+"(@ c #517EEE",
-+"_@ c #507EEE",
-+":@ c #4C7AEC",
-+"<@ c #4C78EA",
-+"[@ c #4770EE",
-+"}@ c #5072E7",
-+"|@ c #5173E7",
-+"1@ c #5474E6",
-+"2@ c #5574E7",
-+"3@ c #5575E8",
-+"4@ c #5776E8",
-+"5@ c #5978E9",
-+"6@ c #5B78EA",
-+"7@ c #3147C2",
-+"8@ c #2D42BD",
-+"9@ c #2C42BE",
-+"0@ c #3043BE",
-+"a@ c #3144BE",
-+"b@ c #3144BF",
-+"c@ c #3153CC",
-+"d@ c #3058CD",
-+"e@ c #3661D5",
-+"f@ c #4F7DEC",
-+"g@ c #507EEC",
-+"h@ c #4D7EEB",
-+"i@ c #4C7EEB",
-+"j@ c #4B7FEA",
-+"k@ c #4B7FE9",
-+"l@ c #4A7EEA",
-+"m@ c #467BE9",
-+"n@ c #467AE5",
-+"o@ c #4370E8",
-+"p@ c #4E72E2",
-+"q@ c #4F72E2",
-+"r@ c #5072E2",
-+"s@ c #5574E2",
-+"t@ c #5877E5",
-+"u@ c #5878E5",
-+"v@ c #5978E6",
-+"w@ c #5C7DE8",
-+"x@ c #5D7CE9",
-+"y@ c #2F48C0",
-+"z@ c #2A42BA",
-+"A@ c #2D41BA",
-+"B@ c #3042BA",
-+"C@ c #3043BA",
-+"D@ c #3043B9",
-+"E@ c #3046BD",
-+"F@ c #2E57C8",
-+"G@ c #2E58C8",
-+"H@ c #3460D0",
-+"I@ c #4F7DE8",
-+"J@ c #4C7EE6",
-+"K@ c #4A7FE6",
-+"L@ c #4A7FE5",
-+"M@ c #4A7FE4",
-+"N@ c #477CE4",
-+"O@ c #457AE4",
-+"P@ c #4478DE",
-+"Q@ c #406FE4",
-+"R@ c #4B70DE",
-+"S@ c #4D72DE",
-+"T@ c #4E72DE",
-+"U@ c #5073DD",
-+"V@ c #5675DF",
-+"W@ c #5676E1",
-+"X@ c #587AE2",
-+"Y@ c #5A7CE4",
-+"Z@ c #2E48BB",
-+"`@ c #2942B6",
-+" # c #2A42B6",
-+".# c #2E42B5",
-+"+# c #2E43B5",
-+"@# c #2E42B4",
-+"## c #2D44B6",
-+"$# c #2C56C4",
-+"%# c #2C58C4",
-+"&# c #3260CC",
-+"*# c #4B7DE2",
-+"=# c #497DE0",
-+"-# c #477DE0",
-+";# c #487DE0",
-+"># c #467EE0",
-+",# c #467EDF",
-+"'# c #457DDE",
-+")# c #437ADD",
-+"!# c #4279DD",
-+"~# c #4177D9",
-+"{# c #3E6EDE",
-+"]# c #486ED8",
-+"^# c #4B71D9",
-+"/# c #4B72D9",
-+"(# c #4D72D8",
-+"_# c #5374DA",
-+":# c #5475DB",
-+"<# c #5578DC",
-+"[# c #567ADD",
-+"}# c #2C48B7",
-+"|# c #2742B1",
-+"1# c #2A42B1",
-+"2# c #2C42B1",
-+"3# c #2C42B0",
-+"4# c #2B44B2",
-+"5# c #2A56BF",
-+"6# c #2A57BF",
-+"7# c #315EC7",
-+"8# c #467CDC",
-+"9# c #457CDA",
-+"0# c #447CDA",
-+"a# c #437CDA",
-+"b# c #437CD8",
-+"c# c #427CD8",
-+"d# c #427AD8",
-+"e# c #4077D7",
-+"f# c #3F76D5",
-+"g# c #3F75D4",
-+"h# c #3C6FD8",
-+"i# c #466ED2",
-+"j# c #486ED4",
-+"k# c #4A70D4",
-+"l# c #4A70D3",
-+"m# c #4E72D4",
-+"n# c #5174D6",
-+"o# c #5074D6",
-+"p# c #5276D6",
-+"q# c #5277D6",
-+"r# c #2A46B2",
-+"s# c #2540AC",
-+"t# c #2840AC",
-+"u# c #2A42AC",
-+"v# c #2A41AC",
-+"w# c #2A44AE",
-+"x# c #2955BA",
-+"y# c #2856BA",
-+"z# c #2E5EC2",
-+"A# c #447AD6",
-+"B# c #437AD5",
-+"C# c #417AD4",
-+"D# c #407AD2",
-+"E# c #3F79D1",
-+"F# c #3E78D0",
-+"G# c #3E76D1",
-+"H# c #3E75D2",
-+"I# c #3C74CF",
-+"J# c #3B73CE",
-+"K# c #3A6FD5",
-+"L# c #436CCC",
-+"M# c #456ECE",
-+"N# c #466FCE",
-+"O# c #4A71CE",
-+"P# c #4E73D0",
-+"Q# c #4E74D0",
-+"R# c #4F74D0",
-+"S# c #4E74CF",
-+"T# c #2846AD",
-+"U# c #2440A8",
-+"V# c #2340A8",
-+"W# c #2640A7",
-+"X# c #2740A7",
-+"Y# c #2841A7",
-+"Z# c #2843A9",
-+"`# c #2652B5",
-+" $ c #2552B5",
-+".$ c #2B5CBC",
-+"+$ c #417AD0",
-+"@$ c #3F79CE",
-+"#$ c #3E78CC",
-+"$$ c #3C76CA",
-+"%$ c #3B76C8",
-+"&$ c #3B74C9",
-+"*$ c #3B74CC",
-+"=$ c #3A73CD",
-+"-$ c #3871CA",
-+";$ c #3870C9",
-+">$ c #386ED0",
-+",$ c #426CC7",
-+"'$ c #426CC9",
-+")$ c #446EC9",
-+"!$ c #466FC9",
-+"~$ c #4A72CA",
-+"{$ c #4C73CC",
-+"]$ c #4B72CB",
-+"^$ c #2E4FB0",
-+"/$ c #2340A4",
-+"($ c #223FA4",
-+"_$ c #223FA3",
-+":$ c #233FA3",
-+"<$ c #2442A5",
-+"[$ c #224FB0",
-+"}$ c #2350B2",
-+"|$ c #2E62BC",
-+"1$ c #3E79CB",
-+"2$ c #3B77C8",
-+"3$ c #3A76C5",
-+"4$ c #3873C2",
-+"5$ c #3771C2",
-+"6$ c #3771C5",
-+"7$ c #3771C8",
-+"8$ c #3770C6",
-+"9$ c #3670C5",
-+"0$ c #366FC6",
-+"a$ c #346CCD",
-+"b$ c #3F6BC2",
-+"c$ c #406BC2",
-+"d$ c #426DC4",
-+"e$ c #426EC4",
-+"f$ c #456FC4",
-+"g$ c #4A72C6",
-+"h$ c #4A73C7",
-+"i$ c #4A72C7",
-+"j$ c #466EC3",
-+"k$ c #3E65BC",
-+"l$ c #4065BD",
-+"m$ c #4166BD",
-+"n$ c #4066BD",
-+"o$ c #4066BC",
-+"p$ c #3F66BD",
-+"q$ c #346BBF",
-+"r$ c #356DC0",
-+"s$ c #3B76C6",
-+"t$ c #3B78C4",
-+"u$ c #3874C1",
-+"v$ c #3672BE",
-+"w$ c #3570BD",
-+"x$ c #346EBF",
-+"y$ c #346EC1",
-+"z$ c #346DC1",
-+"A$ c #346CC0",
-+"B$ c #346DC0",
-+"C$ c #346EC2",
-+"D$ c #316AC9",
-+"E$ c #3C6ABE",
-+"F$ c #3D6BBE",
-+"G$ c #3F6CC0",
-+"H$ c #416CC0",
-+"I$ c #426DC0",
-+"J$ c #4570C0",
-+"K$ c #4872C2",
-+"L$ c #4A76C4",
-+"M$ c #4E79C7",
-+"N$ c #4F7AC7",
-+"O$ c #507AC8",
-+"P$ c #4E79C8",
-+"Q$ c #3D79C4",
-+"R$ c #3C7AC4",
-+"S$ c #3A79C2",
-+"T$ c #3776BF",
-+"U$ c #3572BB",
-+"V$ c #336FBA",
-+"W$ c #326DBB",
-+"X$ c #326CBD",
-+"Y$ c #326ABD",
-+"Z$ c #3169BB",
-+"`$ c #3169BA",
-+" % c #316ABB",
-+".% c #2E66C3",
-+"+% c #396ABA",
-+"@% c #3C6BBA",
-+"#% c #3C6ABB",
-+"$% c #3E6CBD",
-+"%% c #406CBD",
-+"&% c #406DBD",
-+"*% c #426EBD",
-+"=% c #456FBD",
-+"-% c #4672BF",
-+";% c #4672C0",
-+">% c #4874C0",
-+",% c #4976C1",
-+"'% c #4B78C2",
-+")% c #4C78C3",
-+"!% c #4E78C3",
-+"~% c #4B78C3",
-+"{% c #3C78C1",
-+"]% c #3A79C1",
-+"^% c #3778BE",
-+"/% c #3673BA",
-+"(% c #326EB8",
-+"_% c #326DBA",
-+":% c #326BBB",
-+"<% c #316ABA",
-+"[% c #2F68B9",
-+"}% c #2E66B8",
-+"|% c #3067BB",
-+"1% c #2C63BF",
-+"2% c #3769B8",
-+"3% c #3969B8",
-+"4% c #3B6AB8",
-+"5% c #3C6AB8",
-+"6% c #3E6CBA",
-+"7% c #3F6DBA",
-+"8% c #416DBA",
-+"9% c #446FBB",
-+"0% c #4672BC",
-+"a% c #4672BD",
-+"b% c #4674BC",
-+"c% c #4674BD",
-+"d% c #4775BE",
-+"e% c #4575BE",
-+"f% c #3A76C0",
-+"g% c #3776BE",
-+"h% c #3573BB",
-+"i% c #326EB6",
-+"j% c #306CB7",
-+"k% c #316CBB",
-+"l% c #3068B8",
-+"m% c #2E66B9",
-+"n% c #2E66BA",
-+"o% c #3068BE",
-+"p% c #2B62C0",
-+"q% c #3769B6",
-+"r% c #3A68B6",
-+"s% c #3B69B6",
-+"t% c #406DBA",
-+"u% c #436EBA",
-+"v% c #4571BB",
-+"w% c #4372BC",
-+"x% c #3774BE",
-+"y% c #3875C3",
-+"z% c #316DB6",
-+"A% c #2F6BB5",
-+"B% c #306BB9",
-+"C% c #326ABB",
-+"D% c #3169BD",
-+"E% c #3169BF",
-+"F% c #3169C0",
-+"G% c #3067BE",
-+"H% c #2E66BC",
-+"I% c #285FBC",
-+"J% c #3667B5",
-+"K% c #3768B6",
-+"L% c #3C6BB9",
-+"M% c #416EBA",
-+"N% c #4470BA",
-+"O% c #4570BB",
-+"P% c #3873BD",
-+"Q% c #3A76C6",
-+"R% c #3974C3",
-+"S% c #336FBC",
-+"T% c #316CB9",
-+"U% c #326CBB",
-+"V% c #336CBD",
-+"W% c #346CC2",
-+"X% c #326AC2",
-+"Y% c #3068C1",
-+"Z% c #2B64B8",
-+"`% c #245AB6",
-+" & c #3466B5",
-+".& c #3668B5",
-+"+& c #3868B6",
-+"@& c #3F6CBA",
-+"#& c #426FBA",
-+"$& c #436FBA",
-+"%& c #4271BA",
-+"&& c #3772BB",
-+"*& c #3975C3",
-+"=& c #3974C4",
-+"-& c #3772C2",
-+";& c #346FBF",
-+">& c #326CBC",
-+",& c #3169BC",
-+"'& c #2D65BC",
-+")& c #2961B5",
-+"!& c #2861B4",
-+"~& c #2056B2",
-+". . + @ # $ % % & * * * = - - ; ; > > ; , - - * * * ' ) % % ! ~ ",
-+". { ] ^ / % ) ' * * ( , > > _ : < < < : : [ > ; - * * * } % % | ",
-+"+ 1 ^ % % & * * ( 2 > 3 < < < < < < < < < < < 3 _ > - * * ' 4 5 ",
-+"@ ^ % % 6 * * - > 3 < < < < 7 8 9 9 0 0 a b < < < < [ ; = * c d ",
-+"e / % ' * * , f < < < 7 g h i j j j j j i i 9 8 b < < 3 > - * + ",
-+"$ % & * * ; [ < < a 9 i j k k k k h l m n o p p q r s t u > - v ",
-+"% ) * * , _ < < 8 w k k k k k k x y z A B C D E F G G H I [ > J ",
-+"% ' * , [ < < K L k k k k x M N O P Q R S T U U V W W X Y > < Z ",
-+"& * = ` . ...+. at .#.$.%.&.*.=.-.;.>.,.'.).!.~.{.U ].].^./.< < (.",
-+"c * _.:.<.[.}.|.1.2.3.4.5.;.;.;.;.6.7.8.9.).).!.{.U V 0.a.8 b (.",
-+"* ( b.c.d.e.f.g.h.i.j.k.l.;.;.;.;.m.n.o.p.p.9.).q.{.{.r.s.h b t.",
-+"* , u.v.[.w.x.y.z.A.B.C.D.;.;.;.;.E.F.G.p.p.p.H.).q.~.I.J.w 9 } ",
-+"* > u.K.L.f.1.2.3.M.C.C.N.;.;.;.;.O.P.Q.R.S.p.p.H.).).T.U.V.w 6 ",
-+"- > W.K.w.|.X.Y.Z.`. +.+++ at +@+#+$+%+&+*+=+Q.-+p.p.9.).E ;+V.i - ",
-+">+,+'+)+!+~+{+]+^+/+(+_+:+<+<+[+[+}+|+1+2+3+4+5+5+5+6+7+8+9+0+a+",
-+"b+c+d+e+f+g+h+i+j+k+l+m+n+o+o+o+p+q+r+s+t+u+v+w+w+x+y+z+A+B+C+D+",
-+"b+E+F+e+G+h+H+I+J+K+L+M+N+O+O+P+P+Q+R+S+T+U+V+V+W+W+X+Y+Z+`+`+ @",
-+". at +@@@#@$@%@&@*@=@-@;@>@,@'@)@)@)@)@!@~@{@]@^@/@(@(@_ at _@_@:@<@[@",
-+"}@|@|@1 at 2@3 at 4@5 at 6@7 at 8@9 at 0@a at a@a at a@b at c@d at e@f at g@h at i@j at j@k at l@m at n@o@",
-+"p at q@r at s@t at u@v at w@x at y@z at A@B at C@D at D@D at E@F at G@H at I@J at K@L at L@L at M@N at O@P at Q@",
-+"R at S@T at U@V at W@W at X@Y at Z@`@ #.#+#+#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#",
-+"]#^#/#(#_#:#:#<#[#}#|#|#1#2#2#3#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#",
-+"i#j#k#l#m#n#o#p#q#r#s#s#s#t#u#v#u#w#x#y#z#A#B#C#D#E#F#G#H#I#J#K#",
-+"L#M#N#N#O#P#Q#R#S#T#U#U#V#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$",
-+",$'$)$)$!$~${${$]$^$/$($_$_$_$_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$",
-+"b$c$d$e$e$f$g$h$i$j$k$l$m$m$n$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$",
-+"E$F$G$H$I$I$J$K$K$K$K$L$M$N$O$O$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %Y$.%",
-+"+%@%#%$%%%&%*%=%-%;%;%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%[%}%}%}%|%1%",
-+"2%3%4%5%6%7%7%8%9%0%a%a%0%0%b%c%d%e%f%g%h%i%j%k%<%l%}%m%m%n%o%p%",
-+"q%q%r%s%5%6%7%7%t%u%v%0%0%0%0%0%0%w%x%y%v$z%A%B%C%Z$D%E%F%G%H%I%",
-+"J%q%K%s%s%L%6%7%7%7%M%N%O%0%0%0%0%w%P%Q%R%S%T%U%V%A$W%X%Y%H%Z%`%",
-+" &.&q%+&s%s%5%6%@&7%7%t%t%#&$&N%N%%&&&*&=&-&;&>&C%,&o%'&)&!&!&~&"};
---
-tg: (9bdb1d1..) topic/debian/viewericon (depends on: master)
diff --git a/debian/patches/topic/features/jira-backported/VWR-5082_set_bulk_inv_permissions.diff b/debian/patches/topic/features/jira-backported/VWR-5082_set_bulk_inv_permissions.diff
deleted file mode 100644
index 0751070..0000000
--- a/debian/patches/topic/features/jira-backported/VWR-5082_set_bulk_inv_permissions.diff
+++ /dev/null
@@ -1,965 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/features/jira-backported/VWR-5082_set_bulk_inv_permissions
-
-This is applied upstream (in a feature branch) and allows multiple object inventory items to have permissions set in one go.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/newview/CMakeLists.txt | 1 +
- indra/newview/llfloaterbulkpermission.cpp | 594 ++++++++++++++++++++
- indra/newview/llfloaterbulkpermission.h | 143 +++++
- indra/newview/llviewermenu.cpp | 12 +
- .../skins/default/xui/en-us/floater_bulk_perms.xml | 127 +++++
- .../skins/default/xui/en-us/menu_viewer.xml | 5 +
- 6 files changed, 882 insertions(+), 0 deletions(-)
-
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..7f3f9ab 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -126,6 +126,7 @@ set(viewer_SOURCE_FILES
- llfloateravatartextures.cpp
- llfloaterbeacons.cpp
- llfloaterbuildoptions.cpp
-+ llfloaterbulkpermission.cpp
- llfloaterbump.cpp
- llfloaterbuycontents.cpp
- llfloaterbuy.cpp
-diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
-new file mode 100644
-index 0000000..e66d1af
---- /dev/null
-+++ b/indra/newview/llfloaterbulkpermission.cpp
-@@ -0,0 +1,594 @@
-+/**
-+ * @file llfloaterbulkpermissions.cpp
-+ * @brief A floater which allows task inventory item's properties to be changed on mass.
-+ *
-+ * $LicenseInfo:firstyear=2008&license=viewergpl$
-+ *
-+ * Copyright (c) 2008, Linden Research, Inc.
-+ *
-+ * Second Life Viewer Source Code
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ * $/LicenseInfo$
-+ */
-+
-+/* Allow multiple task inventory properties to be set in one go, by Michelle2 Zenovka */
-+
-+/* TODO
-+
-+ * Add in the option to select objects or task inventory
-+s
-+
-+It would be nice to set the permissions on groups of prims as well as task inventory
-+
-+*/
-+
-+
-+#include "llviewerprecompiledheaders.h"
-+#include "llfloaterbulkpermission.h"
-+#include "llagent.h"
-+#include "llchat.h"
-+#include "llviewerwindow.h"
-+#include "llviewerobject.h"
-+#include "llviewerobjectlist.h"
-+#include "llviewerregion.h"
-+#include "lscript_rt_interface.h"
-+#include "llviewercontrol.h"
-+#include "llviewerobject.h"
-+#include "llviewerregion.h"
-+#include "llresmgr.h"
-+#include "llbutton.h"
-+#include "lldir.h"
-+#include "llfloaterchat.h"
-+#include "llviewerstats.h"
-+#include "lluictrlfactory.h"
-+#include "llselectmgr.h"
-+#include "llinventory.h"
-+
-+
-+#include <algorithm>
-+#include <functional>
-+#include "llcachename.h"
-+#include "lldbstrings.h"
-+#include "llinventory.h"
-+
-+#include "llagent.h"
-+#include "llbutton.h"
-+#include "llcheckboxctrl.h"
-+#include "llfloateravatarinfo.h"
-+#include "llfloatergroupinfo.h"
-+#include "llinventorymodel.h"
-+#include "lllineeditor.h"
-+#include "llradiogroup.h"
-+#include "llresmgr.h"
-+#include "roles_constants.h"
-+#include "llselectmgr.h"
-+#include "lltextbox.h"
-+#include "lluiconstants.h"
-+#include "llviewerinventory.h"
-+#include "llviewerobjectlist.h"
-+#include "llviewerregion.h"
-+#include "llviewercontrol.h"
-+
-+#include "lluictrlfactory.h"
-+
-+
-+const char* BULKPERM_QUEUE_TITLE = "Update Progress";
-+const char* BULKPERM_START_STRING = "update";
-+
-+namespace
-+{
-+ struct BulkQueueObjects : public LLSelectedObjectFunctor
-+ {
-+ BOOL scripted;
-+ BOOL modifiable;
-+ LLFloaterBulkPermission* mQueue;
-+ BulkQueueObjects(LLFloaterBulkPermission* q) : mQueue(q), scripted(FALSE), modifiable(FALSE) {}
-+ virtual bool apply(LLViewerObject* obj)
-+ {
-+ scripted = obj->flagScripted();
-+ modifiable = obj->permModify();
-+
-+ mQueue->addObject(obj->getID());
-+ return false;
-+
-+ }
-+ };
-+}
-+
-+///----------------------------------------------------------------------------
-+/// Class LLFloaterBulkPermission
-+///----------------------------------------------------------------------------
-+
-+// static
-+LLMap<LLUUID, LLFloaterBulkPermission*> LLFloaterBulkPermission::sInstances;
-+
-+
-+// Default constructor
-+LLFloaterBulkPermission::LLFloaterBulkPermission(const std::string& name,
-+ const LLRect& rect,
-+ const char* title,
-+ const char* start_string) :
-+ LLFloater(name, rect, title,
-+ RESIZE_YES, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
-+ DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
-+{
-+
-+ req_perm_mask=0; // This should match the default state the checkboxes are set to
-+ recurse=false;
-+
-+ LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml");
-+
-+ childSetAction("Apply...",onApplyBtn,this);
-+ childSetEnabled("Apply...",TRUE);
-+
-+ childSetCommitCallback("Modify",&onCommitPermissions, this);
-+ childSetCommitCallback("Trans",&onCommitPermissions, this);
-+ childSetCommitCallback("Copy",&onCommitPermissions, this);
-+
-+ //childSetCommitCallback("Recurse",&onRecurse, this);
-+
-+ childSetCommitCallback("Parent",&onParent, this);
-+
-+ childSetCommitCallback("objects",&InvSelection, this);
-+ childSetCommitCallback("scripts",&InvSelection, this);
-+ childSetCommitCallback("textures",&InvSelection, this);
-+ childSetCommitCallback("sounds",&InvSelection, this);
-+ childSetCommitCallback("animations",&InvSelection, this);
-+ childSetCommitCallback("notecards",&InvSelection, this);
-+ childSetCommitCallback("landmarks",&InvSelection, this);
-+ childSetCommitCallback("bodyparts",&InvSelection, this);
-+ childSetCommitCallback("clothing",&InvSelection, this);
-+ childSetCommitCallback("gestures",&InvSelection, this);
-+
-+ //Set variable state to XUI default state consistancy
-+ processObject=getChild<LLCheckBoxCtrl>("objects")->get();
-+ processScript=getChild<LLCheckBoxCtrl>("scripts")->get();
-+ processTexture=getChild<LLCheckBoxCtrl>("textures")->get();
-+ processSound=getChild<LLCheckBoxCtrl>("sounds")->get();
-+ processAnimation=getChild<LLCheckBoxCtrl>("animations")->get();
-+ processNotecard=getChild<LLCheckBoxCtrl>("notecards")->get();
-+ processGesture=getChild<LLCheckBoxCtrl>("gestures")->get();
-+ processClothing=getChild<LLCheckBoxCtrl>("clothing")->get();
-+ processBodypart=getChild<LLCheckBoxCtrl>("bodyparts")->get();
-+ processLandmark=getChild<LLCheckBoxCtrl>("landmarks")->get();
-+ parent=getChild<LLCheckBoxCtrl>("Parent")->get();
-+
-+
-+ setTitle(title);
-+
-+ if (!getHost())
-+ {
-+ LLRect curRect = getRect();
-+ translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
-+ }
-+
-+ mStartString = start_string;
-+ mDone = FALSE;
-+ sInstances.addData(mID, this);
-+
-+}
-+
-+void LLFloaterBulkPermission::doApply()
-+{
-+ // Its alive now do the nasty work that the ScriptQueue and friends try to do in the menu code
-+ // but first grab the user options
-+
-+ LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-+ list->deleteAllItems();
-+
-+ //Apply to selected objects if requested first
-+
-+ if(parent)
-+ {
-+ llinfos<< "Setting permission on parent items" << llendl;
-+ LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_NEXT_OWNER,true, req_perm_mask);
-+ LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_NEXT_OWNER,false, ~req_perm_mask); //How annoying need to set and unset
-+ }
-+
-+
-+ LLFloaterBulkPermission* q;
-+ q=(LLFloaterBulkPermission*)this;
-+
-+ BulkQueueObjects func(q);
-+ bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func);
-+ if(fail)
-+ {
-+ if ( !func.modifiable )
-+ {
-+ gViewerWindow->alertXml("NO MODIFY");
-+ }
-+ else
-+ {
-+ llwarns << "Bad logic. Are there actualy any items in that prim?" << llendl;
-+ }
-+ }
-+ else
-+ {
-+ if (!q->start())
-+ {
-+ llwarns << "Unexpected failure attepmting to set permissions." << llendl;
-+ }
-+ }
-+}
-+
-+// Destroys the object
-+LLFloaterBulkPermission::~LLFloaterBulkPermission()
-+{
-+ sInstances.removeData(mID);
-+}
-+
-+// find an instance by ID. Return NULL if it does not exist.
-+// static
-+LLFloaterBulkPermission* LLFloaterBulkPermission::findInstance(const LLUUID& id)
-+{
-+ if(sInstances.checkData(id))
-+ {
-+ return sInstances.getData(id);
-+ }
-+ return NULL;
-+}
-+
-+
-+// This is the callback method for the viewer object currently being
-+// worked on.
-+// NOT static, virtual!
-+void LLFloaterBulkPermission::inventoryChanged(LLViewerObject* viewer_object,
-+ InventoryObjectList* inv,
-+ S32,
-+ void* q_id)
-+{
-+ llinfos << "LLFloaterBulkPermission::inventoryChanged() for object "
-+ << viewer_object->getID() << llendl;
-+
-+ //Remove this listener from the object since its
-+ //listener callback is now being executed.
-+
-+ //We remove the listener here because the function
-+ //removeVOInventoryListener removes the listener from a ViewerObject
-+ //which it internally stores.
-+
-+ //If we call this further down in the function, calls to handleInventory
-+ //and nextObject may update the interally stored viewer object causing
-+ //the removal of the incorrect listener from an incorrect object.
-+
-+ //Fixes SL-6119:Recompile scripts fails to complete
-+ removeVOInventoryListener();
-+
-+ if (viewer_object && inv && (viewer_object->getID() == mCurrentObjectID) )
-+ {
-+ handleInventory(viewer_object, inv);
-+ }
-+ else
-+ {
-+ // something went wrong...
-+ // note that we're not working on this one, and move onto the
-+ // next object in the list.
-+ llwarns << "No inventory for " << mCurrentObjectID
-+ << llendl;
-+ nextObject();
-+ }
-+}
-+
-+void LLFloaterBulkPermission::onApplyBtn(void* user_data)
-+{
-+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)user_data;
-+ self->doApply();
-+}
-+
-+
-+// static
-+void LLFloaterBulkPermission::InvSelection(LLUICtrl* ctrl, void* data)
-+{
-+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
-+
-+ self->processObject=self->getChild<LLCheckBoxCtrl>("objects")->get();
-+ self->processScript=self->getChild<LLCheckBoxCtrl>("scripts")->get();
-+ self->processTexture=self->getChild<LLCheckBoxCtrl>("textures")->get();
-+ self->processSound=self->getChild<LLCheckBoxCtrl>("sounds")->get();
-+ self->processAnimation=self->getChild<LLCheckBoxCtrl>("animations")->get();
-+ self->processNotecard=self->getChild<LLCheckBoxCtrl>("notecards")->get();
-+ self->processGesture=self->getChild<LLCheckBoxCtrl>("gestures")->get();
-+ self->processClothing=self->getChild<LLCheckBoxCtrl>("clothing")->get();
-+ self->processBodypart=self->getChild<LLCheckBoxCtrl>("bodyparts")->get();
-+ self->processLandmark=self->getChild<LLCheckBoxCtrl>("landmarks")->get();
-+
-+
-+}
-+
-+// static
-+void LLFloaterBulkPermission::onParent(LLUICtrl* ctrl, void* data)
-+{
-+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
-+ self->parent=self->getChild<LLCheckBoxCtrl>("Parent")->get();
-+}
-+
-+// static
-+void LLFloaterBulkPermission::onRecurse(LLUICtrl* ctrl, void* data)
-+{
-+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
-+ self->recurse=self->getChild<LLCheckBoxCtrl>("Recurse")->get();
-+}
-+
-+// static
-+void LLFloaterBulkPermission::onCommitPermissions(LLUICtrl* ctrl, void* data)
-+{
-+ LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
-+ LLCheckBoxCtrl* CheckModify = self->getChild<LLCheckBoxCtrl>("Modify");
-+ LLCheckBoxCtrl* CheckCopy = self->getChild<LLCheckBoxCtrl>("Copy");
-+ LLCheckBoxCtrl* CheckTrans = self->getChild<LLCheckBoxCtrl>("Trans");
-+
-+ self->req_perm_mask=0;
-+
-+ if(CheckModify->get())
-+ {
-+ self->req_perm_mask|=PERM_MODIFY;
-+ }
-+ else
-+ {
-+ self->req_perm_mask&=~PERM_MODIFY;
-+ }
-+
-+ if(CheckCopy->get())
-+ {
-+ self->req_perm_mask|=PERM_COPY;
-+ }
-+ else
-+ {
-+ self->req_perm_mask&=~PERM_COPY;
-+ }
-+
-+ if(CheckTrans->get())
-+ {
-+ self->req_perm_mask|=PERM_TRANSFER;
-+ }
-+ else
-+ {
-+ self->req_perm_mask&=~PERM_TRANSFER;
-+ }
-+
-+
-+}
-+
-+void LLFloaterBulkPermission::addObject(const LLUUID& id)
-+{
-+ mObjectIDs.put(id);
-+}
-+
-+BOOL LLFloaterBulkPermission::start()
-+{
-+ llinfos << "LLFloaterBulkPermission::start()" << llendl;
-+ char buffer[MAX_STRING]; /*Flawfinder: ignore*/
-+ snprintf(buffer, sizeof(buffer), "Starting %s of %d items.", mStartString, mObjectIDs.count()); /* Flawfinder: ignore */
-+
-+ LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-+ list->addCommentText(buffer);
-+
-+ return nextObject();
-+}
-+
-+BOOL LLFloaterBulkPermission::isDone() const
-+{
-+ return (mCurrentObjectID.isNull() || (mObjectIDs.count() == 0));
-+}
-+
-+// go to the next object. If no objects left, it falls out silently
-+// and waits to be killed by the window being closed.
-+BOOL LLFloaterBulkPermission::nextObject()
-+{
-+ S32 count;
-+ BOOL successful_start = FALSE;
-+ do
-+ {
-+ count = mObjectIDs.count();
-+ llinfos << "LLFloaterBulkPermission::nextObject() - " << count
-+ << " objects left to process." << llendl;
-+ mCurrentObjectID.setNull();
-+ if(count > 0)
-+ {
-+ successful_start = popNext();
-+ }
-+ llinfos << "LLFloaterBulkPermission::nextObject() "
-+ << (successful_start ? "successful" : "unsuccessful")
-+ << llendl;
-+ } while((mObjectIDs.count() > 0) && !successful_start);
-+
-+ if(isDone() && !mDone)
-+ {
-+
-+ LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-+ mDone = TRUE;
-+ char buffer[MAX_STRING]; /*Flawfinder: ignore*/
-+ snprintf(buffer, sizeof(buffer), "Done."); /* Flawfinder: ignore */
-+ list->addCommentText(buffer);
-+
-+ }
-+ return successful_start;
-+}
-+
-+// returns true if the queue has started, otherwise false. This
-+// method pops the top object off of the queue.
-+BOOL LLFloaterBulkPermission::popNext()
-+{
-+ // get the first element off of the container, and attempt to get
-+ // the inventory.
-+ BOOL rv = FALSE;
-+ S32 count = mObjectIDs.count();
-+ if(mCurrentObjectID.isNull() && (count > 0))
-+ {
-+ mCurrentObjectID = mObjectIDs.get(0);
-+ llinfos << "LLFloaterBulkPermission::popNext() - mCurrentID: "
-+ << mCurrentObjectID << llendl;
-+ mObjectIDs.remove(0);
-+ LLViewerObject* obj = gObjectList.findObject(mCurrentObjectID);
-+ if(obj)
-+ {
-+ llinfos << "LLFloaterBulkPermission::popNext() requesting inv for "
-+ << mCurrentObjectID << llendl;
-+ LLUUID* id = new LLUUID(mID);
-+
-+ registerVOInventoryListener(obj,id);
-+ requestVOInventory();
-+ rv = TRUE;
-+ }
-+ else
-+ {
-+ llinfos<<"LLFloaterBulkPermission::popNext() returned a NULL LLViewerObject" <<llendl;
-+ //Arrrg what do we do here?
-+ }
-+ }
-+
-+ return rv;
-+}
-+
-+
-+// static
-+LLFloaterBulkPermission* LLFloaterBulkPermission::create()
-+{
-+ S32 left, top;
-+ gFloaterView->getNewFloaterPosition(&left, &top);
-+ LLRect rect = gSavedSettings.getRect("CompileOutputRect");
-+ rect.translate(left - rect.mLeft, top - rect.mTop);
-+ LLFloaterBulkPermission* new_queue = new LLFloaterBulkPermission("queue",rect,"Setting Bulk permissions","Results");
-+ new_queue->open(); /*Flawfinder: ignore*/
-+ return new_queue;
-+}
-+
-+
-+void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, InventoryObjectList* inv)
-+{
-+ // find all of the lsl, leaving off duplicates. We'll remove
-+ // all matching asset uuids on compilation success.
-+
-+ llinfos<<"handleInventory"<<llendl;
-+
-+ char buffer[MAX_STRING]; /*Flawfinder: ignore*/
-+ LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-+
-+ InventoryObjectList::const_iterator it = inv->begin();
-+ InventoryObjectList::const_iterator end = inv->end();
-+ for ( ; it != end; ++it)
-+ {
-+ llinfos<<"Doing iterator of inventory"<<llendl;
-+
-+ if( ( (*it)->getType() == LLAssetType::AT_LSL_TEXT && processScript) ||
-+ ( (*it)->getType() == LLAssetType::AT_TEXTURE && processTexture) ||
-+ ( (*it)->getType() == LLAssetType::AT_SOUND && processSound) ||
-+ ( (*it)->getType() == LLAssetType::AT_LANDMARK && processLandmark) ||
-+ ( (*it)->getType() == LLAssetType::AT_CLOTHING && processClothing) ||
-+ ( (*it)->getType() == LLAssetType::AT_OBJECT && processObject) ||
-+ ( (*it)->getType() == LLAssetType::AT_NOTECARD && processNotecard) ||
-+ ( (*it)->getType() == LLAssetType::AT_BODYPART && processBodypart) ||
-+ ( (*it)->getType() == LLAssetType::AT_ANIMATION && processAnimation) ||
-+ ( (*it)->getType() == LLAssetType::AT_GESTURE && processGesture))
-+ {
-+
-+ LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
-+
-+ if (object)
-+ {
-+ LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
-+ LLViewerInventoryItem* new_item = (LLViewerInventoryItem*)item;
-+ LLPermissions perm(new_item->getPermissions());
-+
-+ // chomp the inventory name so it fits in the scroll window nicely
-+ // and the user can see the [OK]
-+ std::string invname;
-+ invname=item->getName().substr(0,item->getName().size() < 30 ? item->getName().size() : 30 );
-+
-+ // My attempt at checking valid permissions, CHECK ME
-+ // note its not actually bad to try to set permissions that are not allowed as the
-+ // server will protect against this, but it will piss the user off if its wrong
-+ if(
-+ (perm.getCreator()==gAgentID) ||
-+ (perm.getMaskOwner() & PERM_TRANSFER) && (perm.getMaskOwner() & PERM_MODIFY) ||
-+ (gAgent.getGroupID()==perm.getGroup() && (perm.getMaskGroup() & PERM_TRANSFER) && (perm.getMaskGroup() & PERM_MODIFY))
-+ ){
-+ llinfos<<"Setting perms"<<llendl;
-+ perm.setMaskNext(req_perm_mask);
-+ new_item->setPermissions(perm);
-+ updateInventory(object,new_item,TASK_INVENTORY_ITEM_KEY,FALSE);
-+ snprintf(buffer, sizeof(buffer), "Setting perms on '%s' [OK]", invname.c_str()); /* Flawfinder: ignore */
-+ }
-+ else
-+ {
-+ llinfos<<"NOT setting perms"<<llendl;
-+ snprintf(buffer, sizeof(buffer), "Setting perms on '%s' [FAILED]", invname.c_str()); /* Flawfinder: ignore */
-+
-+ }
-+
-+ list->addCommentText(buffer);
-+
-+ if(recurse && ( (*it)->getType() == LLAssetType::AT_OBJECT && processObject))
-+ {
-+ //Add this object back to the queue to be processed as it has inventory
-+ snprintf(buffer, sizeof(buffer), "Queueing object '%s' for open", invname.c_str());
-+ llwarns << "Queueing object "<< invname.c_str() << " ID "<< (*it)->getUUID()<<llendl;
-+ mObjectIDs.put((*it)->getUUID());
-+ // This will not YET work. as this is not a viewer object the unpack will fail
-+ }
-+
-+ }
-+ }
-+ }
-+
-+ nextObject();
-+}
-+
-+
-+// Avoid inventory callbacks etc by just fire and forgetting the message with the permissions update
-+// we could do this via LLViewerObject::updateInventory but that uses inventory call backs and buggers
-+// us up and we would have a dodgy item iterator
-+
-+void LLFloaterBulkPermission::updateInventory(
-+ LLViewerObject* object,
-+ LLViewerInventoryItem* item,
-+ U8 key,
-+ bool is_new)
-+{
-+ LLMemType mt(LLMemType::MTYPE_OBJECT);
-+
-+
-+ // This slices the object into what we're concerned about on the
-+ // viewer. The simulator will take the permissions and transfer
-+ // ownership.
-+ LLPointer<LLViewerInventoryItem> task_item =
-+ new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
-+ item->getAssetUUID(), item->getType(),
-+ item->getInventoryType(),
-+ item->getName(), item->getDescription(),
-+ item->getSaleInfo(),
-+ item->getFlags(),
-+ item->getCreationDate());
-+ task_item->setTransactionID(item->getTransactionID());
-+ LLMessageSystem* msg = gMessageSystem;
-+ msg->newMessageFast(_PREHASH_UpdateTaskInventory);
-+ msg->nextBlockFast(_PREHASH_AgentData);
-+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-+ msg->nextBlockFast(_PREHASH_UpdateData);
-+ msg->addU32Fast(_PREHASH_LocalID, object->mLocalID);
-+ msg->addU8Fast(_PREHASH_Key, key);
-+ msg->nextBlockFast(_PREHASH_InventoryData);
-+ task_item->packMessage(msg);
-+ msg->sendReliable(object->getRegion()->getHost());
-+
-+}
-+
-diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
-new file mode 100644
-index 0000000..3de871b
---- /dev/null
-+++ b/indra/newview/llfloaterbulkpermission.h
-@@ -0,0 +1,143 @@
-+/**
-+ * @file llfloaterbulkpermissions.h
-+ * @brief A floater which allows task inventory item's properties to be changed on mass.
-+ *
-+ * $LicenseInfo:firstyear=2008&license=viewergpl$
-+ *
-+ * Copyright (c) 2008, Linden Research, Inc.
-+ *
-+ * Second Life Viewer Source Code
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ * $/LicenseInfo$
-+ */
-+
-+/* Allow multiple task inventory properties to be set in one go, by Michelle2 Zenovka */
-+
-+#ifndef LL_LLBULKPERMISSION_H
-+#define LL_LLBULKPERMISSION_H
-+
-+#include "lldarray.h"
-+#include "llinventory.h"
-+#include "llviewerobject.h"
-+#include "llvoinventorylistener.h"
-+#include "llmap.h"
-+#include "lluuid.h"
-+
-+#include "llfloater.h"
-+#include "llscrolllistctrl.h"
-+
-+#include "llviewerinventory.h"
-+
-+class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener
-+{
-+public:
-+ // addObject() accepts an object id.
-+ void addObject(const LLUUID& id);
-+
-+ // start() returns TRUE if the queue has started, otherwise FALSE.
-+ BOOL start();
-+
-+ // Use this method to create a reset queue. Once created, it
-+ // will be responsible for it's own destruction.
-+ static LLFloaterBulkPermission * create();
-+
-+protected:
-+ LLFloaterBulkPermission(const std::string& name, const LLRect& rect,
-+ const char* title, const char* start_string);
-+ virtual ~LLFloaterBulkPermission();
-+
-+ // This is the callback method for the viewer object currently
-+ // being worked on.
-+ /*virtual*/ void inventoryChanged(LLViewerObject* obj,
-+ InventoryObjectList* inv,
-+ S32 serial_num,
-+ void* queue);
-+
-+ // This is called by inventoryChanged
-+ void handleInventory(LLViewerObject* viewer_obj,
-+ InventoryObjectList* inv);
-+
-+
-+ void updateInventory(LLViewerObject* object,
-+ LLViewerInventoryItem* item,
-+ U8 key,
-+ bool is_new);
-+
-+
-+ static void onCloseBtn(void* user_data);
-+ static void onApplyBtn(void* user_data);
-+ static void onCommitPermissions(LLUICtrl* ctrl, void* data);
-+ static void InvSelection(LLUICtrl* ctrl, void* data);
-+ static void onRecurse(LLUICtrl* ctrl, void* data);
-+ static void onParent(LLUICtrl* ctrl, void* data);
-+
-+ // returns true if this is done
-+ BOOL isDone() const;
-+
-+ //Read the settings and Apply the permissions
-+ void doApply();
-+
-+ // go to the next object. If no objects left, it falls out
-+ // silently and waits to be killed by the deleteIfDone() callback.
-+ BOOL nextObject();
-+ BOOL popNext();
-+
-+ // Get this instances ID.
-+ const LLUUID& getID() const { return mID; }
-+
-+ // find an instance by ID. Return NULL if it does not exist.
-+ static LLFloaterBulkPermission* findInstance(const LLUUID& id);
-+
-+ U32 req_perm_mask;
-+
-+ BOOL processObject;
-+ BOOL processScript;
-+ BOOL processTexture;
-+ BOOL processSound;
-+ BOOL processAnimation;
-+ BOOL processCallingcard;
-+ BOOL processNotecard;
-+ BOOL processGesture;
-+ BOOL processClothing;
-+ BOOL processBodypart;
-+ BOOL processLandmark;
-+
-+ BOOL recurse;
-+ BOOL parent;
-+
-+protected:
-+ // UI
-+ LLScrollListCtrl* mMessages;
-+ LLButton* mCloseBtn;
-+
-+ // Object Queue
-+ LLDynamicArray<LLUUID> mObjectIDs;
-+ LLUUID mCurrentObjectID;
-+ BOOL mDone;
-+
-+ LLUUID mID;
-+ static LLMap<LLUUID, LLFloaterBulkPermission*> sInstances;
-+
-+ const char* mStartString;
-+
-+};
-+
-+#endif
-diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
-index 9782d4b..a417825 100644
---- a/indra/newview/llviewermenu.cpp
-+++ b/indra/newview/llviewermenu.cpp
-@@ -87,6 +87,7 @@
- #include "llfloateravatartextures.h"
- #include "llfloaterbeacons.h"
- #include "llfloaterbuildoptions.h"
-+#include "llfloaterbulkpermission.h"
- #include "llfloaterbump.h"
- #include "llfloaterbuy.h"
- #include "llfloaterbuycontents.h"
-@@ -6015,6 +6016,16 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
- }
- }
-
-+class LLToolsSetBulkPerms : public view_listener_t
-+{
-+ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-+ {
-+ LLFloaterBulkPermission* queue = NULL;
-+ queue = LLFloaterBulkPermission::create();
-+ return true;
-+ }
-+};
-+
- void handle_compile_queue(std::string to_lang)
- {
- LLFloaterCompileQueue* queue;
-@@ -7502,6 +7513,7 @@ void initialize_menus()
- addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
- addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
- addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
-+ addMenu(new LLToolsSetBulkPerms(), "Tools.SetBulkPerms");
-
- addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
- addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
-diff --git a/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
-new file mode 100644
-index 0000000..3dd838a
---- /dev/null
-+++ b/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
-@@ -0,0 +1,127 @@
-+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-+<floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
-+ can_resize="false" can_tear_off="false" enabled="true" height="420"
-+ left="367" min_height="1000" min_width="460" mouse_opaque="true"
-+ name="floaterrecursiveperms" title="Bulk permission settings"
-+ width="460">
-+
-+<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-+ mouse_opaque="true" name="applyto" v_pad="0" width="206">Apply to</text>
-+
-+<check_box bottom="-70" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Scripts" left="10" mouse_opaque="true"
-+ name="scripts" radio_style="false"
-+ tool_tip="Apply bulk permissions to scripts"
-+ width="219"/>
-+
-+<check_box bottom="-90" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Textures" left="10" mouse_opaque="true"
-+ name="textures" radio_style="false"
-+ tool_tip="Apply bulk permissions to textures"
-+ width="219"/>
-+
-+<check_box bottom="-110" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Animations" left="10" mouse_opaque="true"
-+ name="animations" radio_style="false"
-+ tool_tip="Apply bulk permissions to animations"
-+ width="219"/>
-+
-+<check_box bottom="-130" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Sounds" left="10" mouse_opaque="true"
-+ name="sounds" radio_style="false"
-+ tool_tip="Apply bulk permissions to sounds"
-+ width="219"/>
-+
-+<check_box bottom="-150" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Contained objects" left="10" mouse_opaque="true"
-+ name="objects" radio_style="false"
-+ tool_tip="Apply bulk permissions to objects inside inventory"
-+ width="219"/>
-+
-+<check_box bottom="-170" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Landmarks" left="10" mouse_opaque="true"
-+ name="landmarks" radio_style="false"
-+ tool_tip="Apply bulk permissions to landmarks"
-+ width="219"/>
-+
-+<check_box bottom="-190" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Notecards" left="10" mouse_opaque="true"
-+ name="notecards" radio_style="false"
-+ tool_tip="Apply bulk permissions to notecards"
-+ width="219"/>
-+
-+<check_box bottom="-210" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Gesture" left="10" mouse_opaque="true"
-+ name="gestures" radio_style="false"
-+ tool_tip="Apply bulk permissions to gestures"
-+ width="219"/>
-+
-+<check_box bottom="-230" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Clothing" left="10" mouse_opaque="true"
-+ name="clothing" radio_style="false"
-+ tool_tip="Apply bulk permissions to clothing"
-+ width="219"/>
-+
-+<check_box bottom="-250" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Bodypart" left="10" mouse_opaque="true"
-+ name="bodyparts" radio_style="false"
-+ tool_tip="Apply bulk permissions to bodyparts"
-+ width="219"/>
-+
-+<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" left="200"
-+ mouse_opaque="true" name="applyto" v_pad="0" width="206">Permissions</text>
-+
-+
-+<check_box bottom="-110" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Copy" left="200" mouse_opaque="true"
-+ name="Copy" radio_style="false"
-+ tool_tip="Next owner can copy"
-+ width="219"/>
-+
-+<check_box bottom="-130" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Modify" left="200" mouse_opaque="true"
-+ name="Modify" radio_style="false"
-+ tool_tip="Next owner can modify"
-+ width="219"/>
-+
-+<check_box bottom="-150" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Trans" left="200" mouse_opaque="true"
-+ name="Trans" radio_style="false"
-+ tool_tip="Next owner can transfer"
-+ width="219"/>
-+
-+<check_box bottom="-230" enabled="true" follows="left|top" font="SansSerifSmall"
-+ height="16" initial_value="false"
-+ label="Modify Parent Prims" left="200" mouse_opaque="true"
-+ name="Parent" radio_style="false"
-+ tool_tip="Modify parent prims not just inventory"
-+ width="219" default="true"/>
-+
-+<scroll_list background_visible="true" bottom="-410" column_padding="5" draw_border="true"
-+ draw_heading="false" draw_stripes="true" enabled="true"
-+ follows="left|top|right|bottom" height="140" left="10" mouse_opaque="true"
-+ multi_select="false" name="queue output" width="440" />
-+
-+<button bottom="-70" enabled="true" follows="left|top" font="SansSerif"
-+ halign="center" height="20" label="Apply..."
-+ label_selected="Apply..." left="295" mouse_opaque="true"
-+ name="Apply..." scale_image="true" width="145" />
-+
-+</floater>
-diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-index 2728962..530dede 100644
---- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-@@ -701,6 +701,11 @@
- <on_click function="Tools.SelectedScriptAction" userdata="stop" />
- <on_enable function="EditableSelected" />
- </menu_item_call>
-+ <menu_item_call bottom="-468" enabled="false" height="19" label="Set permissions on selected task inventory"
-+ left="0" mouse_opaque="true" name="Set permissions on selected task inventory" width="250">
-+ <on_click function="Tools.SetBulkPerms" userdata="" />
-+ <on_enable function="EditableSelected" />
-+ </menu_item_call>
- </menu>
- <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
- height="317" label="Help" left="227" mouse_opaque="false" name="Help"
---
-tg: (c8fb40a..) topic/features/jira-backported/VWR-5082_set_bulk_inv_permissions (depends on: upstream)
diff --git a/debian/patches/topic/features/jira-backported/avatar_list.diff b/debian/patches/topic/features/jira-backported/avatar_list.diff
deleted file mode 100644
index 1e71ecd..0000000
--- a/debian/patches/topic/features/jira-backported/avatar_list.diff
+++ /dev/null
@@ -1,5212 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/features/jira-backported/avatar_list
-
-Dale Glass's avatar scanner as published on JIRA and rebased by Carjay
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llaudio/audioengine.h | 1 +
- indra/llmessage/llmessagetemplate.h | 111 +-
- indra/llmessage/message.cpp | 28 +-
- indra/llmessage/message.h | 18 +-
- indra/llui/llscrolllistctrl.cpp | 41 +
- indra/llui/llscrolllistctrl.h | 2 +
- indra/newview/CMakeLists.txt | 3 +
- indra/newview/app_settings/settings.xml | 16 +
- indra/newview/llagent.cpp | 121 +-
- indra/newview/llagent.h | 14 +
- indra/newview/llappviewer.cpp | 4 +
- indra/newview/llchatbar.cpp | 34 +-
- indra/newview/llfloateravatarlist.cpp | 2187 ++++++++++++++++++++
- indra/newview/llfloateravatarlist.h | 868 ++++++++
- indra/newview/llfloaterpreference.cpp | 7 +
- indra/newview/llfloaterpreference.h | 2 +
- indra/newview/llfloaterreporter.cpp | 13 +-
- indra/newview/llfloaterreporter.h | 2 +-
- indra/newview/llpaneldatabase.cpp | 149 ++
- indra/newview/llpaneldatabase.h | 65 +
- indra/newview/llstartup.cpp | 2 +-
- indra/newview/lltoolbar.cpp | 9 +
- indra/newview/lltoolbar.h | 1 +
- indra/newview/llviewermenu.cpp | 14 +
- indra/newview/llviewermessage.cpp | 3 +
- indra/newview/llviewerobject.h | 3 +-
- indra/newview/llviewerwindow.cpp | 8 +-
- indra/newview/llwebbrowserctrl.h | 2 +
- indra/newview/pipeline.cpp | 42 +
- indra/newview/skins/default/xui/en-us/alerts.xml | 136 ++
- .../default/xui/en-us/floater_avatar_scanner.xml | 413 ++++
- .../skins/default/xui/en-us/menu_viewer.xml | 13 +
- indra/newview/skins/default/xui/en-us/notify.xml | 6 +
- .../xui/en-us/panel_preferences_database.xml | 166 ++
- .../skins/default/xui/en-us/panel_toolbar.xml | 7 +
- 35 files changed, 4448 insertions(+), 63 deletions(-)
-
-diff --git a/indra/llaudio/audioengine.h b/indra/llaudio/audioengine.h
-index b8153a3..48f1e15 100644
---- a/indra/llaudio/audioengine.h
-+++ b/indra/llaudio/audioengine.h
-@@ -311,6 +311,7 @@ public:
- BOOL setupChannel();
- BOOL play(const LLUUID &audio_id); // Start the audio source playing
-
-+ const LLUUID &getOwnerID() { return mOwnerID; }
- BOOL hasPendingPreloads() const; // Has preloads that haven't been done yet
-
- friend class LLAudioEngine;
-diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h
-index 445d1a8..20f479b 100644
---- a/indra/llmessage/llmessagetemplate.h
-+++ b/indra/llmessage/llmessagetemplate.h
-@@ -35,7 +35,11 @@
- #include "lldarray.h"
- #include "message.h" // TODO: babbage: Remove...
- #include "llstat.h"
-+#include "llmsgvariabletype.h"
- #include "llstl.h"
-+#include <list>
-+#include <algorithm>
-+#include <functional>
-
- class LLMsgVarData
- {
-@@ -270,6 +274,30 @@ enum EMsgDeprecation
- MD_DEPRECATED
- };
-
-+class LLMessageTemplateHandlerEntry
-+{
-+public:
-+ LLMessageTemplateHandlerEntry(message_handler_func_t handler, void **userdata = NULL) :
-+ mHandlerFunc(handler), mUserData(userdata) {}
-+
-+ void call(LLMessageSystem *msgsystem) const { mHandlerFunc(msgsystem, mUserData); }
-+
-+ bool operator==(const LLMessageTemplateHandlerEntry&a) { return mHandlerFunc == a.mHandlerFunc; }
-+private:
-+ // message handler function (this is set by each application)
-+ message_handler_func_t mHandlerFunc;
-+ void **mUserData;
-+};
-+
-+class callHandler : public std::unary_function<LLMessageTemplateHandlerEntry, void>
-+{
-+public:
-+ callHandler(LLMessageSystem *msg) : mMsg(msg) {}
-+ void operator()(const LLMessageTemplateHandlerEntry& a) const { a.call(mMsg); }
-+private:
-+ LLMessageSystem *mMsg;
-+};
-+
- class LLMessageTemplate
- {
- public:
-@@ -291,9 +319,7 @@ public:
- mTotalDecodeTime(0.f),
- mMaxDecodeTimePerMsg(0.f),
- mBanFromTrusted(false),
-- mBanFromUntrusted(false),
-- mHandlerFunc(NULL),
-- mUserData(NULL)
-+ mBanFromUntrusted(false)
- {
- mName = LLMessageStringTable::getInstance()->getString(name);
- }
-@@ -361,21 +387,84 @@ public:
- return mDeprecation;
- }
-
-- void setHandlerFunc(void (*handler_func)(LLMessageSystem *msgsystem, void **user_data), void **user_data)
-+ /**
-+ * @brief Adds a handler
-+ * This function adds a new handler to be called when the message arrives.
-+ * Repeated additions of the same handler function will be ignored.
-+ * @note delHandlerFunc() must be called to remove the registration
-+ * @param handler Function to call
-+ * @param user_data User specified data to pass to the function
-+ */
-+ void addHandlerFunc(message_handler_func_t handler, void **user_data)
-+ {
-+ LLMessageTemplateHandlerEntry h(handler, user_data);
-+
-+ if ( std::find(mHandlers.begin(), mHandlers.end(), h ) != mHandlers.end() )
-+ {
-+ return;
-+ }
-+
-+ mHandlers.push_back( h );
-+ }
-+
-+ /**
-+ * @brief Sets a handler
-+ * This function sets a handler to be called when the message arrives.
-+ * Any existing handlers are unregistered.
-+ * @note delHandlerFunc() must be called to remove the registration
-+ * @param handler Function to call
-+ * @param user_data User specified data to pass to the function
-+ */
-+ void setHandlerFunc(message_handler_func_t handler, void **user_data)
-+ {
-+ mHandlers.clear();
-+ if( handler )
-+ {
-+ addHandlerFunc(handler, user_data);
-+ }
-+ else
-+ {
-+ llwarns << "code has reset handler for \"" << mName << "\" by setting it to NULL." << llendl;
-+ }
-+ }
-+
-+ /**
-+ * @brief Removes a handler
-+ * Removes a handler from the list of handlers.
-+ * Attempts to remove handlers that aren't in the list are silently
-+ * ignored.
-+ * @param handler Function to remove
-+ */
-+ void delHandlerFunc(message_handler_func_t handler)
- {
-- mHandlerFunc = handler_func;
-- mUserData = user_data;
-+ mHandlers.remove( LLMessageTemplateHandlerEntry(handler) );
- }
-
- BOOL callHandlerFunc(LLMessageSystem *msgsystem) const
- {
-- if (mHandlerFunc)
-+ if ( mHandlers.empty() )
-+ {
-+ return FALSE;
-+ }
-+ /*
-+ * Be on the safe side and use for_each only when necessary. There is Linden code ("ReplyPayPrice") that
-+ * does not take the multiple reply handlers into account and simply tries to unregister
-+ * by setting the handler function to 0, unfortunately from within the reply handler so in this case
-+ * the for_each iterator inside std_algo.h is invalidated leading to a crash if the memory is reused
-+ * in between.
-+ */
-+ else if( mHandlers.size() == 1 )
- {
- LLPerfBlock msg_cb_time("msg_cb", mName);
-- mHandlerFunc(msgsystem, mUserData);
-+ mHandlers.begin()->call(msgsystem);
-+ return TRUE;
-+ }
-+ else
-+ {
-+ LLPerfBlock msg_cb_time("msg_cb", mName);
-+ std::for_each(mHandlers.begin(), mHandlers.end(), callHandler(msgsystem));
- return TRUE;
- }
-- return FALSE;
- }
-
- bool isUdpBanned() const
-@@ -420,9 +509,7 @@ public:
- bool mBanFromUntrusted;
-
- private:
-- // message handler function (this is set by each application)
-- void (*mHandlerFunc)(LLMessageSystem *msgsystem, void **user_data);
-- void **mUserData;
-+ std::list<LLMessageTemplateHandlerEntry> mHandlers;
- };
-
- #endif // LL_LLMESSAGETEMPLATE_H
-diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
-index 9ca7211..30bf722 100644
---- a/indra/llmessage/message.cpp
-+++ b/indra/llmessage/message.cpp
-@@ -2972,7 +2972,7 @@ void LLMessageSystem::addTemplate(LLMessageTemplate *templatep)
- }
-
-
--void LLMessageSystem::setHandlerFuncFast(const char *name, void (*handler_func)(LLMessageSystem *msgsystem, void **user_data), void **user_data)
-+void LLMessageSystem::setHandlerFuncFast(const char *name, message_handler_func_t handler_func, void **user_data)
- {
- LLMessageTemplate* msgtemplate = get_ptr_in_map(mMessageTemplates, name);
- if (msgtemplate)
-@@ -2985,6 +2985,32 @@ void LLMessageSystem::setHandlerFuncFast(const char *name, void (*handler_func)(
- }
- }
-
-+void LLMessageSystem::addHandlerFuncFast(const char *name, message_handler_func_t handler_func, void **user_data)
-+{
-+ LLMessageTemplate* msgtemplate = get_ptr_in_map(mMessageTemplates, name);
-+ if (msgtemplate)
-+ {
-+ msgtemplate->addHandlerFunc(handler_func, user_data);
-+ }
-+ else
-+ {
-+ llerrs << name << " is not a known message name!" << llendl;
-+ }
-+}
-+
-+void LLMessageSystem::delHandlerFuncFast(const char *name, message_handler_func_t handler_func)
-+{
-+ LLMessageTemplate* msgtemplate = get_ptr_in_map(mMessageTemplates, name);
-+ if (msgtemplate)
-+ {
-+ msgtemplate->delHandlerFunc(handler_func);
-+ }
-+ else
-+ {
-+ llerrs << name << " is not a known message name!" << llendl;
-+ }
-+}
-+
- bool LLMessageSystem::callHandler(const char *name,
- bool trustedSource, LLMessageSystem* msg)
- {
-diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
-index b72aa9a..eff2d20 100644
---- a/indra/llmessage/message.h
-+++ b/indra/llmessage/message.h
-@@ -179,7 +179,7 @@ enum EMessageException
- MX_WROTE_PAST_BUFFER_SIZE // wrote past buffer size in zero code expand
- };
- typedef void (*msg_exception_callback)(LLMessageSystem*,void*,EMessageException);
--
-+typedef void (*message_handler_func_t)(LLMessageSystem *msgsystem, void **user_data);
-
- // message data pieces are used to collect the data called for by the message template
- class LLMsgData;
-@@ -299,12 +299,24 @@ public:
-
-
- // methods for building, sending, receiving, and handling messages
-- void setHandlerFuncFast(const char *name, void (*handler_func)(LLMessageSystem *msgsystem, void **user_data), void **user_data = NULL);
-- void setHandlerFunc(const char *name, void (*handler_func)(LLMessageSystem *msgsystem, void **user_data), void **user_data = NULL)
-+ void setHandlerFuncFast(const char *name, message_handler_func_t, void **user_data = NULL);
-+ void setHandlerFunc(const char *name, message_handler_func_t handler_func, void **user_data = NULL)
- {
- setHandlerFuncFast(LLMessageStringTable::getInstance()->getString(name), handler_func, user_data);
- }
-
-+ void addHandlerFuncFast(const char *name, message_handler_func_t, void **user_data = NULL);
-+ void addHandlerFunc(const char *name, message_handler_func_t handler_func, void **user_data = NULL)
-+ {
-+ addHandlerFuncFast(LLMessageStringTable::getInstance()->getString(name), handler_func, user_data);
-+ }
-+
-+ void delHandlerFuncFast(const char *name, message_handler_func_t);
-+ void delHandlerFunc(const char *name, message_handler_func_t handler_func)
-+ {
-+ delHandlerFuncFast(LLMessageStringTable::getInstance()->getString(name), handler_func);
-+ }
-+
- // Set a callback function for a message system exception.
- void setExceptionFunc(EMessageException exception, msg_exception_callback func, void* data = NULL);
- // Call the specified exception func, and return TRUE if a
-diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
-index 92bcb88..f64c6ed 100644
---- a/indra/llui/llscrolllistctrl.cpp
-+++ b/indra/llui/llscrolllistctrl.cpp
-@@ -703,6 +703,29 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllSelected() const
- return ret;
- }
-
-+/**
-+ * Returns the selected IDs
-+ * @returns List of selected IDs
-+ * @author Dale Glass
-+ */
-+LLDynamicArray<LLUUID> LLScrollListCtrl::getSelectedIDs()
-+{
-+ LLUUID selected_id;
-+ LLDynamicArray<LLUUID> ret;
-+
-+ item_list::const_iterator iter;
-+ for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
-+ {
-+ LLScrollListItem* item = *iter;
-+ if (item->getSelected())
-+ {
-+ ret.push_back(item->getUUID());
-+ }
-+ }
-+ return ret;
-+}
-+
-+
- S32 LLScrollListCtrl::getFirstSelectedIndex() const
- {
- S32 CurSelectedIndex = 0;
-@@ -2534,6 +2557,23 @@ void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar, void
- }
-
-
-+/**
-+ * Re-sorts the list
-+ *
-+ * This function allows to avoid multiple unnecessary sorts in the case where
-+ * multiple elements will be added or removed at once.
-+ * @author Dale Glass
-+ */
-+void LLScrollListCtrl::sort()
-+{
-+ // sort by column 0, in ascending order
-+ std::stable_sort(
-+ mItemList.begin(),
-+ mItemList.end(),
-+ SortScrollListItem(mSortColumns));
-+}
-+
-+
- void LLScrollListCtrl::sortByColumn(const std::string& name, BOOL ascending)
- {
- std::map<std::string, LLScrollListColumn>::iterator itor = mColumns.find(name);
-@@ -3851,3 +3891,4 @@ BOOL LLColumnHeader::canResize()
- {
- return getVisible() && (mHasResizableElement || mColumn->mDynamicWidth);
- }
-+
-diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
-index 12b8e2c..e415821 100644
---- a/indra/llui/llscrolllistctrl.h
-+++ b/indra/llui/llscrolllistctrl.h
-@@ -421,6 +421,7 @@ public:
- // Sets an array of column descriptors
- void setColumnHeadings(LLSD headings);
- void sortByColumnIndex(U32 column, BOOL ascending);
-+ void sort();
-
- // LLCtrlListInterface functions
- virtual S32 getItemCount() const;
-@@ -518,6 +519,7 @@ public:
- virtual S32 getFirstSelectedIndex() const;
- std::vector<LLScrollListItem*> getAllSelected() const;
- LLScrollListItem* getLastSelectedItem() const { return mLastSelected; }
-+ LLDynamicArray<LLUUID> getSelectedIDs();
-
- // iterate over all items
- LLScrollListItem* getFirstData() const;
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..563bee2 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -122,6 +122,7 @@ set(viewer_SOURCE_FILES
- llfloateranimpreview.cpp
- llfloaterauction.cpp
- llfloateravatarinfo.cpp
-+ llfloateravatarlist.cpp
- llfloateravatarpicker.cpp
- llfloateravatartextures.cpp
- llfloaterbeacons.cpp
-@@ -244,6 +245,7 @@ set(viewer_SOURCE_FILES
- llpanelaudioprefs.cpp
- llpanelaudiovolume.cpp
- llpanelavatar.cpp
-+ llpaneldatabase.cpp
- llpanelclassified.cpp
- llpanelcontents.cpp
- llpaneldebug.cpp
-@@ -638,6 +640,7 @@ set(viewer_HEADER_FILES
- llpanelaudioprefs.h
- llpanelaudiovolume.h
- llpanelavatar.h
-+ llpaneldatabase.h
- llpanelclassified.h
- llpanelcontents.h
- llpaneldebug.h
-diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
-index 9dac926..866e125 100644
---- a/indra/newview/app_settings/settings.xml
-+++ b/indra/newview/app_settings/settings.xml
-@@ -2633,6 +2633,22 @@
- <integer>0</integer>
- </array>
- </map>
-+ <key>FloaterAvatarListRect</key>
-+ <map>
-+ <key>Comment</key>
-+ <string>Rectangle avatar list window</string>
-+ <key>Persist</key>
-+ <integer>1</integer>
-+ <key>Type</key>
-+ <string>Rect</string>
-+ <key>Value</key>
-+ <array>
-+ <integer>0</integer>
-+ <integer>400</integer>
-+ <integer>200</integer>
-+ <integer>0</integer>
-+ </array>
-+ </map>
- <key>FloaterAudioVolumeRect</key>
- <map>
- <key>Comment</key>
-diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
-index 2237d67..5360999 100644
---- a/indra/newview/llagent.cpp
-+++ b/indra/newview/llagent.cpp
-@@ -67,6 +67,7 @@
- #include "llfloater.h"
- #include "llfloateractivespeakers.h"
- #include "llfloateravatarinfo.h"
-+#include "llfloateravatarlist.h"
- #include "llfloaterbuildoptions.h"
- #include "llfloatercamera.h"
- #include "llfloaterchat.h"
-@@ -2747,7 +2748,18 @@ void LLAgent::startTyping()
- {
- sendAnimationRequest(ANIM_AGENT_TYPE, ANIM_REQUEST_START);
- }
-- gChatBar->sendChatFromViewer("", CHAT_TYPE_START, FALSE);
-+ sendChat("", 0, CHAT_TYPE_START, false);
-+
-+ // Addition for avatar list support.
-+ // Makes the fact that this avatar is typing appear in the list
-+ if ( NULL != gFloaterAvatarList )
-+ {
-+ LLAvatarListEntry *ent = gFloaterAvatarList->getAvatarEntry(getID());
-+ if ( NULL != ent )
-+ {
-+ ent->setActivity(ACTIVITY_TYPING);
-+ }
-+ }
- }
-
- //-----------------------------------------------------------------------------
-@@ -2759,7 +2771,7 @@ void LLAgent::stopTyping()
- {
- clearRenderState(AGENT_STATE_TYPING);
- sendAnimationRequest(ANIM_AGENT_TYPE, ANIM_REQUEST_STOP);
-- gChatBar->sendChatFromViewer("", CHAT_TYPE_STOP, FALSE);
-+ sendChat("", 0, CHAT_TYPE_STOP, false);
- }
- }
-
-@@ -4585,10 +4597,16 @@ void LLAgent::heardChat(const LLUUID& id)
- mChatTimer.reset();
- }
-
-+
-+void LLAgent::lookAtLastChat()
-+{
-+ lookAtObject(mLastChatterID, CAMERA_POSITION_SELF);
-+}
-+
- //-----------------------------------------------------------------------------
- // lookAtLastChat()
- //-----------------------------------------------------------------------------
--void LLAgent::lookAtLastChat()
-+void LLAgent::lookAtObject(LLUUID object_id, ECameraPosition camera_pos)
- {
- // Block if camera is animating or not in normal third person camera mode
- if (mCameraAnimating || !cameraThirdPerson())
-@@ -4596,7 +4614,7 @@ void LLAgent::lookAtLastChat()
- return;
- }
-
-- LLViewerObject *chatter = gObjectList.findObject(mLastChatterID);
-+ LLViewerObject *chatter = gObjectList.findObject(object_id);
- if (chatter)
- {
- LLVector3 delta_pos;
-@@ -4625,15 +4643,39 @@ void LLAgent::lookAtLastChat()
- new_camera_pos -= delta_pos * 0.4f;
- new_camera_pos += left * 0.3f;
- new_camera_pos += up * 0.2f;
-+
-+ F32 radius = chatter_av->getVObjRadius();
-+ LLVector3d view_dist(radius, radius, 0.0f);
-+
- if (chatter_av->mHeadp)
- {
-- setFocusGlobal(getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition()), mLastChatterID);
-+ setFocusGlobal(getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition()), object_id);
- mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition());
-+
-+ switch(camera_pos)
-+ {
-+ case CAMERA_POSITION_SELF:
-+ mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition());
-+ break;
-+ case CAMERA_POSITION_OBJECT:
-+ mCameraFocusOffsetTarget = view_dist;
-+ break;
-+ }
- }
- else
- {
-- setFocusGlobal(chatter->getPositionGlobal(), mLastChatterID);
-+ setFocusGlobal(chatter->getPositionGlobal(), object_id);
- mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
-+
-+ switch(camera_pos)
-+ {
-+ case CAMERA_POSITION_SELF:
-+ mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
-+ break;
-+ case CAMERA_POSITION_OBJECT:
-+ mCameraFocusOffsetTarget = view_dist;
-+ break;
-+ }
- }
- setFocusOnAvatar(FALSE, TRUE);
- }
-@@ -4655,8 +4697,20 @@ void LLAgent::lookAtLastChat()
- new_camera_pos += left * 0.3f;
- new_camera_pos += up * 0.2f;
-
-- setFocusGlobal(chatter->getPositionGlobal(), mLastChatterID);
-- mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
-+ setFocusGlobal(chatter->getPositionGlobal(), object_id);
-+
-+ switch(camera_pos)
-+ {
-+ case CAMERA_POSITION_SELF:
-+ mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
-+ break;
-+ case CAMERA_POSITION_OBJECT:
-+ F32 radius = chatter->getVObjRadius();
-+ LLVector3d view_dist(radius, radius, 0.0f);
-+ mCameraFocusOffsetTarget = view_dist;
-+ break;
-+ }
-+
- setFocusOnAvatar(FALSE, TRUE);
- }
- }
-@@ -6012,6 +6066,57 @@ void LLAgent::setTeleportState(ETeleportState state)
- }
- }
-
-+void LLAgent::sendChat(const std::string &text, S32 channel, EChatType type, bool animate)
-+{
-+
-+ // Don't animate for chats people can't hear (chat to scripts)
-+ if (animate && (channel == 0))
-+ {
-+ if (type == CHAT_TYPE_WHISPER)
-+ {
-+ lldebugs << "You whisper " << text << llendl;
-+ sendAnimationRequest(ANIM_AGENT_WHISPER, ANIM_REQUEST_START);
-+ }
-+ else if (type == CHAT_TYPE_NORMAL)
-+ {
-+ lldebugs << "You say " << text << llendl;
-+ sendAnimationRequest(ANIM_AGENT_TALK, ANIM_REQUEST_START);
-+ }
-+ else if (type == CHAT_TYPE_SHOUT)
-+ {
-+ lldebugs << "You shout " << text << llendl;
-+ sendAnimationRequest(ANIM_AGENT_SHOUT, ANIM_REQUEST_START);
-+ }
-+ else
-+ {
-+ llinfos << "send_chat_from_viewer() - invalid volume" << llendl;
-+ return;
-+ }
-+ }
-+ else
-+ {
-+ if (type != CHAT_TYPE_START && type != CHAT_TYPE_STOP)
-+ {
-+ lldebugs << "Channel chat: " << text << llendl;
-+ }
-+ }
-+
-+ LLMessageSystem* msg = gMessageSystem;
-+
-+ msg->newMessageFast(_PREHASH_ChatFromViewer);
-+ msg->nextBlockFast(_PREHASH_AgentData);
-+ msg->addUUIDFast(_PREHASH_AgentID, getID());
-+ msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
-+ msg->nextBlockFast(_PREHASH_ChatData);
-+ msg->addStringFast(_PREHASH_Message, text);
-+ msg->addU8Fast(_PREHASH_Type, type);
-+ msg->addS32("Channel", channel);
-+
-+ gAgent.sendReliableMessage();
-+
-+ LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
-+}
-+
- void LLAgent::fidget()
- {
- if (!getAFK())
-diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
-index 2befeb0..37b797a 100644
---- a/indra/newview/llagent.h
-+++ b/indra/newview/llagent.h
-@@ -36,6 +36,7 @@
-
- #include "indra_constants.h"
- #include "llmath.h"
-+#include "llchat.h"
- #include "llcontrol.h"
- #include "llcoordframe.h"
- #include "llevent.h"
-@@ -80,6 +81,15 @@ typedef enum e_camera_modes
- CAMERA_MODE_FOLLOW
- } ECameraMode;
-
-+/**
-+ * @brief When looking at an object, where is the camera offset from
-+ */
-+typedef enum e_camera_position
-+{
-+ CAMERA_POSITION_SELF, /** Camera positioned at our position */
-+ CAMERA_POSITION_OBJECT /** Camera positioned at observed object's position */
-+} ECameraPosition;
-+
- typedef enum e_anim_request
- {
- ANIM_REQUEST_START,
-@@ -206,6 +216,7 @@ public:
-
- void heardChat(const LLUUID& id);
- void lookAtLastChat();
-+ void lookAtObject(LLUUID avatar_id, ECameraPosition camera_pos);
- F32 getTypingTime() { return mTypingTimer.getElapsedTimeF32(); }
-
- void setAFK();
-@@ -479,6 +490,9 @@ public:
-
- const std::string getTeleportSourceSLURL() const { return mTeleportSourceSLURL; }
-
-+ void sendChat(const std::string &text, S32 channel = 0, EChatType type = CHAT_TYPE_NORMAL, bool animate = false);
-+ void sendChat(const std::wstring &text, S32 channel = 0, EChatType type = CHAT_TYPE_NORMAL, bool animate = false)
-+ { sendChat(wstring_to_utf8str(text), channel, type, animate); }
-
- // Setting the ability for this avatar to proxy for another avatar.
- //static void processAddModifyAbility(LLMessageSystem* msg, void**);
-diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
-index 49991b4..6d8c85a 100644
---- a/indra/newview/llappviewer.cpp
-+++ b/indra/newview/llappviewer.cpp
-@@ -33,6 +33,7 @@
- #include "llviewerprecompiledheaders.h"
- #include "llappviewer.h"
- #include "llprimitive.h"
-+#include "llfloateravatarlist.h"
-
- #include "llversionviewer.h"
- #include "llfeaturemanager.h"
-@@ -3139,6 +3140,9 @@ void LLAppViewer::idle()
- }
- gFrameStats.addFrameData();
- }
-+
-+ // Update avatar list
-+ gFloaterAvatarList->updateAvatarList();
-
- if (!gDisconnected)
- {
-diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
-index 2d9d356..f6aefdf 100644
---- a/indra/newview/llchatbar.cpp
-+++ b/indra/newview/llchatbar.cpp
-@@ -585,39 +585,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
- utf8_text = utf8str_truncate(utf8_text, MAX_STRING - 1);
- }
-
-- // Don't animate for chats people can't hear (chat to scripts)
-- if (animate && (channel == 0))
-- {
-- if (type == CHAT_TYPE_WHISPER)
-- {
-- lldebugs << "You whisper " << utf8_text << llendl;
-- gAgent.sendAnimationRequest(ANIM_AGENT_WHISPER, ANIM_REQUEST_START);
-- }
-- else if (type == CHAT_TYPE_NORMAL)
-- {
-- lldebugs << "You say " << utf8_text << llendl;
-- gAgent.sendAnimationRequest(ANIM_AGENT_TALK, ANIM_REQUEST_START);
-- }
-- else if (type == CHAT_TYPE_SHOUT)
-- {
-- lldebugs << "You shout " << utf8_text << llendl;
-- gAgent.sendAnimationRequest(ANIM_AGENT_SHOUT, ANIM_REQUEST_START);
-- }
-- else
-- {
-- llinfos << "send_chat_from_viewer() - invalid volume" << llendl;
-- return;
-- }
-- }
-- else
-- {
-- if (type != CHAT_TYPE_START && type != CHAT_TYPE_STOP)
-- {
-- lldebugs << "Channel chat: " << utf8_text << llendl;
-- }
-- }
--
-- send_chat_from_viewer(utf8_out_text, type, channel);
-+ gAgent.sendChat(utf8_out_text, channel, type, animate);
- }
-
- void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
-diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
-new file mode 100644
-index 0000000..e1656eb
---- /dev/null
-+++ b/indra/newview/llfloateravatarlist.cpp
-@@ -0,0 +1,2187 @@
-+/**
-+ * @file llfloatermute.cpp
-+ * @brief Container for mute list
-+ *
-+ * @author Dale Glass <dale at daleglass.net>, (C) 2007
-+ */
-+
-+#include "llviewerprecompiledheaders.h" // must be first include
-+
-+#include "llavatarconstants.h"
-+#include "llfloateravatarlist.h"
-+
-+#include "lluictrlfactory.h" // builds floaters from XML
-+#include "llviewerwindow.h"
-+#include "llscrolllistctrl.h"
-+
-+#include "llvoavatar.h"
-+#include "llimview.h"
-+#include "llfloateravatarinfo.h"
-+#include "llregionflags.h"
-+#include "llfloaterreporter.h"
-+#include "llagent.h"
-+#include "llviewerregion.h"
-+#include "lltracker.h"
-+#include "llviewercontrol.h"
-+#include "llviewerstats.h"
-+#include "llerror.h"
-+#include "llchat.h"
-+#include "llviewermessage.h"
-+#include "llweb.h"
-+#include "llviewerobjectlist.h"
-+#include "llmutelist.h"
-+#include "llviewerimagelist.h"
-+#include "llworld.h"
-+#include "llcachename.h"
-+#include "llviewercamera.h"
-+
-+#include <time.h>
-+#include <string.h>
-+
-+#include <map>
-+
-+
-+// Timeouts
-+/**
-+ * @brief How long to keep showing an activity, in seconds
-+ */
-+const F32 ACTIVITY_TIMEOUT = 1.0f;
-+
-+
-+/**
-+ * @brief How many seconds to wait between data requests
-+ *
-+ * This is intended to avoid flooding the server with requests
-+ */
-+const F32 MIN_REQUEST_INTERVAL = 1.0f;
-+
-+/**
-+ * @brief How long to wait for a request to arrive during the first try in seconds
-+ */
-+const F32 FIRST_REQUEST_TIMEOUT = 16.0f;
-+
-+/**
-+ * @brief Delay is doubled on each attempt. This is as high as it'll go
-+ */
-+const F32 MAX_REQUEST_TIMEOUT = 2048.0f;
-+
-+/**
-+ * How long to wait for a request to arrive before assuming failure
-+ * and showing the failure icon in the list. This is just for the user's
-+ * information, if a reply arrives after this interval we'll accept it anyway.
-+ */
-+const F32 REQUEST_FAIL_TIMEOUT = 15.0f;
-+
-+/**
-+ * How long to keep people who are gone in the list. After this time is reached,
-+ * they're not shown in the list anymore, but still kept in memory until
-+ * CLEANUP_TIMEOUT is reached.
-+ */
-+const F32 DEAD_KEEP_TIME = 10.0f;
-+
-+/**
-+ * @brief How long to keep entries around before removing them.
-+ *
-+ * @note Longer term, data like birth and payment info should be cached on disk.
-+ */
-+const F32 CLEANUP_TIMEOUT = 3600.0f;
-+
-+
-+/**
-+ * @brief TrustNet channel
-+ * This is fixed in the adapter script.
-+ */
-+const S32 TRUSTNET_CHANNEL = 0x44470002;
-+
-+
-+extern U32 gFrameCount;
-+
-+
-+LLAvListTrustNetScore::LLAvListTrustNetScore(std::string type, F32 score)
-+{
-+ Score = score;
-+ Type = type;
-+}
-+
-+LLAvatarInfo::LLAvatarInfo()
-+{
-+}
-+
-+LLAvatarInfo::LLAvatarInfo(PAYMENT_TYPE payment, ACCOUNT_TYPE account, struct tm birth)
-+{
-+ Payment = payment;
-+ Account = account;
-+ BirthDate = birth;
-+}
-+
-+S32 LLAvatarInfo::getAge()
-+{
-+ time_t birth = mktime(&BirthDate);
-+ time_t now = time(NULL);
-+ return(S32)(difftime(now,birth) / (60*60*24));
-+}
-+
-+void LLAvatarListEntry::setPosition(LLVector3d position)
-+{
-+ if ( mPosition != position )
-+ {
-+ setActivity(ACTIVITY_MOVING);
-+ }
-+
-+ mPosition = position;
-+ mFrame = gFrameCount;
-+ mUpdateTimer.start();
-+}
-+
-+LLVector3d LLAvatarListEntry::getPosition()
-+{
-+ return mPosition;
-+}
-+
-+U32 LLAvatarListEntry::getEntryAgeFrames()
-+{
-+ return (gFrameCount - mFrame);
-+}
-+
-+F32 LLAvatarListEntry::getEntryEnteredSeconds()
-+{
-+ return mEnteredTimer.getElapsedTimeF32();
-+}
-+
-+F32 LLAvatarListEntry::getEntryAgeSeconds()
-+{
-+ return mUpdateTimer.getElapsedTimeF32();
-+}
-+
-+void LLAvatarListEntry::setName(std::string name)
-+{
-+ if ( name.empty() || (name.compare(" ") == 0))
-+ {
-+ llwarns << "Trying to set empty name" << llendl;
-+ }
-+ mName = name;
-+}
-+
-+std::string LLAvatarListEntry::getName()
-+{
-+ return mName;
-+}
-+
-+LLUUID LLAvatarListEntry::getID()
-+{
-+ return mID;
-+}
-+
-+void LLAvatarListEntry::setID(LLUUID id)
-+{
-+ if ( id.isNull() )
-+ {
-+ llwarns << "Trying to set null id" << llendl;
-+ }
-+ mID = id;
-+}
-+
-+BOOL LLAvatarListEntry::getIsLinden()
-+{
-+ // Are there any employees that are not a Linden?
-+ // I suppose this is a bit redundant.
-+ return ( mIsLinden || ( mAvatarInfo.getValue().Account == ACCOUNT_EMPLOYEE ) );
-+}
-+
-+void LLAvatarListEntry::setAccountCustomTitle(std::string &title)
-+{
-+ mAccountTitle = title;
-+ mAvatarInfo.getValue().Account = ACCOUNT_CUSTOM;
-+}
-+
-+std::string LLAvatarListEntry::getAccountCustomTitle()
-+{
-+ return mAccountTitle;
-+}
-+
-+
-+
-+void LLAvatarListEntry::setActivity(ACTIVITY_TYPE activity)
-+{
-+ if ( activity >= mActivityType || mActivityTimer.getElapsedTimeF32() > ACTIVITY_TIMEOUT )
-+ {
-+ mActivityType = activity;
-+ mActivityTimer.start();
-+ }
-+}
-+
-+ACTIVITY_TYPE LLAvatarListEntry::getActivity()
-+{
-+ if ( mActivityTimer.getElapsedTimeF32() > ACTIVITY_TIMEOUT )
-+ {
-+ mActivityType = ACTIVITY_NONE;
-+ }
-+
-+ return mActivityType;
-+}
-+
-+void LLAvatarListEntry::toggleMark()
-+{
-+ mMarked = !mMarked;
-+}
-+
-+BOOL LLAvatarListEntry::isMarked()
-+{
-+ return mMarked;
-+}
-+
-+BOOL LLAvatarListEntry::isDead()
-+{
-+ return getEntryAgeSeconds() > DEAD_KEEP_TIME;
-+}
-+
-+// Avatar list is global
-+LLFloaterAvatarList* gFloaterAvatarList = NULL;
-+
-+
-+
-+
-+LLFloaterAvatarList::LLFloaterAvatarList() : LLFloater("avatar list")
-+{
-+
-+ // Default values
-+ mTracking = FALSE;
-+ mTrackByLocation = FALSE;
-+ mARLastFrame = 0;
-+
-+ // Create interface from XML
-+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_scanner.xml");
-+
-+ // Floater starts hidden
-+ setVisible(FALSE);
-+
-+ // Set callbacks
-+ //childSetAction("refresh_btn", onClickRefresh, this);
-+ childSetAction("profile_btn", onClickProfile, this);
-+ childSetAction("im_btn", onClickIM, this);
-+ childSetAction("track_btn", onClickTrack, this);
-+ childSetAction("mark_btn", onClickMark, this);
-+
-+ childSetAction("gowarn_btn", onClickGohomerWarn, this);
-+ childSetAction("goeject_btn", onClickGohomerEject, this);
-+ childSetAction("goaway_btn", onClickGohomerSendAway, this);
-+ childSetAction("gohome_btn", onClickGohomerSendHome, this);
-+ childSetAction("gohomeoff_btn", onClickGohomerOff, this);
-+ childSetAction("gokey_btn", onClickGohomerSendHomeByKey, this);
-+
-+ childSetAction("prev_in_list_btn", onClickPrevInList, this);
-+ childSetAction("next_in_list_btn", onClickNextInList, this);
-+ childSetAction("prev_marked_btn", onClickPrevMarked, this);
-+ childSetAction("next_marked_btn", onClickNextMarked, this);
-+
-+ childSetAction("get_key_btn", onClickGetKey, this);
-+
-+ childSetAction("tn_rate_btn", onClickTrustNetRate, this);
-+ childSetAction("tn_explain_btn", onClickTrustNetExplain, this);
-+ childSetAction("tn_website_btn", onClickTrustNetWebsite, this);
-+ childSetAction("tn_password_btn", onClickTrustNetGetPassword, this);
-+ childSetAction("tn_renew_btn", onClickTrustNetRenew, this);
-+
-+ childSetAction("freeze_btn", onClickFreeze, this);
-+ childSetAction("eject_btn", onClickEject, this);
-+// childSetAction("ban_btn", onClickBan, this);
-+// childSetAction("unban_btn", onClickUnban, this);
-+ childSetAction("mute_btn", onClickMute, this);
-+// childSetAction("unmute_btn", onClickUnmute, this);
-+ childSetAction("ar_btn", onClickAR, this);
-+ childSetAction("teleport_btn", onClickTeleport, this);
-+ childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
-+
-+ setDefaultBtn("refresh_btn");
-+
-+ // Get a pointer to the scroll list from the interface
-+ mAvatarList = getChild<LLScrollListCtrl>("avatar_list");
-+
-+ mAvatarList->setCallbackUserData(this);
-+ mAvatarList->setDoubleClickCallback(onDoubleClick);
-+ mAvatarList->sortByColumn("distance", TRUE);
-+ mDataRequestTimer.start();
-+ refreshAvatarList();
-+
-+ LLMessageSystem *msg = gMessageSystem;
-+ msg->addHandlerFunc("AvatarPropertiesReply", processAvatarPropertiesReply);
-+}
-+
-+LLFloaterAvatarList::~LLFloaterAvatarList()
-+{
-+ LLMessageSystem *msg = gMessageSystem;
-+ if ( msg )
-+ {
-+ msg->delHandlerFunc("AvatarPropertiesReply", processAvatarPropertiesReply);
-+ }
-+ std::map< LLUUID, LLPointer< LLHUDObject > >::iterator it = mHudObjectMap.begin();
-+ for ( ; it != mHudObjectMap.end(); ++it )
-+ { // clean up list
-+ it->second->markDead();
-+ }
-+
-+}
-+
-+
-+void LLFloaterAvatarList::show()
-+{
-+ // Make sure we make a noise.
-+ open();
-+}
-+
-+//static
-+void LLFloaterAvatarList::toggle(void*) {
-+ if (!gFloaterAvatarList) {
-+ llinfos << "No avatar list!" << llendl;
-+ return;
-+ }
-+
-+ if (gFloaterAvatarList->getVisible())
-+ {
-+ gFloaterAvatarList->close();
-+ }
-+ else
-+ {
-+ gFloaterAvatarList->show();
-+ }
-+}
-+
-+//static
-+BOOL LLFloaterAvatarList::visible(void*)
-+{
-+ return (gFloaterAvatarList && gFloaterAvatarList->getVisible());
-+}
-+
-+void LLFloaterAvatarList::updateFromCoarse()
-+{
-+ /*
-+ * Walk through remaining list of coarse update avatars in all known regions
-+ * this will not give us an accurate height since it's mod 2048 and least possible
-+ * increment is 4 meter. Coarse Update information is accurate instantly while
-+ * the object list is filled one by one.
-+ *
-+ * This also works for neighbour sims which makes it really handy :)
-+ */
-+
-+ // first wipe the list clean from coarse entries
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+ for(iter = mAvatars.begin(); iter != mAvatars.end();)
-+ {
-+ LLAvatarListEntry entry = iter->second;
-+ if ( entry.getIsCoarse() )
-+ {
-+ mAvatars.erase( iter++ );
-+ }
-+ else
-+ {
-+ ++iter;
-+ }
-+ }
-+
-+ LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
-+ LLWorld::region_list_t::const_iterator it = regions.begin();
-+
-+ for ( ; it != regions.end(); ++it )
-+ {
-+ LLViewerRegion const *region = *it;
-+ if ( !region )
-+ {
-+ llwarns << "null region while parsing region list" << llendl;
-+ continue;
-+ }
-+
-+ for (int idx = 0; idx < region->mMapAvatarIDs.count(); ++idx)
-+ {
-+ LLUUID avid = region->mMapAvatarIDs.get( idx );
-+
-+ if ( avid.isNull() )
-+ {
-+ continue;
-+ }
-+
-+ // we need to accomodate for avatars that are stuck in the
-+ // object list while still accurately received in the coarse
-+ // location list
-+ U32 modpos = region->mMapAvatars.get( idx );
-+ LLVector3 localpos;
-+ localpos[0] = (modpos >> 16) & 0xff;
-+ localpos[1] = (modpos >> 8) & 0xff;
-+ // scale z-position
-+ localpos[2] = (modpos & 0xff) << 2;
-+ LLVector3d position = region->getPosGlobalFromRegion( localpos );
-+
-+ if ( ( mAvatars.count( avid ) > 0 ) && ( !mAvatars[ avid ].isDead() ) )
-+ {
-+ // Avatar already in list but could be one of these "perpetual motion" avatars
-+ // which would overlay the real coordinates, so we check for the distance disregarding
-+ // the z axis
-+ LLVector3d coarsepos = position;
-+ coarsepos[2] = 0.0;
-+ LLVector3d vopos = mAvatars[ avid ].mPosition;
-+ vopos[2] = 0.0;
-+ LLVector3d dist = coarsepos - vopos;
-+ if ( dist.magVecSquared() > ( 50.0 * 50.0 ) )
-+ {
-+ // Avatar already in list, but position info is
-+ // out of sync so use coarse info, we can safely overwrite
-+ // the info here since we are called after the VOlist has
-+ // already been parsed. The only issue is that this will now
-+ // show the avatar as perpetually moving
-+ mAvatars[ avid ].setPosition( coarsepos );
-+ }
-+ // Avatar already in list, active and
-+ // close enough to coarse info, so skip
-+ continue;
-+ }
-+
-+ // Avatar not there yet, add it
-+ std::string name;
-+ BOOL isLinden = FALSE;
-+ if ( !gCacheName->getFullName( avid, name ) )
-+ {
-+ continue; // wait for proper name
-+ }
-+ else
-+ {
-+ std::string first, last;
-+ gCacheName->getName( avid, first, last );
-+ if ( last == "Linden" )
-+ {
-+ isLinden = TRUE;
-+ }
-+ }
-+
-+ std::string regionname;
-+ if ( gAgent.getRegion() && ( region->getName() != gAgent.getRegion()->getName() ) )
-+ {
-+ regionname = region->getName();
-+ }
-+
-+ // add as coarse info
-+ LLAvatarListEntry entry(avid, name, position, isLinden, TRUE, regionname);
-+ mAvatars[avid] = entry;
-+
-+ //llinfos << "avatar list refresh from coarse: adding " << name << llendl;
-+
-+ }
-+ }
-+}
-+
-+
-+void LLFloaterAvatarList::purgeAvatarHUDMap()
-+{
-+ std::map< LLUUID, LLPointer< LLHUDObject > >::iterator huditer = mHudObjectMap.begin();
-+ while ( huditer != mHudObjectMap.end() )
-+ {
-+ if ( mAvatars.count( huditer->first ) == 0 )
-+ {
-+ huditer->second->markDead();
-+ mHudObjectMap.erase( huditer++ );
-+ }
-+ else
-+ {
-+ ++huditer;
-+ }
-+ }
-+}
-+
-+
-+void LLFloaterAvatarList::updateAvatarList()
-+{
-+// LLVOAvatar *avatarp;
-+
-+ //llinfos << "avatar list refresh: updating map" << llendl;
-+
-+ // Check whether updates are enabled
-+ LLCheckboxCtrl* check;
-+ check = getChild<LLCheckBoxCtrl>("update_enabled_cb");
-+
-+ if ( !check->getValue() )
-+ {
-+ return;
-+ }
-+
-+
-+ /*
-+ * Iterate over all the avatars known at the time
-+ * NOTE: Is this the right way to do that? It does appear that LLVOAvatar::isInstances contains
-+ * the list of avatars known to the client. This seems to do the task of tracking avatars without
-+ * any additional requests.
-+ *
-+ * BUG: It looks like avatars sometimes get stuck in this list, and keep perpetually
-+ * moving in the same direction. My current guess is that somewhere else the client
-+ * doesn't notice an avatar disappeared, and keeps updating its position. This should
-+ * be solved at the source of the problem.
-+ */
-+ for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
-+ iter != LLCharacter::sInstances.end(); ++iter)
-+ {
-+ LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
-+
-+ // Skip if avatar is dead(what's that?)
-+ // or if the avatar is ourselves.
-+ if (avatarp->isDead() || avatarp->isSelf())
-+ {
-+ continue;
-+ }
-+
-+ // Get avatar data
-+ LLVector3d position = gAgent.getPosGlobalFromAgent(avatarp->getCharacterPosition());
-+ LLUUID avid = avatarp->getID();
-+ std::string name = avatarp->getFullname();
-+
-+ // Apparently, sometimes the name comes out empty, with a " " name. This is because
-+ // getFullname concatenates first and last name with a " " in the middle.
-+ // This code will avoid adding a nameless entry to the list until it acquires a name.
-+ if (name.empty() || (name.compare(" ") == 0))
-+ {
-+ llinfos << "Name empty for avatar " << avid << llendl;
-+ continue;
-+ }
-+
-+ if (avid.isNull())
-+ {
-+ llinfos << "Key empty for avatar " << name << llendl;
-+ continue;
-+ }
-+
-+ if ( ( mAvatars.count( avid ) > 0 ) && !mAvatars[avid].getIsCoarse() )
-+ {
-+ // Avatar already in list, update position
-+ mAvatars[avid].setPosition(position);
-+ }
-+ else
-+ {
-+ // Avatar not there yet or only from coarse list, add it properly
-+ BOOL isLinden = ( std::string( avatarp->getNVPair("LastName")->getString() ) == "Linden" );
-+
-+ LLAvatarListEntry entry(avid, name, position, isLinden);
-+ mAvatars[avid] = entry;
-+
-+ sendAvatarPropertiesRequest(avid);
-+ llinfos << "avatar list refresh: adding " << name << llendl;
-+
-+ }
-+
-+ }
-+
-+ updateFromCoarse();
-+
-+// llinfos << "avatar list refresh: done" << llendl;
-+
-+ expireAvatarList();
-+ refreshAvatarList();
-+
-+ purgeAvatarHUDMap();
-+
-+ checkTrackingStatus();
-+ processARQueue();
-+}
-+
-+void LLFloaterAvatarList::processARQueue()
-+{
-+ if ( mARQueue.empty() ) return;
-+
-+ LLUUID avatar_id = mARQueue.front();
-+
-+ if ( 0 == mARLastFrame )
-+ {
-+ // Start of the process: Move the camera to the avatar. This happens gradually,
-+ // so we'll give it a few frames
-+ gAgent.lookAtObject(avatar_id, CAMERA_POSITION_OBJECT);
-+ mARLastFrame = gFrameCount;
-+ return;
-+ }
-+
-+ if ( gFrameCount - mARLastFrame >= 10 )
-+ {
-+ // Camera should be in position, show AR screen now
-+ LLFloaterReporter *report = LLFloaterReporter::showFromObject(avatar_id, false);
-+ report->setMinimized(TRUE);
-+
-+ mARReporterQueue.push(report);
-+
-+ mARQueue.pop();
-+ mARLastFrame = 0;
-+
-+ if ( mARQueue.empty() )
-+ {
-+ // Now that all reports are taken, open them.
-+
-+ while( !mARReporterQueue.empty() )
-+ {
-+ LLFloaterReporter *r = mARReporterQueue.front();
-+ mARReporterQueue.pop();
-+
-+ r->open();
-+ r->setMinimized(FALSE);
-+ }
-+ }
-+ }
-+}
-+
-+void LLFloaterAvatarList::expireAvatarList()
-+{
-+// llinfos << "avatar list: expiring" << llendl;
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+ std::queue<LLUUID> delete_queue;
-+
-+ for(iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
-+ {
-+ LLAvatarListEntry *ent = &iter->second;
-+
-+ if ( ent->getEntryAgeFrames() >= 2 )
-+ {
-+ ent->setActivity(ACTIVITY_DEAD);
-+ }
-+
-+
-+ if ( ent->getEntryAgeSeconds() > CLEANUP_TIMEOUT )
-+ {
-+ llinfos << "avatar list: expiring avatar " << ent->getName() << llendl;
-+ LLUUID av_id = ent->getID();
-+ delete_queue.push(av_id);
-+ }
-+ }
-+
-+ while(!delete_queue.empty())
-+ {
-+ mAvatars.erase(delete_queue.front());
-+ if ( mHudObjectMap.count(delete_queue.front()) )
-+ {
-+ mHudObjectMap[delete_queue.front()]->markDead();
-+ mHudObjectMap.erase(delete_queue.front());
-+ }
-+ delete_queue.pop();
-+ }
-+}
-+
-+/**
-+ * Redraws the avatar list
-+ * Only does anything if the avatar list is visible.
-+ * @author Dale Glass
-+ */
-+void LLFloaterAvatarList::refreshAvatarList()
-+{
-+
-+
-+
-+ // Don't update list when interface is hidden
-+ if (!LLFloaterAvatarList::visible(NULL))
-+ {
-+ return;
-+ }
-+
-+
-+ LLCheckboxCtrl* fetch_data;
-+ fetch_data = getChild<LLCheckBoxCtrl>("fetch_avdata_enabled_cb");
-+
-+ //BOOL db_enabled = gSavedSettings.getBOOL("DBEnabled");
-+ //std::string db_avatar = gSavedPerAccountSettings.getString("DBAvatarName");
-+ //if ( db_avatar.empty() )
-+ //{
-+ // db_enabled = FALSE;
-+ //}
-+
-+
-+
-+ // We rebuild the list fully each time it's refreshed
-+
-+ // The assumption is that it's faster to refill it and sort than
-+ // to rebuild the whole list.
-+ LLDynamicArray<LLUUID> selected = mAvatarList->getSelectedIDs();
-+ S32 scrollpos = mAvatarList->getScrollPos();
-+
-+ mAvatarList->deleteAllItems();
-+
-+ LLVector3d mypos = gAgent.getPositionGlobal();
-+
-+ unsigned int counter = 0;
-+
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+ for(iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
-+ {
-+ LLSD element;
-+ LLUUID av_id;
-+
-+
-+ LLAvatarListEntry *ent = &iter->second;
-+
-+ // Skip if avatar hasn't been around
-+ if ( ent->isDead() )
-+ {
-+ continue;
-+ }
-+
-+ av_id = ent->getID();
-+
-+ // Get avatar name, position
-+ LLAvatarInfo avinfo = ent->mAvatarInfo.getValue();
-+ //LLAvListTrustNetScore avscore = ent->mTrustNetScore.getValue();
-+
-+ DATA_STATUS avinfo_status = ent->mAvatarInfo.getStatus();
-+ //DATA_STATUS avscore_status = ent->mTrustNetScore.getStatus();
-+
-+ LLVector3d position = ent->getPosition();
-+ LLVector3d delta = position - mypos;
-+ F32 distance = (F32)delta.magVec();
-+
-+ std::string icon = "";
-+
-+ // HACK: Workaround for an apparent bug:
-+ // sometimes avatar entries get stuck, and are registered
-+ // by the client as perpetually moving in the same direction.
-+ // this makes sure they get removed from the visible list eventually.
-+ // for the coarse list this is not necessary since it is always accurate
-+ if ( distance > 1024 && !ent->getIsCoarse() )
-+ {
-+ continue;
-+ }
-+
-+ if ( av_id.isNull() )
-+ {
-+ llwarns << "Avatar with null key somehow got into the list!" << llendl;
-+ continue;
-+ }
-+
-+ counter++;
-+
-+ element["id"] = av_id;
-+
-+ element["columns"][LIST_AVATAR_ICON]["column"] = "avatar_icon";
-+ element["columns"][LIST_AVATAR_ICON]["type"] = "text";
-+ if ( !ent->isMarked() )
-+ { // show counter if not marked
-+ element["columns"][LIST_AVATAR_ICON]["value"] = llformat("%d", counter);
-+ }
-+ else
-+ {
-+ element["columns"][LIST_AVATAR_ICON]["type"] = "icon";
-+ const LLUUID flag_blue("e39cbfe7-c4e7-3bad-5e5f-958082d55046");
-+ element["columns"][LIST_AVATAR_ICON]["value"] = flag_blue.asString();
-+ }
-+
-+
-+ if ( ent->getIsLinden() )
-+ {
-+ element["columns"][LIST_AVATAR_NAME]["font-style"] = "BOLD";
-+ }
-+
-+ if ( ent->getIsCoarse() )
-+ {
-+ element["columns"][LIST_AVATAR_NAME]["color"] = LLColor4::grey4.getValue();
-+ }
-+
-+ if ( ent->isFocused() )
-+ {
-+ element["columns"][LIST_AVATAR_NAME]["color"] = LLColor4::cyan.getValue();
-+ }
-+
-+ //element["columns"][LIST_AVATAR_NAME]["font-color"] = getAvatarColor(ent, distance).getValue();
-+ element["columns"][LIST_AVATAR_NAME]["column"] = "avatar_name";
-+ element["columns"][LIST_AVATAR_NAME]["type"] = "text";
-+ std::string agentname = ent->getName();
-+ if ( !ent->getIsSameRegion() )
-+ {
-+ agentname += " (" + ent->getRegionName() + ")";
-+ }
-+ element["columns"][LIST_AVATAR_NAME]["value"] = agentname.c_str();
-+
-+ char temp[32];
-+ snprintf(temp, sizeof(temp), "%.2f", distance);
-+
-+ element["columns"][LIST_DISTANCE]["column"] = "distance";
-+ element["columns"][LIST_DISTANCE]["type"] = "text";
-+ element["columns"][LIST_DISTANCE]["value"] = temp;
-+ element["columns"][LIST_DISTANCE]["color"] = getAvatarColor(ent, distance, CT_DISTANCE).getValue();
-+
-+
-+ if ( avinfo_status == DATA_RETRIEVED )
-+ {
-+ element["columns"][LIST_AGE]["column"] = "age";
-+ element["columns"][LIST_AGE]["type"] = "text";
-+ element["columns"][LIST_AGE]["value"] = avinfo.getAge();
-+ element["columns"][LIST_AGE]["color"] = getAvatarColor(ent, distance, CT_AGE).getValue();
-+ }
-+
-+ const LLUUID info_error("bbda234c-c76e-8617-0a32-46cc15c5ec42");
-+ const LLUUID info_fetching("1468fae4-2f47-6e75-d39f-3ccbd443d31c");
-+ const LLUUID info_unknown("0f2d532a-1fc8-01bb-eed3-ef60e7943d1e");
-+ const LLUUID payment_info_charter("07bef5d9-31b2-4cc5-999e-c2cd8b5d3a69");
-+ const LLUUID payment_info_filled("9d61c4d5-e8f6-78ec-a64f-490e3a4c03d5");
-+ const LLUUID payment_info_used("49ac7ef9-caaa-750a-6ec1-51358f0a1672");
-+
-+ /*
-+ element["columns"][LIST_SCORE]["column"] = "score";
-+ element["columns"][LIST_SCORE]["type"] = "text";
-+
-+ icon = "";
-+ switch(avscore_status)
-+ {
-+ case DATA_UNKNOWN:
-+ icon = info_unknown.asString();
-+ break;
-+ case DATA_REQUESTING:
-+ icon = info_fetching.asString();
-+ break;
-+ case DATA_ERROR:
-+ icon = info_error.asString();
-+ case DATA_RETRIEVED:
-+ element["columns"][LIST_SCORE]["value"] = avscore.Score;
-+ element["columns"][LIST_SCORE]["color"] = getAvatarColor(ent, distance, CT_SCORE).getValue();
-+ break;
-+ }
-+
-+ if (!icon.empty() )
-+ {
-+ element["columns"][LIST_SCORE].erase("color");
-+ element["columns"][LIST_SCORE]["type"] = "icon";
-+ element["columns"][LIST_SCORE]["value"] = icon;
-+ }*/
-+
-+
-+ // Get an icon for the payment data
-+ // These should be replaced with something proper instead of reusing whatever
-+ // LL-provided images happened to fit
-+ icon = "";
-+
-+ switch(avinfo_status)
-+ {
-+ case DATA_UNKNOWN:
-+ icon = info_unknown.asString();
-+ break;
-+ case DATA_REQUESTING:
-+ icon = info_fetching.asString();
-+ break;
-+ case DATA_ERROR:
-+ icon = info_error.asString();
-+ break;
-+ case DATA_RETRIEVED:
-+ switch(avinfo.Payment)
-+ {
-+ case PAYMENT_NONE:
-+ break;
-+ case PAYMENT_ON_FILE:
-+ icon = payment_info_filled.asString();
-+ break;
-+ case PAYMENT_USED:
-+ icon = payment_info_used.asString();
-+ break;
-+ case PAYMENT_LINDEN:
-+ // confusingly named icon, maybe use something else
-+ icon = "icon_top_pick.tga";
-+ break;
-+ }
-+ break;
-+ }
-+
-+ element["columns"][LIST_PAYMENT]["column"] = "payment_data";
-+ element["columns"][LIST_PAYMENT]["type"] = "text";
-+
-+ // TODO: Add icon for "unknown" status
-+ //if ( PAYMENT_NONE != avinfo.Payment && DATA_UNKNOWN != avinfo_status )
-+ if ( !icon.empty() )
-+ {
-+ element["columns"][LIST_PAYMENT].erase("color");
-+ element["columns"][LIST_PAYMENT]["type"] = "icon";
-+ element["columns"][LIST_PAYMENT]["value"] = icon;
-+ //llinfos << "Payment icon: " << payment_icon << llendl;
-+ }
-+
-+ const LLUUID avatar_gone("db4592d5-c8a5-9336-019c-fcbd282d5f33");
-+ const LLUUID avatar_new("33d4b23e-a29c-ac03-f7f6-c2fa197b13fe");
-+ const LLUUID avatar_typing("6f083c3c-1e88-d184-6add-95402b3e108f");
-+ /*<avatar_sound.tga value = "439836e2-29f5-c12f-71d4-aa59283296e1"/>
-+ <flag_blue.tga value="e39cbfe7-c4e7-3bad-5e5f-958082d55046"/>
-+ <flag_green.tga value="78952758-1bef-f968-d382-b39094f85aa1"/>
-+ <flag_orange.tga value="c72ca7d9-42cd-02f1-ce32-ca1ea5d1c25d"/>
-+ <flag_pink.tga value="a3419a89-b8d9-293c-693e-12982e574304"/>
-+ <flag_purple.tga value="7982fbf8-457a-77ce-61e6-b3c7d9500d2f"/>
-+ <flag_red.tga value="11ba32bf-44fe-666e-073b-00768785b4d0"/>
-+ <flag_yellow.tga value="98a5a29e-e933-eeed-bdd9-4d461f557d34"/>*/
-+
-+ ACTIVITY_TYPE activity = ent->getActivity();
-+ icon = "";
-+ switch( activity )
-+ {
-+ case ACTIVITY_NONE:
-+ break;
-+ case ACTIVITY_MOVING:
-+ icon = "inv_item_animation.tga";
-+ break;
-+ case ACTIVITY_GESTURING:
-+ icon = "inv_item_gesture.tga";
-+ break;
-+ case ACTIVITY_SOUND:
-+ icon = "inv_item_sound.tga";
-+ break;
-+ case ACTIVITY_REZZING:
-+ icon = "ff_edit_theirs.tga";
-+ break;
-+ case ACTIVITY_PARTICLES:
-+ // TODO: Replace with something better
-+ icon = "account_id_green.tga";
-+ break;
-+ case ACTIVITY_NEW:
-+ icon = avatar_new.asString();
-+ break;
-+ case ACTIVITY_TYPING:
-+ icon = avatar_typing.asString();
-+ break;
-+ case ACTIVITY_DEAD:
-+ // TODO: Replace, icon is quite inappropiate
-+ icon = avatar_gone.asString();
-+ break;
-+ }
-+
-+ element["columns"][LIST_ACTIVITY]["column"] = "activity";
-+ element["columns"][LIST_ACTIVITY]["type"] = "text";
-+
-+ if (!icon.empty() )
-+ {
-+ element["columns"][LIST_ACTIVITY]["type"] = "icon";
-+ element["columns"][LIST_ACTIVITY]["value"] = icon;
-+ //llinfos << "Activity icon: " << activity_icon << llendl;
-+ }
-+
-+ char tempentered[32];
-+ F32 entered = ent->getEntryEnteredSeconds();
-+ snprintf(tempentered, sizeof(tempentered), "%u", (unsigned int)(entered/60.0));
-+ element["columns"][LIST_ENTERED]["column"] = "entered";
-+ element["columns"][LIST_ENTERED]["type"] = "text";
-+ element["columns"][LIST_ENTERED]["value"] = tempentered;
-+ element["columns"][LIST_ENTERED]["color"] = getAvatarColor(ent, distance, CT_ENTERED).getValue();
-+
-+ // Add to list
-+ mAvatarList->addElement(element, ADD_BOTTOM);
-+
-+ // Request data only if fetching avatar data is enabled
-+ if ( fetch_data->getValue() && ent->mAvatarInfo.requestIfNeeded() )
-+ {
-+ sendAvatarPropertiesRequest(av_id);
-+ llinfos << "Data for avatar " << ent->getName() << " didn't arrive yet, retrying" << llendl;
-+ }
-+
-+ /*if ( ent->mTrustNetScore.requestIfNeeded() )
-+ {
-+ requestTrustNetScore(av_id, ent->getName(), "behavior");
-+ llinfos << "Requesting TrustNet score for " << ent->getName() << llendl;
-+ }*/
-+
-+ //if ( db_enabled && ent->mMiscInfo.requestIfNeeded() )
-+ //{
-+ // requestMiscInfo(av_id, ent->getName());
-+ // llinfos << "Requesting misc info for " << ent->getName() << llendl;
-+ //}
-+ }
-+
-+ // finish
-+ mAvatarList->sort();
-+ mAvatarList->selectMultiple(selected);
-+ mAvatarList->setScrollPos(scrollpos);
-+
-+// llinfos << "avatar list refresh: done" << llendl;
-+
-+}
-+
-+// static
-+void LLFloaterAvatarList::onClickIM(void* userdata)
-+{
-+ //llinfos << "LLFloaterFriends::onClickIM()" << llendl;
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+
-+ LLDynamicArray<LLUUID> ids = avlist->mAvatarList->getSelectedIDs();
-+ if(ids.size() > 0)
-+ {
-+ if(ids.size() == 1)
-+ {
-+ // Single avatar
-+ LLUUID agent_id = ids[0];
-+
-+ char buffer[MAX_STRING];
-+ snprintf(buffer, MAX_STRING, "%s", avlist->mAvatars[agent_id].getName().c_str());
-+ gIMMgr->setFloaterOpen(TRUE);
-+ gIMMgr->addSession(
-+ buffer,
-+ IM_NOTHING_SPECIAL,
-+ agent_id);
-+ }
-+ else
-+ {
-+ // Group IM
-+ LLUUID session_id;
-+ session_id.generate();
-+ gIMMgr->setFloaterOpen(TRUE);
-+ gIMMgr->addSession("Avatars Conference", IM_SESSION_CONFERENCE_START, ids[0], ids);
-+ }
-+ }
-+}
-+
-+void LLFloaterAvatarList::onClickTrack(void *userdata)
-+{
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+
-+ LLScrollListItem *item = avlist->mAvatarList->getFirstSelected();
-+ if (!item) return;
-+
-+ LLUUID agent_id = item->getUUID();
-+
-+ if ( avlist->mTracking && avlist->mTrackedAvatar == agent_id ) {
-+ LLTracker::stopTracking(NULL);
-+ avlist->mTracking = FALSE;
-+ }
-+ else
-+ {
-+ avlist->mTracking = TRUE;
-+ avlist->mTrackByLocation = FALSE;
-+ avlist->mTrackedAvatar = agent_id;
-+ LLTracker::trackAvatar(agent_id, avlist->mAvatars[agent_id].getName());
-+ }
-+}
-+
-+void LLFloaterAvatarList::sendAvatarPropertiesRequest(LLUUID avid)
-+{
-+
-+
-+ lldebugs << "LLPanelAvatar::sendAvatarPropertiesRequest()" << llendl;
-+ LLMessageSystem *msg = gMessageSystem;
-+
-+ msg->newMessageFast(_PREHASH_AvatarPropertiesRequest);
-+ msg->nextBlockFast( _PREHASH_AgentData);
-+ msg->addUUIDFast( _PREHASH_AgentID, gAgent.getID() );
-+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-+ msg->addUUIDFast( _PREHASH_AvatarID, avid);
-+ gAgent.sendReliableMessage();
-+
-+ mAvatars[avid].mAvatarInfo.requestStarted();
-+}
-+
-+// static
-+void LLFloaterAvatarList::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
-+{
-+
-+
-+ LLFloaterAvatarList* self = NULL;
-+ LLAvatarInfo avinfo;
-+
-+ BOOL identified = FALSE;
-+ BOOL transacted = FALSE;
-+
-+ LLUUID agent_id; // your id
-+ LLUUID avatar_id; // target of this panel
-+ U32 flags = 0x0;
-+ char born_on[DB_BORN_BUF_SIZE];
-+ S32 charter_member_size = 0;
-+
-+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
-+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AvatarID, avatar_id );
-+
-+
-+ self = gFloaterAvatarList;
-+
-+ // Verify that the avatar is in the list, if not, ignore.
-+ if ( self->mAvatarList->getItemIndex(avatar_id) < 0 )
-+ {
-+ return;
-+ }
-+
-+ LLAvatarListEntry *entry = &self->mAvatars[avatar_id];
-+
-+ msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_BornOn, DB_BORN_BUF_SIZE, born_on);
-+ msg->getU32Fast(_PREHASH_PropertiesData, _PREHASH_Flags, flags);
-+
-+ identified = (flags & AVATAR_IDENTIFIED);
-+ transacted = (flags & AVATAR_TRANSACTED);
-+
-+ // What's this?
-+ // Let's see if I understand correctly: CharterMember property is dual purpose:
-+ // it either contains a number indicating an account type (usual value), or
-+ // it contains a string with a custom title. Probably that's where Philip Linden's
-+ // "El Presidente" title comes from. Heh.
-+ U8 caption_index = 0;
-+ std::string caption_text;
-+ charter_member_size = msg->getSize("PropertiesData", "CharterMember");
-+
-+ if(1 == charter_member_size)
-+ {
-+ msg->getBinaryData("PropertiesData", "CharterMember", &caption_index, 1);
-+ }
-+ else if(1 < charter_member_size)
-+ {
-+ char caption[MAX_STRING];
-+ msg->getString("PropertiesData", "CharterMember", MAX_STRING, caption);
-+
-+ caption_text = caption;
-+ entry->setAccountCustomTitle(caption_text);
-+ }
-+
-+
-+ if(caption_text.empty())
-+ {
-+
-+ const enum ACCOUNT_TYPE ACCT_TYPE[] = {
-+ ACCOUNT_RESIDENT,
-+ ACCOUNT_TRIAL,
-+ ACCOUNT_CHARTER_MEMBER,
-+ ACCOUNT_EMPLOYEE
-+ };
-+
-+ //enum ACCOUNT_TYPE acct =
-+ avinfo.Account = ACCT_TYPE[llclamp(caption_index, (U8)0, (U8)(sizeof(ACCT_TYPE)/sizeof(ACCT_TYPE[0])-1))];
-+ //entry->setAccountType(acct);
-+
-+
-+ if ( avinfo.Account != ACCOUNT_EMPLOYEE )
-+ {
-+ if ( transacted )
-+ {
-+ avinfo.Payment = PAYMENT_USED;
-+ }
-+ else if ( identified )
-+ {
-+ avinfo.Payment = PAYMENT_ON_FILE;
-+ }
-+ else
-+ {
-+ avinfo.Payment = PAYMENT_NONE;
-+ }
-+ }
-+ else
-+ {
-+ avinfo.Payment = PAYMENT_LINDEN;
-+ }
-+ }
-+
-+ // Structure must be zeroed to have sane results, as we
-+ // have an incomplete string for input
-+ memset(&avinfo.BirthDate, 0, sizeof(avinfo.BirthDate));
-+
-+ int num_read = sscanf(born_on, "%d/%d/%d", &avinfo.BirthDate.tm_mon,
-+ &avinfo.BirthDate.tm_mday,
-+ &avinfo.BirthDate.tm_year);
-+
-+ if ( num_read == 3 && avinfo.BirthDate.tm_mon <= 12 )
-+ {
-+ avinfo.BirthDate.tm_year -= 1900;
-+ avinfo.BirthDate.tm_mon--;
-+ }
-+ else
-+ {
-+ // Zero again to remove any partially read data
-+ memset(&avinfo.BirthDate, 0, sizeof(avinfo.BirthDate));
-+ llwarns << "Error parsing birth date: " << born_on << llendl;
-+ }
-+
-+ entry->mAvatarInfo.setValue(avinfo);
-+}
-+
-+void LLFloaterAvatarList::checkTrackingStatus()
-+{
-+
-+ if ( mTracking && LLTracker::getTrackedPositionGlobal().isExactlyZero() )
-+ {
-+ // trying to track an avatar, but tracker stopped tracking
-+ if ( mAvatars.count( mTrackedAvatar ) > 0 && !mTrackByLocation )
-+ {
-+ llinfos << "Switching to location-based tracking" << llendl;
-+ mTrackByLocation = TRUE;
-+ }
-+ else
-+ {
-+ // not found
-+ llinfos << "Stopping tracking avatar, server-side didn't work, and not in list anymore." << llendl;
-+ LLTracker::stopTracking(NULL);
-+ mTracking = FALSE;
-+ }
-+ }
-+
-+ if ( mTracking && mTrackByLocation )
-+ {
-+ std::string name = mAvatars[mTrackedAvatar].getName();
-+ std::string tooltip = "Tracking last known position";
-+ name += " (near)";
-+ LLTracker::trackLocation(mAvatars[mTrackedAvatar].getPosition(), name, tooltip);
-+ }
-+
-+ //llinfos << "Tracking position: " << LLTracker::getTrackedPositionGlobal() << llendl;
-+
-+}
-+
-+
-+BOOL LLFloaterAvatarList::avatarIsInList(LLUUID avatar)
-+{
-+ return ( mAvatars.count( avatar ) > 0 );
-+}
-+
-+LLAvatarListEntry * LLFloaterAvatarList::getAvatarEntry(LLUUID avatar)
-+{
-+ if ( avatar.isNull() )
-+ {
-+ return NULL;
-+ }
-+
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+
-+ iter = mAvatars.find(avatar);
-+ if ( iter == mAvatars.end() )
-+ {
-+ return NULL;
-+ }
-+
-+ return &iter->second;
-+
-+ //if ( mAvatars.count( avatar ) < 0 )
-+ //{
-+ //return NULL;
-+ //}
-+
-+ //return &mAvatars[avatar];
-+}
-+
-+void LLFloaterAvatarList::speakText(S32 channel, EChatType type, std::string text)
-+{
-+ LLMessageSystem* msg = gMessageSystem;
-+
-+ msg->newMessageFast(_PREHASH_ChatFromViewer);
-+ msg->nextBlockFast(_PREHASH_AgentData);
-+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-+ msg->nextBlockFast(_PREHASH_ChatData);
-+ msg->addStringFast(_PREHASH_Message, text);
-+ msg->addU8Fast(_PREHASH_Type, type);
-+ msg->addS32("Channel", channel);
-+
-+ gAgent.sendReliableMessage();
-+
-+ LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
-+}
-+
-+
-+void LLFloaterAvatarList::requestTrustNetScore(LLUUID avatar, const std::string name, const std::string type)
-+{
-+ char *temp = new char[UUID_STR_LENGTH];
-+ avatar.toString(temp);
-+
-+ std::string text = "GetScore|" + name + "|" + temp + "|" + type;
-+ speakText(TRUSTNET_CHANNEL, CHAT_TYPE_WHISPER, text);
-+}
-+
-+//static
-+void LLFloaterAvatarList::replaceVars(std::string &str, LLUUID avatar, const std::string& name)
-+{
-+ char *temp = new char[UUID_STR_LENGTH];
-+ avatar.toString(temp);
-+
-+ std::string vars[][2] = {
-+ {"$NAME", name},
-+ {"$KEY", temp},
-+ };
-+
-+ BOOL replaced = TRUE;
-+
-+ while( replaced )
-+ {
-+ replaced = FALSE;
-+ for(U32 i=0;i<sizeof(vars)/sizeof(vars[0]);i++)
-+ {
-+ std::string::size_type pos = str.find(vars[i][0]);
-+ if ( pos != std::string::npos )
-+ {
-+ str.replace(pos, vars[i][0].size(), vars[i][1]);
-+ replaced = TRUE;
-+ }
-+ }
-+ }
-+
-+}
-+
-+void LLFloaterAvatarList::requestMiscInfo(LLUUID avatar, const std::string name)
-+{
-+ //LLUUID db_av_key;
-+
-+ //std::string message = gSavedPerAccountSettings.getString("DBSendPattern");
-+ //std::string db_av_name = gSavedPerAccountSettings.getString("DBAvatarName");
-+ //db_av_key.set(gSavedPerAccountSettings.getString("DBAvatarKey"));
-+
-+
-+ //llinfos << "Requesting info " << llendl;
-+ //replaceVars(message, avatar, name);
-+
-+ //llinfos << "Request string: " << message << llendl;
-+ //send_simple_im(db_av_key, message.c_str());
-+ }
-+
-+//static
-+BOOL LLFloaterAvatarList::handleIM(LLUUID from_id, const std::string message)
-+{
-+ LLUUID db_av_key;
-+ //db_av_key.set(gSavedPerAccountSettings.getString("DBAvatarKey"));
-+
-+ if ( db_av_key == from_id )
-+ {
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+
-+ for(iter = gFloaterAvatarList->mAvatars.begin(); iter != gFloaterAvatarList->mAvatars.end(); iter++)
-+ {
-+ LLAvatarListEntry *ent = &iter->second;
-+
-+ // Check if the key, or the name are found in the reply.
-+ // Name is only accepted if it's in the beginning of the message.
-+ if ( message.find(ent->getID().asString()) != std::string::npos
-+ || message.find(ent->getName().c_str()) == 0 )
-+ {
-+ LLMiscDBInfo info;
-+ info.data = message;
-+
-+ llinfos << "Database reply arrived for avatar " << ent->getName() << llendl;
-+ ent->mMiscInfo.setValue(info);
-+ }
-+ }
-+
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+//static
-+void LLFloaterAvatarList::processTrustNetReply(char *reply)
-+{
-+ char *tokens[10];
-+ char *tmp = &reply[0];
-+ U32 count = 0;
-+
-+ llinfos << "TrustNet reply: " << reply << llendl;
-+
-+
-+ // Split into tokens
-+ while( (NULL != (tmp = strtok(tmp, "|"))) && count < (sizeof(tokens)/sizeof(tokens[0])) )
-+ {
-+ tokens[count++] = tmp;
-+ llinfos << "token: " << tmp << llendl;
-+ tmp = NULL;
-+ }
-+
-+ llinfos << "Got " << count << " tokens" << llendl;
-+
-+ if ( count >= 1 )
-+ {
-+ if (!strcmp(tokens[0], "Score") && count >= 4)
-+ {
-+ //format: key|type|score
-+ LLUUID avatar(tokens[1]);
-+ std::string type = tokens[2];
-+ F32 score = (F32)strtod(tokens[3], NULL);
-+
-+ LLAvatarListEntry *ent = gFloaterAvatarList->getAvatarEntry(avatar);
-+ if ( ent != NULL )
-+ {
-+ LLAvListTrustNetScore s(type, score);
-+ ent->mTrustNetScore.setValue(s);
-+ llinfos << "Score arrived for avatar " << avatar << ": " << score << llendl;
-+ }
-+ else
-+ {
-+ llinfos << "Score arrived for avatar " << avatar << ", but it wasn't in the list anymore" << llendl;
-+ }
-+ }
-+ else if (!strcmp(tokens[0], "WebAuthToken") && count >= 2)
-+ {
-+ std::string URL = LLWeb::escapeURL(llformat("http://trustnet.daleglass.net/?session=%s", tokens[1]));
-+ LLWeb::loadURL(URL);
-+ }
-+ else if (!strcmp(tokens[0], "WebPassword") && count >= 2)
-+ {
-+ std::string password = tokens[1];
-+ gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(password));
-+ }
-+ else
-+ {
-+ llwarns << "Unrecognized TrustNet reply " << tokens[0] << llendl;
-+ }
-+ }
-+}
-+
-+void LLFloaterAvatarList::luskwoodCommand(std::string cmd)
-+{
-+ LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
-+
-+ for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
-+ {
-+ LLUUID avid = *itr;
-+ LLAvatarListEntry *ent = getAvatarEntry(avid);
-+ if ( ent != NULL )
-+ {
-+ //llinfos << "Would say: " << cmd << " " << ent->getName() << llendl;
-+ // Use key got gokey, name for everything else
-+ speakText(0, CHAT_TYPE_SHOUT, cmd + " " + ( cmd == "gokey" ? ent->getID().asString() : ent->getName() ) );
-+ }
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickMark(void *userdata)
-+{
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+ LLDynamicArray<LLUUID> ids = avlist->mAvatarList->getSelectedIDs();
-+
-+ for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
-+ {
-+ LLUUID avid = *itr;
-+ LLAvatarListEntry *ent = avlist->getAvatarEntry(avid);
-+ if ( ent != NULL )
-+ {
-+ ent->toggleMark();
-+ }
-+ }
-+}
-+
-+void LLFloaterAvatarList::handleLuskwoodDialog(S32 option, void* data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+ if ( 0 == option )
-+ {
-+ self->luskwoodCommand(self->mLuskwoodCommand);
-+ }
-+}
-+
-+void LLFloaterAvatarList::handleLuskwoodGohomerOffDialog(S32 option, void* data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+ if ( 0 == option )
-+ {
-+ self->speakText(0, CHAT_TYPE_SHOUT, "gohome off");
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickGohomerWarn(void *data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+
-+ self->mLuskwoodCommand = "gowarn";
-+ gViewerWindow->alertXml("LuskwoodGohomerWarn", handleLuskwoodDialog, self);
-+
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickGohomerEject(void *data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+
-+ self->mLuskwoodCommand = "goeject";
-+ gViewerWindow->alertXml("LuskwoodGohomerEject", handleLuskwoodDialog, self);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickGohomerSendAway(void *data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+
-+ self->mLuskwoodCommand = "goaway";
-+ gViewerWindow->alertXml("LuskwoodGohomerKeepAway", handleLuskwoodDialog, self);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickGohomerSendHome(void *data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+
-+ self->mLuskwoodCommand = "gohome";
-+ gViewerWindow->alertXml("LuskwoodGohomerSendHome", handleLuskwoodDialog, self);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickGohomerSendHomeByKey(void *data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+
-+ self->mLuskwoodCommand = "gokey";
-+ gViewerWindow->alertXml("LuskwoodGohomerSendHome", handleLuskwoodDialog, self);
-+}
-+
-+
-+//static
-+void LLFloaterAvatarList::onClickGohomerOff(void *data)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)data;
-+
-+ gViewerWindow->alertXml("LuskwoodGohomerOff", handleLuskwoodGohomerOffDialog, self);
-+}
-+
-+LLColor4 LLFloaterAvatarList::getAvatarColor(LLAvatarListEntry *ent, F32 distance, e_coloring_type type)
-+{
-+ F32 r = 0.0f, g = 0.0f, b = 0.0f, a = 1.0f;
-+
-+ switch(type)
-+ {
-+ case CT_NONE:
-+ return LLColor4::black;
-+ break;
-+ case CT_DISTANCE:
-+ if ( distance <= 10.0f )
-+ {
-+ // whisper range
-+ g = 0.7f - ( distance / 20.0f );
-+ }
-+ else if ( distance > 10.0f && distance <= 20.0f )
-+ {
-+ // talk range
-+ g = 0.7f - ( (distance - 10.0f) / 20.0f );
-+ b = g;
-+ }
-+ else if ( distance > 20.0f && distance <= 96.0f )
-+ {
-+ // shout range
-+ r = 0.7f - ( (distance - 20.0f) / 192.0f );
-+ b = r;
-+ }
-+ else
-+ {
-+ // unreachable by chat
-+ r = 1.0;
-+ }
-+ break;
-+ case CT_AGE:
-+ if ( ent->mAvatarInfo.getStatus() == DATA_RETRIEVED )
-+ {
-+ S32 age = ent->mAvatarInfo.getValue().getAge();
-+ if ( age < 14 )
-+ {
-+ r = 0.7f - ( age / 28 );
-+ }
-+ else if ( age > 14 && age <= 30 )
-+ {
-+ r = 0.7f - ( (age-14) / 32 );
-+ g = r;
-+ }
-+ else if ( age > 30 && age < 90 )
-+ {
-+ g = 0.7f - ( (age-30) / 120 );
-+ }
-+ else
-+ {
-+ b = 1.0f;
-+ }
-+ }
-+ break;
-+ case CT_SCORE:
-+ if ( ent->mTrustNetScore.getStatus() == DATA_RETRIEVED )
-+ {
-+ F32 score = ent->mTrustNetScore.getValue().Score;
-+
-+ if ( score == 0.0 )
-+ {
-+ b = 1.0f;
-+ }
-+ else if ( score == 10.0f )
-+ {
-+ g = 1.0f;
-+ }
-+ else if ( score == -10.0f )
-+ {
-+ r = 1.0f;
-+ }
-+ else if ( score > 0.0f )
-+ {
-+ g = 0.2f + ( score / 20.0f );
-+ }
-+ else if ( score < 0.0f )
-+ {
-+ r = 0.2f + ( score / 20.0f );
-+ }
-+ }
-+ break;
-+ case CT_PAYMENT:
-+ break;
-+ case CT_ENTERED:
-+ F32 entered = ent->getEntryEnteredSeconds();
-+ if (distance <= 20.0f)
-+ {
-+ if ( entered <= ( 5.0f * 60.0f ) )
-+ {
-+ r = 0.7f - ( entered / ( 4.0f * 5.0f * 60.0f ) );
-+ b = 1.0f - ( ( ( 5.0f * 60.0f ) - entered) / ( 5.0f * 60.0f ) );
-+ }
-+ else
-+ {
-+ b = 1.0f;
-+ }
-+ }
-+ else
-+ {
-+ r = g = b = 0.5f;
-+ }
-+ break;
-+ }
-+
-+ return LLColor4(r,g,b,a);
-+}
-+
-+void LLFloaterAvatarList::onDoubleClick(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ LLScrollListItem *item = self->mAvatarList->getFirstSelected();
-+ LLUUID agent_id = item->getUUID();
-+ LLAvatarListEntry *ent = 0;
-+
-+ if ( self->mAvatars.count( agent_id ) )
-+ {
-+ ent = &self->mAvatars[ agent_id ];
-+ }
-+
-+ if ( ent && ent->getIsCoarse() )
-+ {
-+ // nothing to look at, manipulate camera directly
-+ LLQuaternion rot;
-+
-+ LLMatrix3 mat(rot);
-+
-+ LLVector3 pos( ent->getPosition() );
-+
-+ LLViewerCamera::getInstance()->setView(1.0);
-+ LLViewerCamera::getInstance()->setOrigin( pos );
-+ LLViewerCamera::getInstance()->mXAxis = LLVector3(mat.mMatrix[0]);
-+ LLViewerCamera::getInstance()->mYAxis = LLVector3(mat.mMatrix[1]);
-+ LLViewerCamera::getInstance()->mZAxis = LLVector3(mat.mMatrix[2]); }
-+ else
-+ {
-+ gAgent.lookAtObject(agent_id, CAMERA_POSITION_OBJECT);
-+ }
-+}
-+
-+void LLFloaterAvatarList::removeFocusFromAll()
-+{
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+
-+ for(iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
-+ {
-+ LLAvatarListEntry *ent = &iter->second;
-+ ent->setFocus(FALSE);
-+ }
-+}
-+
-+void LLFloaterAvatarList::focusOnPrev(BOOL marked_only)
-+{
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+ LLAvatarListEntry *prev = NULL;
-+ LLAvatarListEntry *ent;
-+
-+ if ( mAvatars.size() == 0 )
-+ {
-+ return;
-+ }
-+
-+ for(iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
-+ {
-+ ent = &iter->second;
-+
-+ if ( ent->isDead() )
-+ continue;
-+
-+ if ( (ent->getID() == mFocusedAvatar) && (prev != NULL) )
-+ {
-+ removeFocusFromAll();
-+ prev->setFocus(TRUE);
-+ mFocusedAvatar = prev->getID();
-+ gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
-+ return;
-+ }
-+
-+ if ( (!marked_only) || ent->isMarked() )
-+ {
-+ prev = ent;
-+ }
-+ }
-+
-+ if (prev != NULL && ((!marked_only) || prev->isMarked()) )
-+ {
-+ removeFocusFromAll();
-+ prev->setFocus(TRUE);
-+ mFocusedAvatar = prev->getID();
-+ gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
-+ }
-+}
-+
-+void LLFloaterAvatarList::focusOnNext(BOOL marked_only)
-+{
-+
-+
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+ BOOL found = FALSE;
-+ LLAvatarListEntry *first = NULL;
-+ LLAvatarListEntry *ent;
-+
-+ if ( mAvatars.size() == 0 )
-+ {
-+ return;
-+ }
-+
-+ for(iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
-+ {
-+ ent = &iter->second;
-+
-+ if ( ent->isDead() )
-+ continue;
-+
-+ if ( NULL == first && ((!marked_only) || ent->isMarked()))
-+ {
-+ first = ent;
-+ }
-+
-+ if ( found && ((!marked_only) || ent->isMarked()) )
-+ {
-+ removeFocusFromAll();
-+ ent->setFocus(TRUE);
-+ mFocusedAvatar = ent->getID();
-+ gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
-+ return;
-+ }
-+
-+ if ( ent->getID() == mFocusedAvatar )
-+ {
-+ found = TRUE;
-+ }
-+ }
-+
-+ if (first != NULL && ((!marked_only) || first->isMarked()))
-+ {
-+ removeFocusFromAll();
-+ first->setFocus(TRUE);
-+ mFocusedAvatar = first->getID();
-+ gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
-+ }
-+}
-+//static
-+void LLFloaterAvatarList::onClickPrevInList(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ self->focusOnPrev(FALSE);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickNextInList(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ self->focusOnNext(FALSE);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickPrevMarked(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ self->focusOnPrev(TRUE);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickNextMarked(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ self->focusOnNext(TRUE);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickTrustNetRate(void *userdata)
-+{
-+ // LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ llinfos << "Ratings not implemented yet" << llendl;
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickTrustNetExplain(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ LLScrollListItem *item = self->mAvatarList->getFirstSelected();
-+
-+ if ( item != NULL )
-+ {
-+ LLAvatarListEntry *ent = self->getAvatarEntry(item->getUUID());
-+ self->speakText(TRUSTNET_CHANNEL, CHAT_TYPE_WHISPER, "Explain|" + ent->getName() + "|" + ent->getID().asString());
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickTrustNetWebsite(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+
-+ self->speakText(TRUSTNET_CHANNEL, CHAT_TYPE_WHISPER, "GetWebAuthToken");
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickTrustNetGetPassword(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+
-+ self->speakText(TRUSTNET_CHANNEL, CHAT_TYPE_WHISPER, "GetWebPassword");
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickTrustNetRenew(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ self->speakText(TRUSTNET_CHANNEL, CHAT_TYPE_WHISPER, "RenewSubscription");
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickGetKey(void *userdata)
-+{
-+ LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
-+ LLScrollListItem *item = self->mAvatarList->getFirstSelected();
-+
-+ if ( NULL == item ) return;
-+
-+ LLUUID agent_id = item->getUUID();
-+
-+ char buffer[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
-+ agent_id.toString(buffer);
-+
-+ gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
-+}
-+
-+
-+static void send_freeze(const LLUUID& avatar_id, bool freeze)
-+{
-+ U32 flags = 0x0;
-+ if (!freeze)
-+ {
-+ // unfreeze
-+ flags |= 0x1;
-+ }
-+
-+ LLMessageSystem* msg = gMessageSystem;
-+ LLViewerObject* avatar = gObjectList.findObject(avatar_id);
-+
-+ if (avatar)
-+ {
-+ msg->newMessage("FreezeUser");
-+ msg->nextBlock("AgentData");
-+ msg->addUUID("AgentID", gAgent.getID());
-+ msg->addUUID("SessionID", gAgent.getSessionID());
-+ msg->nextBlock("Data");
-+ msg->addUUID("TargetID", avatar_id );
-+ msg->addU32("Flags", flags );
-+ msg->sendReliable( avatar->getRegion()->getHost() );
-+ }
-+}
-+
-+static void send_eject(const LLUUID& avatar_id, bool ban)
-+{
-+ LLMessageSystem* msg = gMessageSystem;
-+ LLViewerObject* avatar = gObjectList.findObject(avatar_id);
-+
-+ if (avatar)
-+ {
-+ U32 flags = 0x0;
-+ if ( ban )
-+ {
-+ // eject and add to ban list
-+ flags |= 0x1;
-+ }
-+
-+ msg->newMessage("EjectUser");
-+ msg->nextBlock("AgentData");
-+ msg->addUUID("AgentID", gAgent.getID() );
-+ msg->addUUID("SessionID", gAgent.getSessionID() );
-+ msg->nextBlock("Data");
-+ msg->addUUID("TargetID", avatar_id );
-+ msg->addU32("Flags", flags );
-+ msg->sendReliable( avatar->getRegion()->getHost() );
-+ }
-+}
-+
-+static void send_estate_message(
-+ const char* request,
-+ const LLUUID &target)
-+{
-+
-+ LLMessageSystem* msg = gMessageSystem;
-+ LLUUID invoice;
-+
-+ // This seems to provide an ID so that the sim can say which request it's
-+ // replying to. I think this can be ignored for now.
-+ invoice.generate();
-+
-+ llinfos << "Sending estate request '" << request << "'" << llendl;
-+ msg->newMessage("EstateOwnerMessage");
-+ msg->nextBlockFast(_PREHASH_AgentData);
-+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-+ msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-+ msg->nextBlock("MethodData");
-+ msg->addString("Method", request);
-+ msg->addUUID("Invoice", invoice);
-+
-+ // Agent id
-+ msg->nextBlock("ParamList");
-+ msg->addString("Parameter", gAgent.getID().asString().c_str());
-+
-+ // Target
-+ msg->nextBlock("ParamList");
-+ msg->addString("Parameter", target.asString().c_str());
-+
-+ msg->sendReliable(gAgent.getRegion()->getHost());
-+}
-+
-+static void send_estate_ban(const LLUUID& agent)
-+{
-+ LLUUID invoice;
-+ U32 flags = ESTATE_ACCESS_BANNED_AGENT_ADD;
-+
-+ invoice.generate();
-+
-+ LLMessageSystem* msg = gMessageSystem;
-+ msg->newMessage("EstateOwnerMessage");
-+ msg->nextBlockFast(_PREHASH_AgentData);
-+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-+ msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-+
-+ msg->nextBlock("MethodData");
-+ msg->addString("Method", "estateaccessdelta");
-+ msg->addUUID("Invoice", invoice);
-+
-+ char buf[MAX_STRING]; /* Flawfinder: ignore*/
-+ gAgent.getID().toString(buf);
-+ msg->nextBlock("ParamList");
-+ msg->addString("Parameter", buf);
-+
-+ snprintf(buf, MAX_STRING, "%u", flags); /* Flawfinder: ignore */
-+ msg->nextBlock("ParamList");
-+ msg->addString("Parameter", buf);
-+
-+ agent.toString(buf);
-+ msg->nextBlock("ParamList");
-+ msg->addString("Parameter", buf);
-+
-+ gAgent.sendReliableMessage();
-+}
-+
-+static void cmd_freeze(const LLUUID& avatar, const std::string &name) { send_freeze(avatar, true); }
-+static void cmd_unfreeze(const LLUUID& avatar, const std::string &name) { send_freeze(avatar, false); }
-+static void cmd_eject(const LLUUID& avatar, const std::string &name) { send_eject(avatar, false); }
-+static void cmd_ban(const LLUUID& avatar, const std::string &name) { send_eject(avatar, true); }
-+static void cmd_profile(const LLUUID& avatar, const std::string &name) { LLFloaterAvatarInfo::showFromDirectory(avatar); }
-+static void cmd_mute(const LLUUID&avatar, const std::string &name) { LLMuteList::getInstance()->add(LLMute(avatar, name, LLMute::AGENT)); }
-+static void cmd_unmute(const LLUUID&avatar, const std::string &name) { LLMuteList::getInstance()->remove(LLMute(avatar, name, LLMute::AGENT)); }
-+static void cmd_estate_eject(const LLUUID &avatar, const std::string &name){ send_estate_message("teleporthomeuser", avatar); }
-+static void cmd_estate_ban(const LLUUID &avatar, const std::string &name)
-+{
-+ send_estate_message("teleporthomeuser", avatar); // Kick first, just to be sure
-+ send_estate_ban(avatar);
-+}
-+
-+void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID &avatar, const std::string &name))
-+{
-+ LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
-+
-+ for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
-+ {
-+ LLUUID avid = *itr;
-+ LLAvatarListEntry *ent = getAvatarEntry(avid);
-+ if ( ent != NULL )
-+ {
-+ llinfos << "Executing command on " << ent->getName() << llendl;
-+ func(avid, ent->getName());
-+ }
-+ }
-+}
-+
-+std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
-+{
-+ std::string ret = "";
-+
-+ LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
-+ for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
-+ {
-+ LLUUID avid = *itr;
-+ LLAvatarListEntry *ent = getAvatarEntry(avid);
-+ if ( ent != NULL )
-+ {
-+ if (!ret.empty()) ret += separator;
-+ ret += ent->getName();
-+ }
-+ }
-+
-+ return ret;
-+}
-+
-+//static
-+void LLFloaterAvatarList::callbackFreeze(S32 option, void *userdata) {
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+
-+ if ( option == 0 )
-+ {
-+ avlist->doCommand(cmd_freeze);
-+ }
-+ else if ( option == 1 )
-+ {
-+ avlist->doCommand(cmd_unfreeze);
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::callbackEject(S32 option, void *userdata) {
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+
-+ if ( option == 0 )
-+ {
-+ avlist->doCommand(cmd_eject);
-+ }
-+ else if ( option == 1 )
-+ {
-+ avlist->doCommand(cmd_ban);
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::callbackMute(S32 option, void *userdata) {
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+
-+ if ( option == 0 )
-+ {
-+ avlist->doCommand(cmd_mute);
-+ }
-+ else if ( option == 1 )
-+ {
-+ avlist->doCommand(cmd_unmute);
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::callbackEjectFromEstate(S32 option, void *userdata) {
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+
-+ if ( option == 0 )
-+ {
-+ avlist->doCommand(cmd_estate_eject);
-+ }
-+ else if ( option == 1 )
-+ {
-+ avlist->doCommand(cmd_estate_ban);
-+ }
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickFreeze(void *userdata)
-+{
-+ LLStringUtil::format_map_t args;
-+ args["[NAMES]"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
-+ gViewerWindow->alertXml("AvatarListFreezeAvatars", args, callbackFreeze, userdata);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickEject(void *userdata)
-+{
-+ LLStringUtil::format_map_t args;
-+ args["[NAMES]"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
-+ gViewerWindow->alertXml("AvatarListEjectAvatars", args, callbackEject, userdata);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickMute(void *userdata)
-+{
-+ LLStringUtil::format_map_t args;
-+ args["[NAMES]"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
-+ gViewerWindow->alertXml("AvatarListMuteAvatars", args, callbackMute, userdata);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickEjectFromEstate(void *userdata)
-+{
-+ LLStringUtil::format_map_t args;
-+ args["[NAMES]"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
-+ gViewerWindow->alertXml("AvatarListEjectAvatarsFromEstate", args, callbackEjectFromEstate, userdata);
-+}
-+
-+
-+
-+//static
-+void LLFloaterAvatarList::onClickAR(void *userdata)
-+{
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+ LLDynamicArray<LLUUID> ids = avlist->mAvatarList->getSelectedIDs();
-+
-+ for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
-+ {
-+ LLUUID avid = *itr;
-+ llinfos << "Adding " << avid << " to AR queue" << llendl;
-+ avlist->mARQueue.push( avid );
-+ }
-+}
-+
-+// static
-+void LLFloaterAvatarList::onClickProfile(void* userdata)
-+{
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+ avlist->doCommand(cmd_profile);
-+}
-+
-+//static
-+void LLFloaterAvatarList::onClickTeleport(void* userdata)
-+{
-+ LLFloaterAvatarList *avlist = (LLFloaterAvatarList*)userdata;
-+ LLScrollListItem *item = avlist->mAvatarList->getFirstSelected();
-+
-+ if ( item )
-+ {
-+ LLUUID agent_id = item->getUUID();
-+ LLAvatarListEntry *ent = avlist->getAvatarEntry(agent_id);
-+
-+ if ( ent )
-+ {
-+ llinfos << "Trying to teleport to " << ent->getName() << " at " << ent->getPosition() << llendl;
-+ gAgent.teleportViaLocation( ent->getPosition() );
-+ }
-+ }
-+}
-+
-+
-+void LLFloaterAvatarList::renderDebugBeacons()
-+{
-+ LLFastTimer t(LLFastTimer::FTM_TEMP1);
-+ std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-+ for(iter = mAvatars.begin(); iter != mAvatars.end(); ++iter)
-+ {
-+ LLAvatarListEntry entry = iter->second;
-+ if ( entry.isDead() )
-+ { // remove HUD Object if it exists
-+ if ( mHudObjectMap.count(entry.getID()) )
-+ {
-+ mHudObjectMap[entry.getID()]->markDead();
-+ mHudObjectMap.erase(entry.getID());
-+ }
-+ continue;
-+ }
-+
-+ std::string name = entry.getName();
-+ LLVector3d avpos = entry.getPosition();
-+ LLVector3d mypos = gAgent.getPositionGlobal();
-+ LLVector3d delta = avpos - mypos;
-+ F32 distance = (F32)delta.magVec();
-+
-+ std::string info = llformat( "%s %.02fm", name.c_str(), distance );
-+ LLVector3 agentpos = gAgent.getPosAgentFromGlobal( avpos );
-+
-+ // roll our own HUD text since the debug beacons are rendered too late (after HUD update)
-+ if (mHudObjectMap.count(entry.getID()) == 0)
-+ {
-+ mHudObjectMap[entry.getID()] = LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
-+ }
-+ LLHUDText* hud_textp = (LLHUDText *)mHudObjectMap[entry.getID()].get(); // :-/
-+
-+ hud_textp->setZCompare(FALSE);
-+ hud_textp->setString(utf8str_to_wstring(info));
-+ hud_textp->setColor(LLColor4::white);
-+ hud_textp->setPositionAgent(agentpos);
-+ hud_textp->setUseBubble(TRUE);
-+ hud_textp->setMass(10.f);
-+ hud_textp->setDoFade(FALSE);
-+ //std::string posinfo = llformat("%f %f %f", agentpos[0], agentpos[1], agentpos[2]);
-+ //hud_textp->setLabel(posinfo);
-+
-+ gObjectList.addDebugBeacon( agentpos, "", LLColor4(0.0f, 0.0f, 1.f, 0.5f), LLColor4::white, gSavedSettings.getS32("DebugBeaconLineWidth") );
-+ }
-+}
-+
-+bool LLFloaterAvatarList::sRenderAvatarBeacons = true;
-+
-diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
-new file mode 100644
-index 0000000..78df867
---- /dev/null
-+++ b/indra/newview/llfloateravatarlist.h
-@@ -0,0 +1,868 @@
-+//
-+// C++ Interface: llfloateravatarlist
-+//
-+// Description:
-+//
-+//
-+// Author: Dale Glass <dale at daleglass.net>, (C) 2007
-+//
-+// Copyright: See COPYING file that comes with this distribution
-+//
-+//
-+#include "llfloater.h"
-+#include "llfloaterreporter.h"
-+#include "lluuid.h"
-+#include "lltimer.h"
-+#include "llchat.h"
-+#include "llappviewer.h"
-+#include "llscrolllistctrl.h"
-+#include "llhudobject.h"
-+
-+#include <time.h>
-+#include <map>
-+
-+class LLFloaterAvatarList;
-+
-+/**
-+ * @brief Account type
-+ */
-+enum ACCOUNT_TYPE
-+{
-+ ACCOUNT_RESIDENT, /** Normal resident */
-+ ACCOUNT_TRIAL, /** Trial account */
-+ ACCOUNT_CHARTER_MEMBER, /** Lifetime account obtained during beta */
-+ ACCOUNT_EMPLOYEE, /** Linden Lab employee */
-+ ACCOUNT_CUSTOM /** Custom account title specified. Seems to apply to Philip Linden */
-+};
-+
-+/**
-+ * @brief Payment data
-+ */
-+enum PAYMENT_TYPE
-+{
-+ PAYMENT_NONE, /** No payment data on file */
-+ PAYMENT_ON_FILE, /** Payment data filled, but not used */
-+ PAYMENT_USED, /** Payment data used */
-+ PAYMENT_LINDEN /** Payment info doesn't apply (Linden, etc) */
-+};
-+
-+
-+/**
-+ * @brief Activity
-+ *
-+ * This enum is ordered by priority, higher values have higher priority.
-+ * Since we only have one column to show activity, priority decides what
-+ * to show in case of conflict.
-+ */
-+enum ACTIVITY_TYPE
-+{
-+ ACTIVITY_NONE, /** Avatar not doing anything */
-+ ACTIVITY_MOVING, /** Changing position */
-+ ACTIVITY_GESTURING, /** Playing a gesture */
-+ ACTIVITY_SOUND, /** Playing a sound */
-+ ACTIVITY_REZZING, /** Rezzing objects */
-+ ACTIVITY_PARTICLES, /** Creating particles */
-+ ACTIVITY_TYPING, /** Typing */
-+ ACTIVITY_NEW, /** Avatar just appeared */
-+ ACTIVITY_DEAD /** Avatar isn't around anymore, and will be removed soon from the list */
-+};
-+
-+enum DATA_STATUS
-+{
-+ DATA_UNKNOWN,
-+ DATA_REQUESTING,
-+ DATA_ERROR,
-+ DATA_RETRIEVED
-+};
-+
-+/**
-+ * @brief How to color the user list
-+ */
-+enum e_coloring_type
-+{
-+ CT_NONE,
-+ CT_DISTANCE,
-+ CT_AGE,
-+ CT_SCORE,
-+ CT_PAYMENT,
-+ CT_ENTERED
-+};
-+
-+/**
-+ * @brief Template class for a piece of data that must be retrieved
-+ *
-+ * This class handles the storage, retries and delays required to obtain a piece
-+ * of data..
-+ */
-+template <class T>
-+class LLAvatarListDatum
-+{
-+public:
-+ LLAvatarListDatum()
-+ {
-+ mMaxPending = 32;
-+
-+ mRetryDelay = 0.0f;
-+ mRequestDelay = 1.0f;
-+ mFirstRequestTimeout = 16.0f;
-+ mMaxRequestTimeout = 8192.0f;
-+
-+ mRequestTimer.start();
-+ mRequestDelayTimer.start();
-+ mStatus = DATA_UNKNOWN;
-+
-+ }
-+
-+ /**
-+ * @brief Determines whether a data re-request is needed
-+ * @returns TRUE if a re-request is needed
-+ *
-+ * This function takes the decision based on whether the data has
-+ * been already retrieved, the last data request was long enough ago,
-+ * and the request rate being low enough.
-+ *
-+ * A FALSE return value doesn't mean that everything is OK, only that
-+ * a retry shouldn't be made at this time.
-+ */
-+ BOOL retryNeeded()
-+ {
-+ switch(mStatus)
-+ {
-+ case DATA_UNKNOWN:
-+ case DATA_REQUESTING:
-+ case DATA_ERROR:
-+ // Don't request too many at once
-+ if ( mPending >= mMaxPending )
-+ {
-+ return FALSE;
-+ }
-+
-+ // Don't re-request if the requests would be made too fast
-+ if ( mRequestDelayTimer.getElapsedTimeF32() < mRequestDelay )
-+ {
-+ return FALSE;
-+ }
-+
-+ // Re-request if retry timeout was reached
-+ return ( mRequestTimer.getElapsedTimeF32() > mRetryDelay );
-+ case DATA_RETRIEVED:
-+ return FALSE;
-+ }
-+
-+ return FALSE;
-+ }
-+
-+ /**
-+ * @brief Notifies the object that a request was started
-+ */
-+ void requestStarted()
-+ {
-+
-+ if ( mStatus != DATA_REQUESTING )
-+ {
-+ mPending++;
-+ //llinfos << "Pe
-+ }
-+
-+ mStatus = DATA_REQUESTING;
-+
-+ if ( mRetryDelay == 0 )
-+ {
-+ mRetryDelay = mFirstRequestTimeout;
-+ }
-+ else
-+ {
-+ if ( mRetryDelay < mMaxRequestTimeout )
-+ {
-+ mRetryDelay *= 2;
-+ }
-+ }
-+
-+ mRequestTimer.start();
-+ mRequestDelayTimer.start();
-+ }
-+
-+ /**
-+ * @brief retryNeeded and requestStarted combined
-+ * @returns TRUE if a re-request is needed
-+ */
-+ BOOL requestIfNeeded()
-+ {
-+ BOOL ret = retryNeeded();
-+ if ( ret )
-+ {
-+ requestStarted();
-+ }
-+
-+ return ret;
-+ }
-+
-+ /**
-+ * @brief Returns the request status
-+ */
-+ DATA_STATUS getStatus()
-+ {
-+ if ( mStatus == DATA_REQUESTING
-+ && mRequestTimer.getElapsedTimeF32() > mRetryDelay )
-+ {
-+ mStatus = DATA_ERROR;
-+
-+ // Consider this request failed, so the slot is free.
-+ mPending--;
-+ }
-+
-+ return mStatus;
-+ }
-+
-+ T& getValue()
-+ {
-+ return mValue;
-+ }
-+
-+ void setValue(T val)
-+ {
-+ if ( mStatus != DATA_RETRIEVED )
-+ {
-+ mPending--;
-+ }
-+
-+ mValue = val;
-+ mStatus = DATA_RETRIEVED;
-+ }
-+
-+ void setRequestDelay(F32 delay)
-+ {
-+ mRequestDelay = delay;
-+ }
-+
-+ void setMaxPending(U32 count)
-+ {
-+ mMaxPending = count;
-+ }
-+private:
-+ friend class LLFloaterAvatarList;
-+ T mValue;
-+
-+ DATA_STATUS mStatus;
-+
-+
-+ /**
-+ * @brief How long to wait before trying to re-request the data
-+ */
-+ F32 mRetryDelay;
-+
-+ /**
-+ * @brief How long to wait on the first attempt to get data
-+ */
-+ F32 mFirstRequestTimeout;
-+
-+ /**
-+ * @brief Maximum delay between retries
-+ *
-+ * On failure, timeout gets doubled until it reaches this value
-+ */
-+ F32 mMaxRequestTimeout;
-+
-+ /**
-+ * @brief Timer for the current request
-+ */
-+ LLTimer mRequestTimer;
-+
-+
-+
-+ /**
-+ * @brief Timer used to separate requests, to avoid flooding the server
-+ */
-+ static LLTimer mRequestDelayTimer;
-+
-+ /**
-+ * @brief Amount of pending requests
-+ */
-+ static U32 mPending;
-+
-+
-+ /**
-+ * @brief Time between requests of the same type
-+ */
-+ F32 mRequestDelay;
-+
-+ /**
-+ * @brief Maximum amount of pending requests
-+ */
-+ U32 mMaxPending;
-+};
-+
-+template <class T> LLTimer LLAvatarListDatum<T>::mRequestDelayTimer;
-+template <class T> U32 LLAvatarListDatum<T>::mPending = 0;
-+
-+//template <class T> F32 LLAvatarListDatum<T>::mRequestDelay;
-+
-+
-+
-+/**
-+ * @brief A TrustNet score
-+ */
-+struct LLAvListTrustNetScore
-+{
-+ F32 Score;
-+ std::string Type;
-+
-+ LLAvListTrustNetScore(std::string type = "<uninitialized>", F32 score = 0.0f);
-+};
-+
-+/**
-+ * @brief Avatar payment information
-+ */
-+struct LLAvatarInfo
-+{
-+ PAYMENT_TYPE Payment;
-+ ACCOUNT_TYPE Account;
-+ struct tm BirthDate;
-+
-+ LLAvatarInfo();
-+ LLAvatarInfo(PAYMENT_TYPE payment, ACCOUNT_TYPE account, struct tm birth);
-+ S32 getAge();
-+};
-+
-+/**
-+ * @brief Misc data about the avatar
-+ * This class holds replies from third party databases. There's no fixed format,
-+ * and interpretation is left to the end user.
-+ */
-+struct LLMiscDBInfo
-+{
-+ std::string data;
-+
-+ LLMiscDBInfo(std::string d)
-+ {
-+ data = d;
-+ }
-+
-+ LLMiscDBInfo()
-+ {
-+ data = "";
-+ }
-+};
-+
-+
-+/**
-+ * @brief This class is used to hold data about avatars.
-+ * We cache data about avatars to avoid repeating requests in this class.
-+ * Instances are kept in a map<LLAvatarListEntry>. We keep track of the
-+ * frame where the avatar was last seen. Avatars that are old enough are
-+ * not added to the visible list, but still kept around to cache the account
-+ * info data (like the birth date and the payment data)
-+ */
-+class LLAvatarListEntry {
-+public:
-+
-+
-+ /**
-+ * @brief Initializes a list entry
-+ * @param id Avatar's key
-+ * @param name Avatar's name
-+ * @param position Avatar's current position
-+ * @param isLinden TRUE if the avatar is a Linden
-+ * @param isCoarse TRUE if the avatar is only in the coarse location list
-+ * @param regionname if the region is not the same as the current agent region, else empty string
-+ */
-+ LLAvatarListEntry(const LLUUID& id = LLUUID::null, const std::string &name = "", const LLVector3d &position = LLVector3d::zero, BOOL isLinden = FALSE, BOOL isCoarse = FALSE, std::string regionname = std::string() ) :
-+ mID(id), mName(name), mPosition(position), mMarked(FALSE), mFocused(FALSE), mIsLinden(isLinden), mIsCoarse(isCoarse), mRegionName(regionname), mActivityType(ACTIVITY_NEW), mAccountTitle(""),
-+ mUpdateTimer(), mActivityTimer(), mFrame(0)
-+ {
-+ mTrustNetScore.setRequestDelay(0.1f);
-+ mTrustNetScore.setMaxPending(8);
-+ mFrame = gFrameCount;
-+ mEnteredTimer.start();
-+ }
-+
-+ /**
-+ * Update world position.
-+ * Affects age.
-+ */
-+ void setPosition(LLVector3d position);
-+
-+ LLVector3d getPosition();
-+
-+ /**
-+ * @brief Returns the age of this entry in frames
-+ *
-+ * This is only used for determining whether the avatar is still around.
-+ * @see getEntryAgeSeconds
-+ */
-+ U32 getEntryAgeFrames();
-+
-+ /**
-+ * @brief Returns the age of this entry in seconds
-+ */
-+ F32 getEntryAgeSeconds();
-+
-+ /**
-+ * @brief Returns time when avatar entered the list
-+ */
-+ F32 getEntryEnteredSeconds();
-+
-+ /**
-+ * @brief Returns the name of the avatar
-+ */
-+ std::string getName();
-+
-+ void setName(std::string name);
-+
-+ LLUUID getID();
-+
-+ void setID(LLUUID id);
-+
-+ /**
-+ * @brief Whether the avatar is a Linden
-+ */
-+ BOOL getIsLinden();
-+
-+ /**
-+ * @brief whether the avatar entry was taken from the coarse location update
-+ */
-+ BOOL getIsCoarse() { return mIsCoarse; }
-+
-+ /**
-+ * @brief returns the agents region name or "" if same as main agent
-+ */
-+ std::string &getRegionName() { return mRegionName; }
-+
-+ /**
-+ * @brief returns true if agent is on same region
-+ */
-+ BOOL getIsSameRegion() { return mRegionName.empty(); }
-+
-+ /**
-+ * @brief returns reference to the HUDObject-pointer for this avatar if any
-+ */
-+ LLPointer<LLHUDObject> &getHudObject() { return mHudObject; }
-+
-+ /**
-+ * @brief Sets a custom title for the account
-+ * @note Changes account type to ACCOUNT_CUSTOM
-+ */
-+ void setAccountCustomTitle(std::string &title);
-+
-+ /**
-+ * @brief Gets the custom title for the account
-+ */
-+ std::string getAccountCustomTitle();
-+
-+ /**
-+ * @brief Sets the activity type for this avatar
-+ *
-+ * Has no effect if the specified type is lower priority than the
-+ * current one.
-+ */
-+ void setActivity(ACTIVITY_TYPE activity);
-+
-+ /**
-+ * @brief Returns the activity type
-+ */
-+ ACTIVITY_TYPE getActivity();
-+
-+ /**
-+ * @brief Sets the 'focus' status on this entry (camera focused on this avatar)
-+ */
-+ void setFocus(BOOL value) { mFocused = value; }
-+
-+ BOOL isFocused() { return mFocused; }
-+
-+
-+ BOOL isMarked();
-+
-+ /**
-+ * @brief Returns whether the item is dead and shouldn't appear in the list
-+ * @returns TRUE if dead
-+ */
-+ BOOL isDead();
-+
-+ void toggleMark();
-+private:
-+ friend class LLFloaterAvatarList;
-+
-+ LLUUID mID;
-+ std::string mName;
-+ LLVector3d mPosition;
-+ BOOL mMarked;
-+ BOOL mFocused;
-+ BOOL mIsLinden;
-+ BOOL mIsCoarse;
-+ std::string mRegionName;
-+ LLPointer<LLHUDObject> mHudObject; /* holds the text on screen, if we don't keep this it won't reach a stable position on-screen but gets recreated for each update */
-+
-+
-+ ACTIVITY_TYPE mActivityType;
-+
-+ std::string mAccountTitle;
-+
-+ LLAvatarListDatum<LLAvListTrustNetScore> mTrustNetScore;
-+ LLAvatarListDatum<LLAvatarInfo> mAvatarInfo;
-+ LLAvatarListDatum<LLMiscDBInfo> mMiscInfo;
-+
-+ /**
-+ * @brief Timer to keep track of whether avatars are still there
-+ */
-+ LLTimer mUpdateTimer;
-+
-+ /**
-+ * @brief Timer for avatar activities
-+ */
-+ LLTimer mActivityTimer;
-+
-+ /**
-+ * @brief Last frame when this avatar was updated
-+ */
-+ U32 mFrame;
-+
-+ /**
-+ * @brief Time when avatar entered the list
-+ */
-+ LLTimer mEnteredTimer;
-+};
-+
-+
-+/**
-+ * @brief Avatar List
-+ * Implements an avatar scanner in the client.
-+ *
-+ * This is my first attempt to modify the SL source. This code is intended
-+ * to have a dual purpose: doing the task, and providing an example of how
-+ * to do it. For that reason, it's going to be commented as exhaustively
-+ * as possible.
-+ *
-+ * Since I'm very new to C++ any suggestions on coding, style, etc are very
-+ * welcome.
-+ */
-+class LLFloaterAvatarList : public LLFloater
-+{
-+public:
-+ /**
-+ * @brief Creates and initializes the LLFloaterAvatarList
-+ * Here the interface is created, and callbacks are initialized.
-+ */
-+ LLFloaterAvatarList();
-+ ~LLFloaterAvatarList();
-+
-+ void show();
-+
-+ /**
-+ * @brief Hide when user closes the list.
-+ */
-+ virtual void onClose(bool app_quitting) { setVisible(FALSE); }
-+
-+ /**
-+ * @brief Toggles interface visibility
-+ * There is only one instance of the avatar scanner at any time.
-+ */
-+ static void toggle(void*);
-+
-+ /**
-+ * @brief Returns floater visibility status
-+ */
-+ static BOOL visible(void*);
-+
-+ /**
-+ * @brief Updates the internal avatar list with the currently present avatars.
-+ */
-+ void updateAvatarList();
-+
-+ /**
-+ * @brief Refresh avatar list (display)
-+ */
-+ void refreshAvatarList();
-+
-+ /**
-+ * @brief Process the reply to a request for avatar properties
-+ */
-+ static void processAvatarPropertiesReply(LLMessageSystem *msg, void**);
-+
-+ /**
-+ * @brief Returns TRUE if the avatar is in the list of known avatars
-+ * @returns TRUE if the avatar is in the list
-+ */
-+ BOOL avatarIsInList(LLUUID avatar);
-+
-+ /**
-+ * @brief Returns the entry for an avatar, if preset
-+ * @returns Pointer to avatar entry, NULL if not found.
-+ */
-+ LLAvatarListEntry* getAvatarEntry(LLUUID avatar);
-+
-+ /**
-+ * @brief Requests a TrustNet score from the Adapter
-+ * @param avatar Avatar for which to request the score
-+ * @param name Avatar's name
-+ * @param type Score type ("behavior", etc)
-+ */
-+ void requestTrustNetScore(LLUUID avatar, const std::string name, const std::string type);
-+
-+ /**
-+ * @brief Requests information about the avatar from the database
-+ * @param avatar Avatar about whom we need information
-+ * @param name Avatar's name
-+ */
-+ void requestMiscInfo(LLUUID avatar, const std::string name);
-+
-+ /**
-+ * @brief Handles IM messages to process the ones that are replies to database requests
-+ * @param from_id Key of the avatar sending the message
-+ * @param message Content
-+ * @returns TRUE if the message was handled. This will suppress further processing in llviewermessage.cpp
-+ */
-+ static BOOL handleIM(LLUUID from_id, const std::string message);
-+
-+ /**
-+ * @brief Process a reply from the TrustNet Adapter
-+ * This handles replies from the TrustNet adapter, such as score results.
-+ */
-+ static void processTrustNetReply(char *reply);
-+
-+ /**
-+ * @brief Returns a string with the selected names in the list
-+ */
-+ std::string getSelectedNames(const std::string& separator = ", ");
-+
-+ /** @brief render a debug beacon for the coarse avatars */
-+ void renderDebugBeacons();
-+
-+ /** @brief if avatar beacons shall be rendered */
-+ static bool getRenderAvatarBeacons(void *data) { return sRenderAvatarBeacons; }
-+
-+ /** @brief set if avatar beacons shall be rendered */
-+ static void toggleRenderAvatarBeacons(void *data) { sRenderAvatarBeacons = !sRenderAvatarBeacons; }
-+
-+ /** @brief set if avatar beacons shall be rendered */
-+ static void setRenderAvatarBeacons(bool do_render ) { sRenderAvatarBeacons = do_render; }
-+
-+private:
-+ // when a line editor loses keyboard focus, it is committed.
-+ // commit callbacks are named onCommitWidgetName by convention.
-+ //void onCommitBaz(LLUICtrl* ctrl, void *userdata);
-+
-+ enum AVATARS_COLUMN_ORDER
-+ {
-+ LIST_AVATAR_ICON,
-+ LIST_AVATAR_NAME,
-+ LIST_DISTANCE,
-+ LIST_AGE,
-+ /*LIST_SCORE,*/
-+ LIST_PAYMENT,
-+ LIST_ACTIVITY,
-+ LIST_ENTERED,
-+ };
-+
-+ typedef void (*avlist_command_t)(const LLUUID &avatar, const std::string &name);
-+
-+ void speakText(S32 channel, EChatType type, std::string text);
-+
-+ /**
-+ * @brief Removes focus status from all avatars in list
-+ */
-+ void removeFocusFromAll();
-+
-+ /**
-+ * @brief Focus camera on previous avatar
-+ * @param marked_only Whether to choose only marked avatars
-+ */
-+ void focusOnPrev(BOOL marked_only);
-+
-+ /**
-+ * @brief Focus camera on next avatar
-+ * @param marked_only Whether to choose only marked avatars
-+ */
-+ void focusOnNext(BOOL marked_only);
-+
-+ /**
-+ * @brief Updates the internal avatar list from the coarse location list if not already present
-+ */
-+ void updateFromCoarse();
-+
-+ /**
-+ * @brief Purge hud object map from entries no longer in the list
-+ */
-+ void purgeAvatarHUDMap();
-+
-+ /**
-+ * @brief Handler for the "refresh" button click.
-+ * I am unsure whether this is actually necessary at the time.
-+ *
-+ * LL: By convention, button callbacks are named onClickButtonLabel
-+ * @param userdata Pointer to user data (LLFloaterAvatarList instance)
-+ */
-+ //static void onClickRefresh(void* userdata);
-+
-+ static void onClickProfile(void *userdata);
-+ static void onClickIM(void *userdata);
-+ static void onClickTrack(void *userdata);
-+ static void onClickMark(void *userdata);
-+
-+ static void onClickGohomerMark(void *userdata);
-+ static void onClickGohomerWarn(void *userdata);
-+ static void onClickGohomerEject(void *userdata);
-+ static void onClickGohomerSendAway(void *userdata);
-+ static void onClickGohomerSendHome(void *userdata);
-+ static void onClickGohomerSendHomeByKey(void *userdata);
-+
-+ static void onClickGohomerOff(void *userdata);
-+
-+
-+ static void onClickPrevInList(void *userdata);
-+ static void onClickNextInList(void *userdata);
-+ static void onClickPrevMarked(void *userdata);
-+ static void onClickNextMarked(void *userdata);
-+ static void onClickGetKey(void *userdata);
-+
-+ static void onClickTrustNetRate(void *userdata);
-+ static void onClickTrustNetExplain(void *userdata);
-+ static void onClickTrustNetWebsite(void *userdata);
-+ static void onClickTrustNetGetPassword(void *userdata);
-+ static void onClickTrustNetRenew(void *userdata);
-+
-+ static void onDoubleClick(void *userdata);
-+
-+ static void onClickFreeze(void *userdata);
-+ static void onClickEject(void *userdata);
-+// static void onClickBan(void *userdata);
-+// static void onClickUnban(void *userdata);
-+ static void onClickMute(void *userdata);
-+// static void onClickUnmute(void *userdata);
-+ static void onClickAR(void *userdata);
-+ static void onClickTeleport(void *userdata);
-+ static void onClickEjectFromEstate(void *userdata);
-+
-+ static void callbackFreeze(S32 option, void *userdata);
-+// static void callbackUnfreeze(S32 option, void *userdata);
-+ static void callbackEject(S32 option, void *userdata);
-+// static void callbackBan(S32 option, void *userdata);
-+ static void callbackMute(S32 option, void *userdata);
-+// static void callbackUnmute(void *userdata);
-+ static void callbackAR(void *userdata);
-+ static void callbackEjectFromEstate(S32 option, void *userdata);
-+
-+ void doCommand(avlist_command_t cmd);
-+
-+ /**
-+ * @brief Cleanup avatar list, removing dead entries from it.
-+ * This lets dead entries remain for some time. This makes it possible
-+ * to keep people passing by in the list long enough that it's possible
-+ * to do something to them.
-+ */
-+ void expireAvatarList();
-+
-+ /**
-+ * @brief Perform a Luskwood Gohomer command on the selected users
-+ * @param cmd Command (for example "gowarn")
-+ */
-+ void luskwoodCommand(std::string cmd);
-+
-+ /**
-+ * @brief Handle the results of a gohomer confirmation dialog
-+ * @param option Option selected (0=ok, 1=cancel)
-+ * @param data this
-+ */
-+ static void handleLuskwoodDialog(S32 option, void* data);
-+
-+ /**
-+ * @brief Handle the results of a gohomer turn off dialog
-+ * @param option Option selected (0=ok, 1=cancel)
-+ * @param data this
-+ */
-+ static void handleLuskwoodGohomerOffDialog(S32 option, void* data);
-+
-+ /**
-+ * @brief Process the AR queue
-+ * This generates AR reports for the queued avatars
-+ */
-+ void processARQueue();
-+
-+private:
-+ /**
-+ * @brief Pointer to the avatar scroll list
-+ */
-+ LLScrollListCtrl* mAvatarList;
-+ std::map<LLUUID, LLAvatarListEntry> mAvatars;
-+
-+ /**
-+ * @brief Queue of abuse reports
-+ */
-+ std::queue<LLUUID> mARQueue;
-+
-+ /**
-+ * @brief List of AR screens opened
-+ * We don't open them on creation to capture a clean screenshot. They're
-+ * opened only after finishing the process.
-+ */
-+ std::queue<LLFloaterReporter*> mARReporterQueue;
-+
-+ /**
-+ * @brief Last time during which an AR was submitted
-+ * Used to give the camera some time to move between avatars. Perhaps this way
-+ * of doing things isn't ideal, though.
-+ */
-+ S32 mARLastFrame;
-+
-+
-+ /**
-+ * @brief Request information about the specified avatar
-+ * @param avid Avatar id to request info about
-+ */
-+ void sendAvatarPropertiesRequest(LLUUID avid);
-+
-+ void checkTrackingStatus();
-+
-+ /**
-+ * @brief Returns the color for the specified avatar entry
-+ * @param ent Avatar entry
-+ * @param distance Distance from the user
-+ */
-+ //LLColor4 getAvatarColor(LLAvatarListEntry *ent, F32 distance);
-+ LLColor4 getAvatarColor(LLAvatarListEntry *ent, F32 distance, e_coloring_type type);
-+
-+ /**
-+ * @brief Replace variables in string
-+ * @param str String to replace variables in
-+ * @param avatar Value for $KEY
-+ * @param name Value for $NAME
-+ */
-+ static void replaceVars(std::string &str, LLUUID avatar, const std::string& name);
-+
-+ // tracking data
-+ BOOL mTracking; // tracking?
-+ BOOL mTrackByLocation; // TRUE if tracking by known position, FALSE for tracking a friend
-+ LLUUID mTrackedAvatar; // who we're tracking
-+
-+ /**
-+ * @brief Used to delay avatar data requests
-+ */
-+ LLTimer mDataRequestTimer;
-+
-+ /**
-+ * @brief Used to delay trustnet requests
-+ */
-+ LLTimer mTrustNetTimer;
-+
-+ /**
-+ * @brief Luskwood command to execute
-+ */
-+ std::string mLuskwoodCommand;
-+
-+ /**
-+ * @brief Avatar the camera is focused on
-+ */
-+ LLUUID mFocusedAvatar;
-+
-+ /** @brief holds state of avatar beacon render setup */
-+ static bool sRenderAvatarBeacons;
-+
-+
-+ std::map< LLUUID, LLPointer<LLHUDObject> > mHudObjectMap;
-+};
-+
-+/**
-+ * Pointer to global LLFloaterAvatarList instance.
-+ * This is initialized in llviewerwindow.cpp
-+ * @see llviewerwindow.cpp
-+ */
-+extern LLFloaterAvatarList* gFloaterAvatarList;
-diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
-index b907aed..b45f549 100644
---- a/indra/newview/llfloaterpreference.cpp
-+++ b/indra/newview/llfloaterpreference.cpp
-@@ -60,6 +60,7 @@
- #include "llpanelLCD.h"
- #include "llpanelmsgs.h"
- #include "llpanelweb.h"
-+#include "llpaneldatabase.h"
- #include "llpanelskins.h"
- #include "llprefschat.h"
- #include "llprefsvoice.h"
-@@ -190,6 +191,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
- mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mSkinsPanel->setDefaultBtn(default_btn);
-
-+ mDBPanel = new LLPanelDatabase();
-+ mTabContainer->addTabPanel(mDBPanel, mDBPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
-+ mDBPanel->setDefaultBtn(default_btn);
-+
- if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
- {
- mTabContainer->selectFirstTab();
-@@ -269,6 +274,7 @@ void LLPreferenceCore::apply()
- LLFloaterHardwareSettings::instance()->apply();
-
- mWebPanel->apply();
-+ mDBPanel->apply();
- #if LL_LCD_COMPILE
- // only add this option if we actually have a logitech keyboard / speaker set
- if (gLcdScreen->Enabled())
-@@ -297,6 +303,7 @@ void LLPreferenceCore::cancel()
- LLFloaterHardwareSettings::instance()->cancel();
-
- mWebPanel->cancel();
-+ mDBPanel->cancel();
- #if LL_LCD_COMPILE
- // only add this option if we actually have a logitech keyboard / speaker set
- if (gLcdScreen->Enabled())
-diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
-index 2a19f26..c7a2df9 100644
---- a/indra/newview/llfloaterpreference.h
-+++ b/indra/newview/llfloaterpreference.h
-@@ -49,6 +49,7 @@ class LLPanelAudioPrefs;
- class LLPanelDebug;
- class LLPanelNetwork;
- class LLPanelWeb;
-+class LLPanelDatabase;
- class LLMessageSystem;
- class LLPrefsChat;
- class LLPrefsVoice;
-@@ -91,6 +92,7 @@ private:
- LLPanelWeb *mWebPanel;
- LLPanelMsgs *mMsgPanel;
- LLPanelLCD *mLCDPanel;
-+ LLPanelDatabase *mDBPanel;
- };
-
- // Floater to control preferences (display, audio, bandwidth, general.
-diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
-index e8643c0..43f5892 100644
---- a/indra/newview/llfloaterreporter.cpp
-+++ b/indra/newview/llfloaterreporter.cpp
-@@ -540,7 +540,7 @@ void LLFloaterReporter::showFromMenu(EReportType report_type)
-
-
- // static
--void LLFloaterReporter::showFromObject(const LLUUID& object_id)
-+LLFloaterReporter* LLFloaterReporter::showFromObject(const LLUUID& object_id, bool show)
- {
- LLFloaterReporter* f = createNewAbuseReporter();
- f->center();
-@@ -557,7 +557,16 @@ void LLFloaterReporter::showFromObject(const LLUUID& object_id)
- // Need to deselect on close
- f->mDeselectOnClose = TRUE;
-
-- f->open(); /* Flawfinder: ignore */
-+ if ( show )
-+ {
-+ f->open(); /* Flawfinder: ignore */
-+ }
-+ else
-+ {
-+ gDialogVisible = FALSE;
-+ }
-+
-+ return f;
- }
-
-
-diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h
-index 921f9a1..2c6f679 100644
---- a/indra/newview/llfloaterreporter.h
-+++ b/indra/newview/llfloaterreporter.h
-@@ -92,7 +92,7 @@ public:
- // Enables all buttons
- static void showFromMenu(EReportType report_type);
-
-- static void showFromObject(const LLUUID& object_id);
-+ static LLFloaterReporter* showFromObject(const LLUUID& object_id, bool show = true);
-
- static void onClickSend (void *userdata);
- static void onClickCancel (void *userdata);
-diff --git a/indra/newview/llpaneldatabase.cpp b/indra/newview/llpaneldatabase.cpp
-new file mode 100644
-index 0000000..f510130
---- /dev/null
-+++ b/indra/newview/llpaneldatabase.cpp
-@@ -0,0 +1,149 @@
-+/**
-+ * @file llpaneldatabase.cpp
-+ * @brief Database preferences panel
-+ * @author Dale Glass
-+ *
-+ * Copyright (c) 2003-2007, Linden Research, Inc.
-+ *
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlife.com/developers/opensource/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlife.com/developers/opensource/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ */
-+
-+#include "llviewerprecompiledheaders.h"
-+
-+#include "llpaneldatabase.h"
-+
-+#include "llscrolllistctrl.h"
-+#include "llviewerwindow.h"
-+#include "llviewercontrol.h"
-+#include "lluictrlfactory.h"
-+#include "llfloateravatarpicker.h"
-+#include "llagentdata.h"
-+#include "llnotify.h"
-+
-+//-----------------------------------------------------------------------------
-+LLPanelDatabase::LLPanelDatabase() :
-+ LLPanel("Messages Panel")
-+{
-+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_database.xml");
-+ childSetAction("change_avatar_btn", onClickChangeAvatar, this);
-+};
-+
-+//-----------------------------------------------------------------------------
-+// postBuild()
-+//-----------------------------------------------------------------------------
-+
-+void LLPanelDatabase::refresh()
-+{
-+ llinfos << "Loading settings" << llendl;
-+ //mAvatarName = gSavedPerAccountSettings.getString("DBAvatarName");
-+ //mAvatarKey.set(gSavedPerAccountSettings.getString("DBAvatarKey"));
-+ //mURL = gSavedSettings.getString("DBURL");;
-+ //mUsername = gSavedSettings.getString("DBURLUsername");;
-+ //mPassword = gSavedSettings.getString("DBURLPassword");;
-+ //mSendPattern = gSavedSettings.getString("DBSendPattern");;
-+ //mPositivePattern = gSavedSettings.getString("DBPositivePattern");;
-+ //mNegativePattern = gSavedSettings.getString("DBNegativePattern");;
-+ //mDeniedPattern = gSavedSettings.getString("DBDeniedPattern");;
-+
-+}
-+
-+BOOL LLPanelDatabase::postBuild()
-+{
-+ refresh();
-+
-+ llinfos << "Setting settings in window" << llendl;
-+ childSetText("db_avatar" ,mAvatarName );
-+ childSetText("db_url" ,mURL );
-+ childSetText("db_url_username" ,mUsername );
-+ childSetText("db_url_password" ,mPassword );
-+ childSetText("send_pattern" ,mSendPattern );
-+ childSetText("positive_pattern",mPositivePattern );
-+ childSetText("negative_pattern",mNegativePattern );
-+ childSetText("denied_pattern" ,mDeniedPattern );
-+
-+ return TRUE;
-+}
-+
-+
-+void LLPanelDatabase::draw()
-+{
-+ LLPanel::draw();
-+}
-+
-+void LLPanelDatabase::apply()
-+{
-+ //llinfos << "Saving settings" << llendl;
-+
-+ //gSavedPerAccountSettings.setString("DBAvatarName", childGetText("db_avatar").c_str());
-+ //gSavedPerAccountSettings.setString("DBAvatarKey", mAvatarKey.asString());
-+ //gSavedSettings.setString("DBURL", childGetText("db_url").c_str());
-+ //gSavedSettings.setString("DBURLUsername", childGetText("db_url_username").c_str());
-+ //gSavedSettings.setString("DBURLPassword", childGetText("db_url_password").c_str());
-+
-+ //gSavedSettings.setString("DBSendPattern", childGetText("send_pattern").c_str());
-+ //gSavedSettings.setString("DBPositivePattern", childGetText("positive_pattern").c_str());
-+ //gSavedSettings.setString("DBNegativePattern", childGetText("negative_pattern").c_str());
-+ //gSavedSettings.setString("DBDeniedPattern", childGetText("denied_pattern").c_str());
-+
-+
-+}
-+
-+void LLPanelDatabase::cancel()
-+{
-+
-+}
-+
-+//static
-+void LLPanelDatabase::onClickChangeAvatar(void *userdata)
-+{
-+ LLFloaterAvatarPicker::show(onPickAvatar, userdata, FALSE, TRUE);
-+}
-+
-+//static
-+void LLPanelDatabase::onPickAvatar(const std::vector<std::string>& names,
-+ const std::vector<LLUUID>& ids,
-+ void* user_data)
-+{
-+ if (names.empty()) return;
-+ if (ids.empty()) return;
-+
-+ LLPanelDatabase *self = (LLPanelDatabase*)user_data;
-+
-+#ifndef LL_DEBUG
-+ // TODO: LL_DEBUG isn't the right one, what is it?
-+ //
-+ // Using yourself as the database avatar should work, and be useful
-+ // for debugging, but it's not something a normal user should be able
-+ // to do.
-+
-+// if(ids[0] == gAgentID)
-+// {
-+// LLNotifyBox::showXml("AddSelfDatabase");
-+// return;
-+// }
-+#endif
-+
-+ self->childSetText("db_avatar", names[0]);
-+ self->mAvatarName = names[0];
-+ self->mAvatarKey = ids[0];
-+}
-+
-+
-diff --git a/indra/newview/llpaneldatabase.h b/indra/newview/llpaneldatabase.h
-new file mode 100644
-index 0000000..e08a453
---- /dev/null
-+++ b/indra/newview/llpaneldatabase.h
-@@ -0,0 +1,65 @@
-+/**
-+ * @file llprefschat.h
-+ * @brief Database preferences panel
-+ *
-+ * Copyright (c) 2003-2007, Linden Research, Inc.
-+ *
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlife.com/developers/opensource/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlife.com/developers/opensource/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ */
-+
-+#ifndef LLPREFSDB_H
-+#define LLPREFSDB_H
-+
-+#include "llpanel.h"
-+
-+class LLPanelDatabase : public LLPanel
-+{
-+public:
-+ LLPanelDatabase();
-+ virtual ~LLPanelDatabase() {};
-+
-+ virtual BOOL postBuild();
-+ virtual void draw();
-+ virtual void refresh();
-+
-+ void apply();
-+ void cancel();
-+
-+ static void onClickChangeAvatar(void *userdata);
-+ static void onPickAvatar(const std::vector<std::string>& names,
-+ const std::vector<LLUUID>& ids,
-+ void* user_data);
-+
-+protected:
-+ std::string mAvatarName;
-+ LLUUID mAvatarKey;
-+ std::string mURL;
-+ std::string mUsername;
-+ std::string mPassword;
-+ std::string mSendPattern;
-+ std::string mPositivePattern;
-+ std::string mNegativePattern;
-+ std::string mDeniedPattern;
-+
-+};
-+
-+
-+#endif // LL_PREFSDB_H
-diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
-index 2ce111f..12ed7a0 100644
---- a/indra/newview/llstartup.cpp
-+++ b/indra/newview/llstartup.cpp
-@@ -3004,7 +3004,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
- msg->setHandlerFunc("ParcelDwellReply",
- LLViewerParcelMgr::processParcelDwellReply);
-
-- msg->setHandlerFunc("AvatarPropertiesReply",
-+ msg->addHandlerFunc("AvatarPropertiesReply",
- LLPanelAvatar::processAvatarPropertiesReply);
- msg->setHandlerFunc("AvatarInterestsReply",
- LLPanelAvatar::processAvatarInterestsReply);
-diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
-index 98ad5ff..f0077d0 100644
---- a/indra/newview/lltoolbar.cpp
-+++ b/indra/newview/lltoolbar.cpp
-@@ -49,6 +49,7 @@
- #include "llvoavatar.h"
- #include "lltooldraganddrop.h"
- #include "llinventoryview.h"
-+#include "llfloateravatarlist.h"
- #include "llfloaterchatterbox.h"
- #include "llfloaterfriends.h"
- #include "llfloatersnapshot.h"
-@@ -154,6 +155,9 @@ BOOL LLToolBar::postBuild()
- childSetAction("inventory_btn", onClickInventory, this);
- childSetControlName("inventory_btn", "ShowInventory");
-
-+ childSetAction("avatar_list_btn", onClickAvatarList, this);
-+ childSetControlName("inventory_btn", "ShowAvatarList");
-+
- for (child_list_const_iter_t child_iter = getChildList()->begin();
- child_iter != getChildList()->end(); ++child_iter)
- {
-@@ -527,3 +531,8 @@ void LLToolBar::onClickInventory(void*)
- handle_inventory(NULL);
- }
-
-+// static
-+void LLToolBar::onClickAvatarList(void*)
-+{
-+ LLFloaterAvatarList::toggle(NULL);
-+}
-diff --git a/indra/newview/lltoolbar.h b/indra/newview/lltoolbar.h
-index be0e1b4..e738e1a 100644
---- a/indra/newview/lltoolbar.h
-+++ b/indra/newview/lltoolbar.h
-@@ -82,6 +82,7 @@ public:
- static void onClickRadar(void* data);
- static void onClickMap(void* data);
- static void onClickInventory(void* data);
-+ static void onClickAvatarList(void* data);
-
- static F32 sInventoryAutoOpenTime;
-
-diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
-index 9782d4b..1182f10 100644
---- a/indra/newview/llviewermenu.cpp
-+++ b/indra/newview/llviewermenu.cpp
-@@ -201,6 +201,7 @@
- #include "pipeline.h"
- #include "llappviewer.h"
- #include "roles_constants.h"
-+#include "llfloateravatarlist.h"
- #include "llviewerjoystick.h"
- #include "llwlanimator.h"
- #include "llwlparammanager.h"
-@@ -5269,6 +5270,10 @@ class LLShowFloater : public view_listener_t
- {
- LLFloaterAbout::show(NULL);
- }
-+ else if (floater_name == "avatar list")
-+ {
-+ LLFloaterAvatarList::toggle(NULL);
-+ }
- else if (floater_name == "active speakers")
- {
- LLFloaterActiveSpeakers::toggleInstance(LLSD());
-@@ -7401,6 +7406,15 @@ static void addMenu(view_listener_t *menu, const std::string& name)
- menu->registerListener(gMenuHolder, name);
- }
-
-+class LLViewAvatarList : public view_listener_t
-+{
-+ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-+ {
-+ llinfos << "LLViewAvatarList::handleEvent()" << llendl;
-+ return true;
-+ }
-+};
-+
- void initialize_menus()
- {
- // File menu
-diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
-index 30e5e26..2715c26 100644
---- a/indra/newview/llviewermessage.cpp
-+++ b/indra/newview/llviewermessage.cpp
-@@ -135,6 +135,9 @@
- #include "llviewerdisplay.h"
- #include "llkeythrottle.h"
-
-+#include "llpanelavatar.h"
-+#include "llfloateravatarlist.h"
-+
- #include <boost/tokenizer.hpp>
-
- #if LL_WINDOWS // For Windows specific error handler
-diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
-index 5827dc2..bc877ba 100644
---- a/indra/newview/llviewerobject.h
-+++ b/indra/newview/llviewerobject.h
-@@ -598,8 +598,9 @@ protected:
- TPACKETID mLatestRecvPacketID; // Latest time stamp on message from simulator
- // extra data sent from the sim...currently only used for tree species info
- U8* mData;
--
-+public:
- LLPointer<LLViewerPartSourceScript> mPartSourcep; // Particle source associated with this object.
-+protected:
- LLAudioSourceVO* mAudioSourcep;
- F32 mAudioGain;
-
-diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
-index 106ad08..ec9d884 100644
---- a/indra/newview/llviewerwindow.cpp
-+++ b/indra/newview/llviewerwindow.cpp
-@@ -106,6 +106,7 @@
- #include "llfloatersnapshot.h"
- #include "llfloatertools.h"
- #include "llfloaterworldmap.h"
-+#include "llfloateravatarlist.h"
- #include "llfocusmgr.h"
- #include "llframestatview.h"
- #include "llgesturemgr.h"
-@@ -1865,9 +1866,14 @@ void LLViewerWindow::initWorldUI()
- gMorphView->setVisible(FALSE);
-
- // *Note: this is where gFloaterMute used to be initialized.
--
-+ gFloaterAvatarList = NULL;
- LLWorldMapView::initClass();
-
-+ gFloaterAvatarList = new LLFloaterAvatarList();
-+ gFloaterAvatarList->setVisible(FALSE);
-+
-+ LLWorldMapView::initClass();
-+
- adjust_rect_centered_partial_zoom("FloaterWorldMapRect2", full_window);
-
- gFloaterWorldMap = new LLFloaterWorldMap();
-diff --git a/indra/newview/llwebbrowserctrl.h b/indra/newview/llwebbrowserctrl.h
-index 8a31421..0400745 100644
---- a/indra/newview/llwebbrowserctrl.h
-+++ b/indra/newview/llwebbrowserctrl.h
-@@ -32,6 +32,8 @@
- #ifndef LL_LLWEBBROWSERCTRL_H
- #define LL_LLWEBBROWSERCTRL_H
-
-+#include "lluictrlfactory.h"
-+
- ////////////////////////////////////////////////////////////////////////////////
- // data class that is passed with an event
- class LLWebBrowserCtrlEvent
-diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
-index 81f1a90..6e686cd 100644
---- a/indra/newview/pipeline.cpp
-+++ b/indra/newview/pipeline.cpp
-@@ -78,6 +78,7 @@
- #include "llviewerimagelist.h"
- #include "llviewerobject.h"
- #include "llviewerobjectlist.h"
-+#include "llviewerpartsource.h"
- #include "llviewerparcelmgr.h"
- #include "llviewerregion.h" // for audio debugging.
- #include "llviewerwindow.h" // For getSpinAxis
-@@ -92,6 +93,7 @@
- #include "llvopartgroup.h"
- #include "llworld.h"
- #include "llcubemap.h"
-+#include "llfloateravatarlist.h"
- #include "lldebugmessagebox.h"
- #include "llviewershadermgr.h"
- #include "llviewerjoystick.h"
-@@ -2008,6 +2010,27 @@ void renderSoundHighlights(LLDrawable* drawablep)
- }
- }
-
-+/**
-+ * @brief Add particle sources to avatar list
-+ * This tells the avatar list floater who is emitting particles
-+ */
-+void addParticleSourcesToList(LLDrawable *drawablep)
-+{
-+ if ( NULL != gFloaterAvatarList )
-+ {
-+ LLViewerObject *vobj = drawablep->getVObj();
-+ if (vobj && vobj->isParticleSource())
-+ {
-+ LLUUID id = vobj->mPartSourcep->getOwnerUUID();
-+ LLAvatarListEntry *ent = gFloaterAvatarList->getAvatarEntry(id);
-+ if ( NULL != ent )
-+ {
-+ ent->setActivity(ACTIVITY_PARTICLES);
-+ }
-+ }
-+ }
-+}
-+
- void LLPipeline::postSort(LLCamera& camera)
- {
- LLMemType mt(LLMemType::MTYPE_PIPELINE);
-@@ -2108,6 +2131,8 @@ void LLPipeline::postSort(LLCamera& camera)
- std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater());
- }
-
-+ forAllVisibleDrawables(addParticleSourcesToList);
-+
- // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus
- if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
- {
-@@ -2156,6 +2181,23 @@ void LLPipeline::postSort(LLCamera& camera)
- }
- }
-
-+ // Avatar list support
-+ if ( gFloaterAvatarList && gAudiop )
-+ {
-+ LLAudioEngine::source_map::iterator iter;
-+ for (iter = gAudiop->mAllSources.begin(); iter != gAudiop->mAllSources.end(); ++iter)
-+ {
-+ LLAudioSource *sourcep = iter->second;
-+ LLUUID uuid = sourcep->getOwnerID();
-+ LLAvatarListEntry *ent = gFloaterAvatarList->getAvatarEntry(uuid);
-+
-+ if ( ent )
-+ {
-+ ent->setActivity(ACTIVITY_SOUND);
-+ }
-+ }
-+ }
-+
- // If managing your telehub, draw beacons at telehub and currently selected spawnpoint.
- if (LLFloaterTelehub::renderBeacons())
- {
-diff --git a/indra/newview/skins/default/xui/en-us/alerts.xml b/indra/newview/skins/default/xui/en-us/alerts.xml
-index 44b9141..7d1ede3 100644
---- a/indra/newview/skins/default/xui/en-us/alerts.xml
-+++ b/indra/newview/skins/default/xui/en-us/alerts.xml
-@@ -1374,6 +1374,23 @@ chat, or interact with the world.
- Cancel
- </option>
- </alert>
-+ <alert modal="true" name="AvatarListFreezeAvatars">
-+ <message name="message">
-+ Freeze these avatars?
-+ [NAMES]
-+ They will temporarily be unable to move,
-+ chat, or interact with the world.
-+ </message>
-+ <option name="Freeze">
-+ Freeze
-+ </option>
-+ <option name="Unfreeze">
-+ Unfreeze
-+ </option>
-+ <option name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
- <alert modal="true" name="EjectAvatar">
- <message name="message">
- Eject this avatar from your land?
-@@ -1402,6 +1419,53 @@ chat, or interact with the world.
- Cancel
- </option>
- </alert>
-+ <alert modal="true" name="AvatarListEjectAvatars">
-+ <message name="message">
-+ Eject these avatars from your land?
-+ [NAMES]
-+ </message>
-+ <option name="Eject">
-+ Eject
-+ </option>
-+ <option name="EjectandBan">
-+ Eject and Ban
-+ </option>
-+ <option name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+ <alert modal="true" name="AvatarListEjectAvatarsFromEstate">
-+ <message name="message">
-+ Eject these avatars from this estate?
-+ [NAMES]
-+ </message>
-+ <option name="Eject">
-+ Eject
-+ </option>
-+ <option name="EjectandBan">
-+ Eject and Ban
-+ </option>
-+ <option name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+
-+ <alert modal="true" name="AvatarListMuteAvatars">
-+ <message name="message">
-+ Mute these avatars?
-+ [NAMES]
-+ </message>
-+ <option name="Mute">
-+ Mute
-+ </option>
-+ <option name="Unmute">
-+ Unmute
-+ </option>
-+ <option name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+
- <alert modal="true" name="InvalidUUID">
- <message name="message">
- Not a valid UUID.
-@@ -4903,6 +4967,78 @@ they are part of an attachment.
- No
- </option>
- </alert>
-+ <!-- Luskwood functionality -->
-+ <alert modal="true" name="LuskwoodGohomerWarn">
-+ <message name="message">
-+ Warn this avatar?
-+
-+ This will show them a dialog asking to confirm that they understand
-+ their behavior was found to be undesirable, and that they face
-+ ejection or banning if it continues.
-+ </message>
-+ <option name="Warn">
-+ Warn
-+ </option>
-+ <option default="true" name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+ <alert modal="true" name="LuskwoodGohomerEject">
-+ <message name="message">
-+ Eject this avatar?
-+
-+ This avatar will be ejected from the area, but will be able to
-+ return immediately.
-+ </message>
-+ <option name="Eject">
-+ Eject
-+ </option>
-+ <option default="true" name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+ <alert modal="true" name="LuskwoodGohomerKeepAway">
-+ <message name="message">
-+ Eject this avatar and ban them for 2 hours?
-+
-+ This avatar will be ejected from the area, and will be added to
-+ the parcel's ban list for 2 hours.
-+ </message>
-+ <option name="KeepAway">
-+ Keep Away
-+ </option>
-+ <option default="true" name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+ <alert modal="true" name="LuskwoodGohomerSendHome">
-+ <message name="message">
-+ Send this avatar home and ban them for 4 hours?
-+
-+ This avatar will be sent home, and will be added to the parcel's
-+ ban list for 4 hours.
-+ </message>
-+ <option name="KeepAway">
-+ Send Home
-+ </option>
-+ <option default="true" name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
-+ <alert modal="true" name="LuskwoodGohomerOff">
-+ <message name="message">
-+ Turn off the gohomer?
-+
-+ This will make it stop trying to send the last ejected avatar home,
-+ but won't remove them from the ban list.
-+ </message>
-+ <option name="TurnOff">
-+ Turn Off
-+ </option>
-+ <option default="true" name="Cancel">
-+ Cancel
-+ </option>
-+ </alert>
- <alert modal="true" name="BadURL">
- <message name="message">
- Second Life doesn't know how to handle the link:
-diff --git a/indra/newview/skins/default/xui/en-us/floater_avatar_scanner.xml b/indra/newview/skins/default/xui/en-us/floater_avatar_scanner.xml
-new file mode 100644
-index 0000000..7156aa4
---- /dev/null
-+++ b/indra/newview/skins/default/xui/en-us/floater_avatar_scanner.xml
-@@ -0,0 +1,413 @@
-+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-+<floater
-+ name="avatar list"
-+ title="Avatar List"
-+ can_resize="true"
-+ can_minimize="true"
-+ can_close="true"
-+ can_drag_on_left="false"
-+ rect_control="FloaterAvatarListRect"
-+ min_width="400"
-+ min_height="300"
-+ >
-+ <!-- <text
-+ name="help_label"
-+ bottom="-30"
-+ left="15"
-+ font="SansSerifSmall"
-+ follows="top|left"
-+ >
-+ </text> -->
-+
-+ <scroll_list
-+ name="avatar_list"
-+ left="10"
-+ right="-10"
-+ top="-20"
-+ bottom="150"
-+ column_padding="0"
-+ can_resize="true"
-+ follows="left|top|bottom|right"
-+ draw_heading="true"
-+ multi_select="true"
-+ search_column="1"
-+ tool_tip="Hold shift or control while clicking to select multiple avatars"
-+ >
-+ <!-- Icons relating to the avatar, currently: tracking, and marked -->
-+ <column name="avatar_icon" label="Icon" width="20" />
-+ <column name="avatar_name" label="Name" dynamicwidth="true" />
-+ <column name="distance" label="Distance" width="70"/>
-+ <column name="age" label="Age" width="50"/>
-+ <!-- <column name="payment_data" label="Payment" width="80"/> -->
-+ <!-- TrustNet Score -->
-+ <!-- <column name="score" label="Score" width="10"/> -->
-+ <!-- Payment data icons -->
-+ <column name="payment_data" label="" width="20" />
-+ <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
-+ <column name="activity" label="" width="20" />
-+ <!-- Time when avatar entered -->
-+ <column name="entered" label="Entered" width="60"/>
-+ </scroll_list>
-+<!-- <panel
-+ name="scanner_options"
-+ left="10"
-+ right="-10"
-+ height="45"
-+ bottom="140"
-+ border="true"
-+ mouse_opaque="true"
-+ bevel_style="in"
-+ background_visible="true"
-+ background_opaque="true"
-+ follows="left|right|bottom"
-+ bg_opaque_color="0,0,0,0.3"
-+ bg_alpha_color="blue"
-+ can_resize="false"
-+ >
-+
-+ </panel> -->
-+
-+ <tab_container border="false" bottom_delta="-130" height="120" left="10" mouse_opaque="false"
-+ name="actions_tab_container" tab_position="top" follows="left|right|bottom">
-+ <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-+ label="Avatar" left="1" mouse_opaque="true"
-+ name="actions_tab" width="398">
-+ <!-- upper row -->
-+ <button
-+ name="profile_btn"
-+ label="Profile"
-+ tool_tip="Show picture, groups, and other information"
-+ left="10"
-+ bottom_delta="-190"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="im_btn"
-+ label="IM"
-+ tool_tip="Open Instant Message session"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+
-+
-+ <!--middle row -->
-+ <button
-+ name="track_btn"
-+ label="Track"
-+ tool_tip="Track this avatar's position"
-+ left="10"
-+ bottom_delta="-24"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="mark_btn"
-+ label="Mark"
-+ tool_tip="Mark this avatar in the list"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="get_key_btn"
-+ label="Get Key"
-+ tool_tip="Copies avatar's key to the clipboard"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="teleport_btn"
-+ label="Teleport"
-+ tool_tip="Teleport to avatar's position"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <!-- lower row-->
-+ <button
-+ name="prev_in_list_btn"
-+ label="Prev"
-+ tool_tip="Focus camera on previous avatar in list"
-+ left="10"
-+ bottom_delta="-24"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="next_in_list_btn"
-+ label="Next"
-+ tool_tip="Focus camera on next avatar in list"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="prev_marked_btn"
-+ label="Prev Marked"
-+ tool_tip="Focus camera on previous marked avatar"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="next_marked_btn"
-+ label="Next Marked"
-+ tool_tip="Focus camera on next marked avatar"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+
-+ </panel>
-+ <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-+ label="Moderation" left="1" mouse_opaque="true"
-+ name="land_tab" width="398">
-+
-+ <!-- Upper row -->
-+ <button
-+ name="freeze_btn"
-+ label="Freeze"
-+ tool_tip="Freeze the avatar, preventing it from moving"
-+ left="10"
-+ bottom_delta="-190"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="eject_btn"
-+ label="Eject"
-+ tool_tip="Eject the avatar from the parcel"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+
-+ <button
-+ name="mute_btn"
-+ label="Mute"
-+ tool_tip="Mute this avatar"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+
-+
-+ <button
-+ name="ar_btn"
-+ label="AR"
-+ tool_tip="Report abuse on this avatar"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+
-+ <!-- middle row -->
-+ <button
-+ name="estate_eject_btn"
-+ label="Eject from estate"
-+ tool_tip="Eject this avatar from the estate"
-+ left="10"
-+ bottom_delta="-24"
-+ width="170"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ </panel>
-+
-+ <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-+ label="TrustNet" left="1" mouse_opaque="true"
-+ name="trustnet_tab" width="398">
-+ <!--TrustNet tools -->
-+ <!-- upper row -->
-+ <button
-+ name="tn_rate_btn"
-+ label="Rate"
-+ tool_tip="Give a TrustNet rating to this avatar"
-+ left="10"
-+ bottom_delta="-190"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="tn_explain_btn"
-+ label="Explain"
-+ tool_tip="Explain this avatar's score"
-+ left="100"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <!--lower row-->
-+ <button
-+ name="tn_website_btn"
-+ label="Web"
-+ tool_tip="Open a web browser with the TrustNet website"
-+ left="10"
-+ bottom_delta="-24"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="tn_password_btn"
-+ label="Password"
-+ tool_tip="Get a password for the TrustNet website. A new password is generated every time."
-+ left="100"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="tn_renew_btn"
-+ label="Renew"
-+ tool_tip="Renew the TrustNet subscription"
-+ left="190"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+
-+ </panel>
-+ <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-+ label="Luskwood" left="1" mouse_opaque="true"
-+ name="luskwood_tab" width="398">
-+ <!--Luskwood tools, upper row-->
-+ <button
-+ name="gowarn_btn"
-+ label="Warn"
-+ tool_tip="Give a warning to this avatar"
-+ left="10"
-+ bottom_delta="-190"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="goeject_btn"
-+ label="Eject"
-+ tool_tip="Eject this avatar"
-+ left="100"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="goaway_btn"
-+ label="Keep away"
-+ tool_tip="Eject, and keep this avatar away for 2 hours"
-+ left="190"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="gohome_btn"
-+ label="Send home"
-+ tool_tip="Send home, and keep this avatar away for 4 hours"
-+ left="280"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <!-- Middle row -->
-+ <button
-+ name="gokey_btn"
-+ label="Ban by key"
-+ tool_tip="Turn off the send home function"
-+ left="10"
-+ bottom_delta="-24"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ <button
-+ name="gohomeoff_btn"
-+ label="Off"
-+ tool_tip="Turn off the send home function"
-+ left_delta="90"
-+ bottom_delta="0"
-+ width="80"
-+ height="20"
-+ font="SansSerifSmall"
-+ follows="bottom|left"
-+ />
-+ </panel>
-+ <panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
-+ label="Options" left="1" mouse_opaque="true"
-+ name="options_tab" width="398">
-+ <check_box height="16" label="Update"
-+ left="10" bottom_delta="-190" name="update_enabled_cb"
-+ width="200" follows="bottom|left"
-+ hidden="false" mouse_opaque="true" font="SansSerifSmall"
-+ initial_value="true" enabled="true" radio_style="false"
-+ tool_tip="Set whether the avatar list should update" />
-+
-+ <check_box height="16" label="Get avatar info"
-+ left="20" bottom_delta="-21" name="fetch_avdata_enabled_cb"
-+ width="200" follows="bottom|left"
-+ hidden="false" mouse_opaque="true" font="SansSerifSmall"
-+ initial_value="true" enabled="true" radio_style="false"
-+ tool_tip="Set whether avatar information should be retrieved" />
-+ </panel>
-+ </tab_container>
-+
-+</floater>
-diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-index 2728962..50ab0af 100644
---- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-@@ -221,6 +221,13 @@
- mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
- <on_click function="ShowFloater" userdata="preferences" />
- </menu_item_call>
-+ <menu_item_separator bottom="-46" enabled="true" height="8" hidden="false" label="-----------"
-+ left="0" mouse_opaque="true" name="separator6" width="211" />
-+ <menu_item_check bottom="-65" enabled="true" height="19" hidden="false" label="Avatar List" left="0" mouse_opaque="true" name="Avatar List" width="211">
-+ <on_click function="ShowFloater" userdata="avatar list" />
-+ <on_check function="FloaterVisible" userdata="avatar list" />
-+ </menu_item_check>
-+
- </menu>
- <menu bottom="-1" create_jump_keys="true" drop_shadow="true" enabled="true"
- height="537" label="View" left="80" mouse_opaque="false" name="View"
-@@ -395,6 +402,12 @@
- mouse_opaque="true" name="Set UI Size to Default" width="188">
- <on_click function="View.DefaultUISize" userdata="" />
- </menu_item_call>
-+ <menu_item_separator bottom="-46" enabled="true" height="8" hidden="false" label="-----------"
-+ left="0" mouse_opaque="true" name="separator6" width="211" />
-+ <menu_item_check bottom="-65" enabled="true" height="19" hidden="false" label="Avatar List" left="0" mouse_opaque="true" name="Avatar List" width="211">
-+ <on_click function="ShowFloater" userdata="avatar list" />
-+ <on_check function="FloaterVisible" userdata="avatar list" />
-+ </menu_item_check>
- </menu>
- <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
- height="339" label="World" left="0" mouse_opaque="false" name="World"
-diff --git a/indra/newview/skins/default/xui/en-us/notify.xml b/indra/newview/skins/default/xui/en-us/notify.xml
-index 63396af..cf0056b 100644
---- a/indra/newview/skins/default/xui/en-us/notify.xml
-+++ b/indra/newview/skins/default/xui/en-us/notify.xml
-@@ -915,6 +915,12 @@ You can find example sculpted textures in the inventory library.
- from this list.
- </message>
- </notify>
-+ <!--Database preferences panel -->
-+ <notify name="AddSelfDatabase" tip="false">
-+ <message name="message">
-+ You cannot use yourself as the database avatar.
-+ </message>
-+ </notify>
- <notify name="VoiceInviteP2P" tip="false" unique="true">
- <message name="message">
- [NAME] is inviting you to a Voice Chat call.
-diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_database.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_database.xml
-new file mode 100644
-index 0000000..314b02d
---- /dev/null
-+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_database.xml
-@@ -0,0 +1,166 @@
-+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-+ height="408" hidden="false" label="Database" left="102" mouse_opaque="true"
-+ name="avatar_db" width="517">
-+
-+ <!-- Options section -->
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="12" mouse_opaque="false" name="text_box" v_pad="0" width="300">
-+ Options:
-+ </text>
-+
-+ <check_box bottom_delta="0" control_name="DBEnabled" enabled="true"
-+ follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-+ initial_value="false" label="Database enabled" left="148"
-+ mouse_opaque="true" name="database_enabled_cb" radio_style="false"
-+ width="256" />
-+
-+ <radio_group bottom_delta="-110" control_name="DBRetrievalMode" draw_border="true" enabled="true"
-+ follows="left|top" height="100" hidden="false" left="148"
-+ mouse_opaque="true" name="Database access type" width="321">
-+ <radio_item type="string" length="1" bottom="-20" enabled="true" follows="left|top" height="16" hidden="false"
-+ left="3" mouse_opaque="true" name="UseAvatar" width="315">
-+ Avatar:
-+ </radio_item>
-+ <radio_item type="string" length="1" bottom_delta="-10" enabled="false" follows="left|top" height="16" hidden="false"
-+ left="3" mouse_opaque="true" name="UseURL" width="315">
-+ URL:
-+ </radio_item>
-+ </radio_group>
-+
-+ <!-- HACK: apparently line_editor can't go inside a radio_group, so we make it appear
-+ inside while not actually being in there -->
-+ <button bottom_delta="78" follows="right|bottom" font="SansSerif" halign="center"
-+ height="20" label="Change Avatar" label_selected="Change Avatar" left="260"
-+ mouse_opaque="true" name="change_avatar_btn" width="100" />
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="348" max_length="254" mouse_opaque="true" name="db_avatar"
-+ select_on_focus="false" width="130" control_name="DBAvatar" enabled="false"/>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="db_url"
-+ select_on_focus="false" width="230" enabled="false" control_name="DBURL" />
-+
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="170" mouse_opaque="false" name="text_box" v_pad="0" width="300">
-+ Username:
-+ </text>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="db_url_username"
-+ select_on_focus="false" width="230" enabled="false" control_name="DBURLUsername" />
-+
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="170" mouse_opaque="false" name="text_box" v_pad="0" width="300">
-+ Password:
-+ </text>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="db_url_password"
-+ select_on_focus="false" width="230" enabled="false" control_name="DBURLPassword" />
-+
-+
-+ <!--Patterns section-->
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="12" mouse_opaque="false" name="text_box" v_pad="0" width="300">
-+ Patterns:
-+ </text>
-+
-+
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="148" mouse_opaque="false" name="text_box2" v_pad="0" width="300">
-+ Send:
-+ </text>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="send_pattern"
-+ select_on_focus="false" width="230" control_name="DBSendPattern" >
-+ $NAME
-+ </line_editor>
-+
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="148" mouse_opaque="false" name="text_box2" v_pad="0" width="300">
-+ Positive contains:
-+ </text>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="positive_pattern"
-+ select_on_focus="false" width="230" control_name="DBPositivePattern" />
-+
-+
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="148" mouse_opaque="false" name="text_box2" v_pad="0" width="300">
-+ Negative contains:
-+ </text>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="negative_pattern"
-+ select_on_focus="false" width="230" control_name="DBNegativePattern" />
-+
-+
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="148" mouse_opaque="false" name="text_box2" v_pad="0" width="300">
-+ Denied contains:
-+ </text>
-+
-+ <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-+ follows="left|top|right" font="SansSerifSmall" height="16" hidden="false"
-+ left="248" max_length="254" mouse_opaque="true" name="denied_pattern"
-+ select_on_focus="false" width="230" control_name="DBDeniedPattern" />
-+
-+ <!--Timeouts section-->
-+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-+ bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-+ font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-+ left="12" mouse_opaque="false" name="text_box" v_pad="0" width="300">
-+ Timeouts:
-+ </text>
-+
-+ <spinner bottom_delta="-20" control_name="DBMaxConcurrentRequests" decimal_digits="0" enabled="true"
-+ follows="left|top" height="16" hidden="false" increment="1"
-+ initial_val="4" label="Max concurrent requests:" label_width="138" left="148"
-+ max_val="32" min_val="1" mouse_opaque="true" name="max_concurrent_requests"
-+ width="202" />
-+
-+ <spinner bottom_delta="-20" control_name="DBDelayBetweenRequests" decimal_digits="0" enabled="true"
-+ follows="left|top" height="16" hidden="false" increment="1"
-+ initial_val="1" label="Delay between requests:" label_width="138" left="148"
-+ max_val="32" min_val="0" mouse_opaque="true" name="delay_between_requests"
-+ width="202" />
-+
-+ <spinner bottom_delta="-20" control_name="DBRequestTimeout" decimal_digits="0" enabled="true"
-+ follows="left|top" height="16" hidden="false" increment="4"
-+ initial_val="64" label="Request timeout:" label_width="138" left="148"
-+ max_val="65536" min_val="16" mouse_opaque="true" name="request_timeout"
-+ width="202" />
-+
-+ <spinner bottom_delta="-20" control_name="DBGiveUpAfter" decimal_digits="0" enabled="true"
-+ follows="left|top" height="16" hidden="false" increment="64"
-+ initial_val="4096" label="Give up after:" label_width="138" left="148"
-+ max_val="65536" min_val="64" mouse_opaque="true" name="give_up_after"
-+ width="202" />
-+</panel>
-\ No newline at end of file
-diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
-index 9c57be0..b264e6e 100644
---- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
-+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
-@@ -18,6 +18,12 @@
- list_position="above"
- width="50" follows="left|right" user_resize="false"/>
- <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-+ <button bottom="0" font="SansSerif" height="24" label="Avatars" left="0"
-+ name="avatar_list_btn" tool_tip="List of nearby avatars" width="50"
-+ image_selected="toolbar_btn_selected.tga"
-+ image_unselected="toolbar_btn_enabled.tga" scale_image="true"
-+ follows="left|right" user_resize="false" />
-+ <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
- <button bottom="0" font="SansSerif" height="24" label="Fly"
- image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
- image_selected="toolbar_btn_selected.tga"
-@@ -68,3 +74,4 @@
- </layout_stack>
-
- </panel>
-+
---
-tg: (b606591..) topic/features/jira-backported/avatar_list (depends on: master)
diff --git a/debian/patches/topic/features/jira-sent/24_always_test_vectorize.diff b/debian/patches/topic/features/jira-sent/24_always_test_vectorize.diff
deleted file mode 100644
index 6ee005a..0000000
--- a/debian/patches/topic/features/jira-sent/24_always_test_vectorize.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/features/jira-sent/24_always_test_vectorize
-
-Always test to see if CPU has sse/altivect expernsions, regardless of compile host.
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/llappviewer.cpp | 8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
-index 49991b4..34205c6 100644
---- a/indra/newview/llappviewer.cpp
-+++ b/indra/newview/llappviewer.cpp
-@@ -419,7 +419,6 @@ static void settings_modify()
- gDebugGL = gSavedSettings.getBOOL("RenderDebugGL");
- gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline");
-
--#if LL_VECTORIZE
- if (gSysCPU.hasAltivec())
- {
- gSavedSettings.setBOOL("VectorizeEnable", TRUE );
-@@ -445,13 +444,6 @@ static void settings_modify()
- gSavedSettings.setU32("VectorizeProcessor", 0 );
- gSavedSettings.setBOOL("VectorizeSkin", FALSE);
- }
--#else
-- // This build target doesn't support SSE, don't test/run.
-- gSavedSettings.setBOOL("VectorizePerfTest", FALSE );
-- gSavedSettings.setBOOL("VectorizeEnable", FALSE );
-- gSavedSettings.setU32("VectorizeProcessor", 0 );
-- gSavedSettings.setBOOL("VectorizeSkin", FALSE);
--#endif
- }
-
- void LLAppViewer::initGridChoice()
---
-tg: (c8fb40a..) topic/features/jira-sent/24_always_test_vectorize (depends on: upstream)
diff --git a/debian/patches/topic/features/jira-sent/openal_1.21.0.diff b/debian/patches/topic/features/jira-sent/openal_1.21.0.diff
deleted file mode 100644
index e2cb311..0000000
--- a/debian/patches/topic/features/jira-sent/openal_1.21.0.diff
+++ /dev/null
@@ -1,1085 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/features/jira-sent/openal_1.21.0
-
-My version of openal and gstreamer patches.
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/cmake/LLAudio.cmake | 10 +-
- indra/cmake/OPENAL.cmake | 14 +
- indra/llaudio/CMakeLists.txt | 18 +
- indra/llaudio/audioengine.cpp | 6 +
- indra/llaudio/audioengine.h | 4 +
- indra/llaudio/audioengine_openal.cpp | 618 ++++++++++++++++++++++++++++++++++
- indra/llaudio/audioengine_openal.h | 123 +++++++
- indra/llaudio/listener_openal.cpp | 95 ++++++
- indra/llaudio/listener_openal.h | 4 +
- indra/newview/CMakeLists.txt | 6 +
- indra/newview/llstartup.cpp | 14 +-
- 11 files changed, 908 insertions(+), 4 deletions(-)
-
-diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake
-index eff643d..124067b 100644
---- a/indra/cmake/LLAudio.cmake
-+++ b/indra/cmake/LLAudio.cmake
-@@ -6,4 +6,12 @@ set(LLAUDIO_INCLUDE_DIRS
- ${LIBS_OPEN_DIR}/llaudio
- )
-
--set(LLAUDIO_LIBRARIES llaudio)
-+set(LLAUDIO_LIBRARIES
-+ llaudio
-+ ${VORBISENC_LIBRARIES}
-+ ${VORBISFILE_LIBRARIES}
-+ ${VORBIS_LIBRARIES}
-+ ${OGG_LIBRARIES}
-+ ${OPENAL_LIBRARIES}
-+ )
-+
-diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
-new file mode 100644
-index 0000000..ad0ebfc
---- /dev/null
-+++ b/indra/cmake/OPENAL.cmake
-@@ -0,0 +1,14 @@
-+
-+set(OPENAL OFF CACHE BOOL "Enable OpenAL")
-+
-+
-+if (OPENAL)
-+ include(FindPkgConfig)
-+ pkg_check_modules(OPENAL_LIB REQUIRED openal)
-+ pkg_check_modules(FREEAULT_LIB REQUIRED freealut)
-+ set(OPENAL_LIBRARIES
-+ openal
-+ alut
-+ )
-+
-+endif (OPENAL)
-diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
-index ebedcab..ed008ae 100644
---- a/indra/llaudio/CMakeLists.txt
-+++ b/indra/llaudio/CMakeLists.txt
-@@ -9,6 +9,7 @@ include(LLCommon)
- include(LLMath)
- include(LLMessage)
- include(LLVFS)
-+include(LLMedia)
-
- include_directories(
- ${FMOD_INCLUDE_DIR}
-@@ -20,6 +21,10 @@ include_directories(
- ${VORBISENC_INCLUDE_DIRS}
- ${VORBISFILE_INCLUDE_DIRS}
- ${VORBIS_INCLUDE_DIRS}
-+ ${OPENAL_LIB_INCLUDE_DIRS}
-+ ${FREEAULT_LIB_INCLUDE_DIRS}
-+ ${LLMEDIA_INCLUDE_DIRS}
-+ ${GSTREAMER_INCLUDE_DIRS}
- )
-
- set(llaudio_SOURCE_FILES
-@@ -59,6 +64,19 @@ if (FMOD)
- endif (LINUX)
- endif (FMOD)
-
-+if (OPENAL)
-+ list(APPEND llaudio_SOURCE_FILES
-+ audioengine_openal.cpp
-+ listener_openal.cpp
-+ )
-+
-+ list(APPEND llaudio_HEADER_FILES
-+ audioengine_openal.h
-+ listener_openal.h
-+ )
-+
-+endif (OPENAL)
-+
- set_source_files_properties(${llaudio_HEADER_FILES}
- PROPERTIES HEADER_FILE_ONLY TRUE)
-
-diff --git a/indra/llaudio/audioengine.cpp b/indra/llaudio/audioengine.cpp
-index 298ab1d..130231d 100644
---- a/indra/llaudio/audioengine.cpp
-+++ b/indra/llaudio/audioengine.cpp
-@@ -114,6 +114,8 @@ BOOL LLAudioEngine::init(const S32 num_channels, void* userdata)
- // Initialize the decode manager
- gAudioDecodeMgrp = new LLAudioDecodeMgr;
-
-+ llinfos << "LLAudioEngine::init() AudioEngine successfully initialized" << llendl;
-+
- return TRUE;
- }
-
-@@ -1360,7 +1362,11 @@ BOOL LLAudioSource::play(const LLUUID &audio_uuid)
- BOOL LLAudioSource::isDone()
- {
- const F32 MAX_AGE = 60.f;
-+#if LL_OPENAL
-+ const F32 MAX_UNPLAYED_AGE = 30.f;
-+#else
- const F32 MAX_UNPLAYED_AGE = 15.f;
-+#endif
- if (isLoop())
- {
- // Looped sources never die on their own.
-diff --git a/indra/llaudio/audioengine.h b/indra/llaudio/audioengine.h
-index b8153a3..877231a 100644
---- a/indra/llaudio/audioengine.h
-+++ b/indra/llaudio/audioengine.h
-@@ -173,6 +173,10 @@ public:
- static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status);
-
-
-+ #if LL_OPENAL
-+ virtual void InitStreamer() = 0;
-+ #endif
-+
- friend class LLPipeline; // For debugging
- public:
- F32 mMaxWindGain; // Hack. Public to set before fade in?
-diff --git a/indra/llaudio/audioengine_openal.cpp b/indra/llaudio/audioengine_openal.cpp
-new file mode 100644
-index 0000000..d6a2f12
---- /dev/null
-+++ b/indra/llaudio/audioengine_openal.cpp
-@@ -0,0 +1,618 @@
-+/**
-+ * @file audioengine_openal.cpp
-+ * @brief implementation of audio engine using OpenAL
-+ * support as a OpenAL 3D implementation
-+ *
-+ * Copyright (c) 2002-2008, Linden Research, Inc.
-+ *
-+ * Second Life Viewer Source Code
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlife.com/developers/opensource/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlife.com/developers/opensource/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ */
-+
-+#include "linden_common.h"
-+
-+#include "audioengine_openal.h"
-+#include "listener_openal.h"
-+
-+
-+#if LL_OPENAL_WIND
-+// Variables and definitions for Wind
-+#define NO_WIND_BUFFERS 20
-+static ALuint wind_buffers[NO_WIND_BUFFERS];
-+static ALuint wind_sources[1];
-+static S16 *winddata=NULL;
-+
-+static BOOL first_wind=TRUE;
-+
-+ALfloat source0Vel[]={ 0.0, 0.0, 0.0};
-+
-+// These globals for the wind filter. Blech!
-+F64 gbuf0 = 0.0;
-+F64 gbuf1 = 0.0;
-+F64 gbuf2 = 0.0;
-+F64 gbuf3 = 0.0;
-+F64 gbuf4 = 0.0;
-+F64 gbuf5 = 0.0;
-+F64 gY0 = 0.0;
-+F64 gY1 = 0.0;
-+
-+F32 gTargetGain = 0.f;
-+F32 gCurrentGain = 0.f;
-+F32 gTargetFreq = 100.f;
-+F32 gCurrentFreq = 100.f;
-+F32 gTargetPanGainR = 0.5f;
-+F32 gCurrentPanGainR = 0.5f;
-+#endif // LL_OPENAL_WIND
-+
-+LLAudioEngine_OpenAL::LLAudioEngine_OpenAL(){
-+
-+#if LL_GSTREAMER_ENABLED
-+ mMedia_data = new LLMediaManagerData;
-+ LLMediaImplGStreamer::startup( mMedia_data ); // initialize GStreamer
-+
-+ m_streamer=new LLMediaImplGStreamer ();
-+
-+ if(!m_streamer)
-+ {
-+ llwarns << "LLAudioEngine_OpenAL::LLAudioEngine_OpenAL() Failed to create our private gstreamer audio instance" << llendl;
-+ }
-+#endif
-+}
-+
-+LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL(){
-+}
-+
-+BOOL LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata){
-+
-+ LLAudioEngine::init(num_channels, userdata);
-+
-+ if(!alutInit(NULL, NULL)){
-+ llwarns << "LLAudioEngine_OpenAL::init() ALUT initialization failed: " << alutGetErrorString (alutGetError ()) << llendl;
-+ return FALSE;
-+ }
-+
-+ initInternetStream();
-+
-+ llinfos << "LLAudioEngine_OpenAL::init() OpenAL successfully initialized" << llendl;
-+
-+ llinfos << "LLAudioEngine_OpenAL::init() Speed of sound is: " << alGetFloat(AL_SPEED_OF_SOUND) << llendl;
-+
-+ return TRUE;
-+}
-+
-+void LLAudioEngine_OpenAL::idle(F32 max_decode_time){
-+ LLAudioEngine::idle(max_decode_time);
-+#if LL_GSTREAMER_ENABLED
-+ if(m_streamer != NULL)
-+ m_streamer->updateMedia();
-+#endif
-+}
-+
-+void LLAudioEngine_OpenAL::allocateListener(){
-+ mListenerp = (LLListener *) new LLListener_OpenAL();
-+ if(!mListenerp){
-+ llwarns << "LLAudioEngine_OpenAL::allocateListener() Listener creation failed" << llendl;
-+ }
-+}
-+
-+void LLAudioEngine_OpenAL::shutdown(){
-+ LLAudioEngine::shutdown();
-+
-+ if(!alutExit()){
-+ llwarns << "LLAudioEngine_OpenAL::shutdown() ALUT shutdown failed: " << alutGetErrorString (alutGetError ()) << llendl;
-+ }
-+
-+ llinfos << "LLAudioEngine_OpenAL::shutdown() OpenAL successfully shut down" << llendl;
-+
-+ delete mListenerp;
-+ mListenerp = NULL;
-+
-+#if LL_GSTREAMER_ENABLED
-+ if(m_streamer){
-+ delete m_streamer;
-+ m_streamer = NULL;
-+ }
-+#endif
-+}
-+
-+LLAudioBuffer *LLAudioEngine_OpenAL::createBuffer(){
-+ return new LLAudioBufferOpenAL();
-+}
-+
-+LLAudioChannel *LLAudioEngine_OpenAL::createChannel(){
-+ return new LLAudioChannelOpenAL();
-+}
-+
-+void LLAudioEngine_OpenAL::setInternalGain(F32 gain){
-+ //llinfos << "LLAudioEngine_OpenAL::setInternalGain() Gain: " << gain << llendl;
-+ alListenerf(AL_GAIN, gain);
-+}
-+
-+LLAudioChannelOpenAL::LLAudioChannelOpenAL(){
-+ alGenSources(1, &ALSource);
-+}
-+
-+LLAudioChannelOpenAL::~LLAudioChannelOpenAL(){
-+ cleanup();
-+ alDeleteSources(1, &ALSource);
-+}
-+
-+void LLAudioChannelOpenAL::cleanup(){
-+ alSourceStop(ALSource);
-+ mCurrentBufferp = NULL;
-+}
-+
-+void LLAudioChannelOpenAL::play(){
-+ if(!isPlaying()){
-+ alSourcePlay(ALSource);
-+ getSource()->setPlayedOnce(TRUE);
-+ }
-+}
-+
-+void LLAudioChannelOpenAL::playSynced(LLAudioChannel *channelp){
-+ play();
-+}
-+
-+BOOL LLAudioChannelOpenAL::isPlaying(){
-+ ALint state;
-+ alGetSourcei(ALSource, AL_SOURCE_STATE, &state);
-+ if(state == AL_PLAYING){
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+BOOL LLAudioChannelOpenAL::updateBuffer(){
-+ if (LLAudioChannel::updateBuffer()){
-+ // Base class update returned TRUE, which means that we need to actually
-+ // set up the source for a different buffer.
-+ LLAudioBufferOpenAL *bufferp = (LLAudioBufferOpenAL *)mCurrentSourcep->getCurrentBuffer();
-+ alSourcei(ALSource, AL_BUFFER, bufferp->getBuffer());
-+ alSourcef(ALSource, AL_GAIN, mCurrentSourcep->getGain());
-+ alSourcei(ALSource, AL_LOOPING, mCurrentSourcep->isLoop() ? AL_TRUE : AL_FALSE);
-+ }
-+
-+ return TRUE;
-+}
-+
-+void LLAudioChannelOpenAL::update3DPosition(){
-+ if(!mCurrentSourcep){
-+ return;
-+ }
-+ if (mCurrentSourcep->isAmbient()){
-+ alSource3f(ALSource, AL_POSITION, 0.0, 0.0, 0.0);
-+ alSource3f(ALSource, AL_VELOCITY, 0.0, 0.0, 0.0);
-+ //alSource3f(ALSource, AL_DIRECTION, 0.0, 0.0, 0.0);
-+ alSourcef (ALSource, AL_ROLLOFF_FACTOR, 0.0);
-+ alSourcei (ALSource, AL_SOURCE_RELATIVE, AL_TRUE);
-+ }else{
-+ LLVector3 float_pos;
-+ float_pos.setVec(mCurrentSourcep->getPositionGlobal());
-+ alSourcefv(ALSource, AL_POSITION, float_pos.mV);
-+ //llinfos << "LLAudioChannelOpenAL::update3DPosition() Velocity: " << mCurrentSourcep->getVelocity() << llendl;
-+ alSourcefv(ALSource, AL_VELOCITY, mCurrentSourcep->getVelocity().mV);
-+ //alSource3f(ALSource, AL_DIRECTION, 0.0, 0.0, 0.0);
-+ alSourcef (ALSource, AL_ROLLOFF_FACTOR, 1.0);
-+ alSourcei (ALSource, AL_SOURCE_RELATIVE, AL_FALSE);
-+ }
-+ //llinfos << "LLAudioChannelOpenAL::update3DPosition() Gain: " << mCurrentSourcep->getGain() << llendl;
-+ alSourcef(ALSource, AL_GAIN, mCurrentSourcep->getGain());
-+}
-+
-+LLAudioBufferOpenAL::LLAudioBufferOpenAL(){
-+ ALBuffer = AL_NONE;
-+}
-+
-+LLAudioBufferOpenAL::~LLAudioBufferOpenAL(){
-+ cleanup();
-+}
-+
-+void LLAudioBufferOpenAL::cleanup(){
-+ if(ALBuffer != AL_NONE){
-+ alDeleteBuffers(1, &ALBuffer);
-+ }
-+}
-+
-+BOOL LLAudioBufferOpenAL::loadWAV(const std::string& filename){
-+ cleanup();
-+ ALBuffer = alutCreateBufferFromFile(filename.c_str());
-+ if(ALBuffer == AL_NONE){
-+ //ALenum error = alutGetError();
-+ //llwarns << "LLAudioBufferOpenAL::loadWAV() Error loading " << filename
-+ // << " " << alutGetErrorString(error) << llendl;
-+ return FALSE;
-+ }
-+
-+ return TRUE;
-+}
-+
-+U32 LLAudioBufferOpenAL::getLength(){
-+ if(ALBuffer == AL_NONE){
-+ return 0;
-+ }
-+ ALint length;
-+ alGetBufferi(ALBuffer, AL_SIZE, &length);
-+ return length >> 2;
-+}
-+
-+// ------------
-+
-+void LLAudioEngine_OpenAL::initWind(){
-+#if LL_OPENAL_WIND
-+ ALenum error;
-+ llinfos << "LLAudioEngine_OpenAL::initWind() start" << llendl;
-+
-+ alGetError(); /* clear error */
-+ alGenBuffers(NO_WIND_BUFFERS,wind_buffers);
-+ if((error=alGetError()) != AL_NO_ERROR)
-+ {
-+ llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind buffers: "<<error<<llendl;
-+ }
-+
-+ alGenSources(1,wind_sources);
-+
-+ if((error=alGetError()) != AL_NO_ERROR)
-+ {
-+ llwarns << "LLAudioEngine_OpenAL::initWind() Error creating wind sources: "<<error<<llendl;
-+ }
-+
-+ winddata=(S16*)malloc(sizeof(S16)*44100*0.2*2*2); //200ms @44100Hz Stereo
-+
-+ if(winddata==NULL)
-+ {
-+ llerrs << "LLAudioEngine_OpenAL::initWind() Error creating wind memory buffer" << llendl;
-+ mEnableWind=FALSE;
-+ }
-+
-+ llinfos << "LLAudioEngine_OpenAL::initWind() done" << llendl;
-+#endif
-+}
-+
-+void LLAudioEngine_OpenAL::cleanupWind(){
-+#if LL_OPENAL_WIND
-+ llinfos << "LLAudioEngine_OpenAL::cleanupWind()" << llendl;
-+
-+ alDeleteBuffers(NO_WIND_BUFFERS,wind_buffers);
-+
-+ alDeleteSources(1, wind_sources);
-+
-+ if(winddata)
-+ free(winddata);
-+#endif
-+}
-+
-+void LLAudioEngine_OpenAL::updateWind(LLVector3 wind_vec, F32 camera_altitude){
-+#if LL_OPENAL_WIND
-+ LLVector3 wind_pos;
-+ F64 pitch;
-+ F64 center_freq;
-+ ALenum error;
-+
-+ mMaxWindGain=1.0;
-+
-+ if (!mEnableWind)
-+ return;
-+
-+ if(!winddata)
-+ return;
-+
-+ if (mWindUpdateTimer.checkExpirationAndReset(LL_WIND_UPDATE_INTERVAL))
-+ {
-+
-+ // wind comes in as Linden coordinate (+X = forward, +Y = left, +Z = up)
-+ // need to convert this to the conventional orientation DS3D and OpenAL use
-+ // where +X = right, +Y = up, +Z = backwards
-+
-+ wind_vec.setVec(-wind_vec.mV[1], wind_vec.mV[2], -wind_vec.mV[0]);
-+
-+ // cerr << "Wind update" << endl;
-+
-+ pitch = 1.0 + mapWindVecToPitch(wind_vec);
-+ center_freq = 80.0 * pow(pitch,2.5*(mapWindVecToGain(wind_vec)+1.0));
-+
-+ gTargetFreq = (F32)center_freq;
-+ gTargetGain = (F32)mapWindVecToGain(wind_vec) * mMaxWindGain;
-+ gTargetPanGainR = (F32)mapWindVecToPan(wind_vec);
-+
-+ ALfloat source0Pos[]={mListenerp->getPosition().mV[0],mListenerp->getPosition().mV[1],mListenerp->getPosition().mV[2]};
-+
-+ alSourcef(wind_sources[0], AL_GAIN, gTargetGain);
-+ alSourcef(wind_sources[0], AL_PITCH, pitch);
-+ alSourcefv(wind_sources[0], AL_POSITION, source0Pos);
-+ alSourcefv(wind_sources[0], AL_VELOCITY, source0Vel);
-+ alSourcei(wind_sources[0], AL_LOOPING, AL_FALSE);
-+
-+ }
-+
-+ // ok lets make a wind buffer now
-+
-+ if(first_wind==TRUE)
-+ {
-+ llinfos << "LLAudioEngine_OpenAL::updateWind() making first buffer" << llendl;
-+ alGetError(); /* clear error */
-+
-+ for(int counter=0;counter<NO_WIND_BUFFERS;counter++)
-+ {
-+ alBufferData(wind_buffers[counter],AL_FORMAT_STEREO16,windDSP((void*)winddata,2*44100*0.02),2*44100*0.02*sizeof(U16),44100);
-+ if((error=alGetError()) != AL_NO_ERROR)
-+ {
-+ llwarns << "LLAudioEngine_OpenAL::initWind() Error creating INITAL WIND BUFFER 1: "<<error<<llendl;
-+ }
-+ }
-+
-+ alSourceQueueBuffers(wind_sources[0], NO_WIND_BUFFERS, wind_buffers);
-+
-+ alSourcePlay(wind_sources[0]);
-+ if((error=alGetError()) != AL_NO_ERROR)
-+ {
-+ llwarns << "LLAudioEngine_OpenAL::initWind() Error inital wind play: "<<error<<llendl;
-+ }
-+
-+ first_wind=FALSE;
-+ llinfos << "LLAudioEngine_OpenAL::updateWind() making first buffer DONE!" << llendl;
-+
-+ }
-+ else
-+ {
-+ int processed;
-+ alGetSourcei(wind_sources[0], AL_BUFFERS_PROCESSED, &processed);
-+
-+ while(processed--)
-+ {
-+ ALuint buffer;
-+ int error;
-+ alSourceUnqueueBuffers(wind_sources[0], 1, &buffer);
-+ error = alGetError();
-+ if(error != AL_NO_ERROR)
-+ llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping buffers" << llendl;
-+
-+ alBufferData(buffer,AL_FORMAT_STEREO16,windDSP((void*)winddata,44100*0.2),2*44100*0.2*sizeof(U16),44100);
-+ error = alGetError();
-+ if(error != AL_NO_ERROR)
-+ llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping buffers" << llendl;
-+
-+
-+ alSourceQueueBuffers(wind_sources[0], 1, &buffer);
-+ error = alGetError();
-+ if(error != AL_NO_ERROR)
-+ llwarns << "LLAudioEngine_OpenAL::updateWind() error swapping buffers" << llendl;
-+
-+
-+ }
-+
-+ int playing;
-+ alGetSourcei(wind_sources[0], AL_SOURCE_STATE, &playing);
-+
-+ if(playing==AL_STOPPED)
-+ alSourcePlay(wind_sources[0]);
-+
-+ }
-+#endif //LL_OPENAL_WIND
-+}
-+
-+inline S16 clipSample(S16 sample, S16 min, S16 max)
-+{
-+#if LL_OPENAL_WIND
-+ if (sample > max)
-+ sample = max;
-+ else if (sample < min)
-+ sample = min;
-+
-+#endif
-+ return sample;
-+}
-+
-+void * LLAudioEngine_OpenAL::windDSP(void *newbuffer, int length)
-+{
-+#if LL_OPENAL_WIND
-+ // newbuffer = the buffer passed from the previous DSP unit.
-+ // length = length in samples at this mix time.
-+
-+ U8 *cursamplep = (U8*)newbuffer;
-+ U8 wordsize = 2;
-+
-+ double bandwidth = 50;
-+ double inputSamplingRate = 44100;
-+ double a0,b1,b2;
-+
-+ // calculate resonant filter coeffs
-+ b2 = exp(-(F_TWO_PI) * (bandwidth / inputSamplingRate));
-+
-+ while (length--)
-+ {
-+ gCurrentFreq = (float)((0.999 * gCurrentFreq) + (0.001 * gTargetFreq));
-+ gCurrentGain = (float)((0.999 * gCurrentGain) + (0.001 * gTargetGain));
-+ gCurrentPanGainR = (float)((0.999 * gCurrentPanGainR) + (0.001 * gTargetPanGainR));
-+ b1 = (-4.0 * b2) / (1.0 + b2) * cos(F_TWO_PI * (gCurrentFreq / inputSamplingRate));
-+ a0 = (1.0 - b2) * sqrt(1.0 - (b1 * b1) / (4.0 * b2));
-+ double nextSample;
-+
-+ // start with white noise
-+ nextSample = ll_frand(2.0f) - 1.0f;
-+
-+#if 1 // LLAE_WIND_PINK apply pinking filter
-+ gbuf0 = 0.997f * gbuf0 + 0.0126502f * nextSample;
-+ gbuf1 = 0.985f * gbuf1 + 0.0139083f * nextSample;
-+ gbuf2 = 0.950f * gbuf2 + 0.0205439f * nextSample;
-+ gbuf3 = 0.850f * gbuf3 + 0.0387225f * nextSample;
-+ gbuf4 = 0.620f * gbuf4 + 0.0465932f * nextSample;
-+ gbuf5 = 0.250f * gbuf5 + 0.1093477f * nextSample;
-+
-+ nextSample = gbuf0 + gbuf1 + gbuf2 + gbuf3 + gbuf4 + gbuf5;
-+#endif
-+
-+#if 1 //LLAE_WIND_RESONANT // do a resonant filter on the noise
-+ nextSample = (double)( a0 * nextSample - b1 * gY0 - b2 * gY1 );
-+
-+ gY1 = gY0;
-+ gY0 = nextSample;
-+#endif
-+ nextSample *= gCurrentGain;
-+
-+ S16 sample;
-+
-+ sample = llfloor(((F32)nextSample*32768.f*(1.0f - gCurrentPanGainR))+0.5f);
-+ *(S16*)cursamplep = clipSample(sample, -32768, 32767);
-+
-+ cursamplep += wordsize;
-+
-+ sample = llfloor(((F32)nextSample*32768.f*gCurrentPanGainR)+0.5f);
-+
-+ sample = llfloor(((F32)nextSample*32768.f*gCurrentPanGainR)+0.5f);
-+ *(S16*)cursamplep = clipSample(sample, -32768, 32767);
-+ cursamplep += wordsize;
-+ }
-+
-+#endif //LL_OPENAL_WIND
-+ return newbuffer;
-+}
-+
-+// ------------
-+
-+void LLAudioEngine_OpenAL::InitStreamer()
-+{
-+#if LL_GSTREAMER_ENABLED
-+ m_streamer=new LLMediaImplGStreamer ();
-+
-+ if(!m_streamer)
-+ {
-+ llwarns << "LLAudioEngine_OpenAL::LLAudioEngine_OpenAL() Failed to create our private gstreamer audio instance" << llendl;
-+ }
-+
-+ if(m_streamer)
-+ {
-+ m_streamer->init ();
-+ }
-+#endif
-+}
-+
-+// ------------
-+
-+void LLAudioEngine_OpenAL::initInternetStream(){
-+ if(!mInternetStreamURL.empty())
-+ mInternetStreamURL.erase();
-+}
-+
-+void LLAudioEngine_OpenAL::startInternetStream(const std::string& url){
-+
-+#if LL_GSTREAMER_ENABLED
-+ if(!m_streamer)
-+ return;
-+// DCF_DEBUG
-+llinfos << "entered LLAudioEngine_OpenAL::startInternetStream()" << llendl;
-+
-+
-+ if (!url.empty()) {
-+ llinfos << "LLAudioEngine_OpenAL::startInternetStream() Starting internet stream: " << url << llendl;
-+ mInternetStreamURL=url;
-+ m_streamer->navigateTo ( url );
-+ llinfos << "Playing....." << llendl;
-+ m_streamer->addCommand(LLMediaBase::COMMAND_START);
-+ m_streamer->updateMedia();
-+
-+ }else{
-+ llinfos << "LLAudioEngine_OpenAL setting stream to NULL"<< llendl;
-+ mInternetStreamURL.erase();
-+ m_streamer->addCommand(LLMediaBase::COMMAND_STOP);
-+ m_streamer->updateMedia();
-+ }
-+#endif
-+}
-+
-+void LLAudioEngine_OpenAL::updateInternetStream(){
-+// DCF_DEBUG
-+llinfos << "entered LLAudioEngine_OpenAL::updateInternetStream()" << llendl;
-+
-+}
-+
-+void LLAudioEngine_OpenAL::stopInternetStream(){
-+// DCF_DEBUG
-+llinfos << "entered LLAudioEngine_OpenAL::stopInternetStream()" << llendl;
-+
-+#if LL_GSTREAMER_ENABLED
-+ if( ! m_streamer->addCommand(LLMediaBase::COMMAND_STOP)){
-+ llinfos << "attempting to stop stream failed!" << llendl;
-+ }
-+ m_streamer->updateMedia();
-+#endif
-+ mInternetStreamURL.erase();
-+}
-+
-+void LLAudioEngine_OpenAL::pauseInternetStream(int pause){
-+#if LL_GSTREAMER_ENABLED
-+ if(!m_streamer)
-+ return;
-+// DCF_DEBUG
-+llinfos << "entered LLAudioEngine_OpenAL::pauseInternetStream()" << llendl;
-+
-+ if(pause){
-+ if(!m_streamer->addCommand(LLMediaBase::COMMAND_PAUSE)){
-+ llinfos << "attempting to pause stream failed!" << llendl;
-+ }
-+ m_streamer->updateMedia();
-+ }else{
-+ if( ! m_streamer->addCommand(LLMediaBase::COMMAND_START)){
-+ llinfos << "attempting to pause stream failed!" << llendl;
-+ }
-+ m_streamer->updateMedia();
-+ }
-+#endif
-+}
-+
-+int LLAudioEngine_OpenAL::isInternetStreamPlaying(){
-+
-+#if LL_GSTREAMER_ENABLED
-+ if(!m_streamer)
-+ return 0;
-+
-+ if(m_streamer->getStatus() == LLMediaBase::STATUS_STARTED)
-+ {
-+ return 1; // Active and playing
-+ }
-+
-+ if(m_streamer->getStatus() == LLMediaBase::STATUS_PAUSED)
-+ {
-+ return 2; // paused
-+ }
-+#endif
-+ return 0; // Stopped
-+}
-+
-+void LLAudioEngine_OpenAL::getInternetStreamInfo(char* artist_out, char* title_out){
-+}
-+
-+void LLAudioEngine_OpenAL::setInternetStreamGain(F32 vol){
-+#if LL_GSTREAMER_ENABLED
-+ // Set the gstreamer volume here
-+ if(!m_streamer)
-+ return;
-+
-+ vol = llclamp(vol, 0.f, 1.f);
-+ m_streamer->setVolume(vol);
-+ m_streamer->updateMedia();
-+
-+#endif
-+}
-+
-+const std::string& LLAudioEngine_OpenAL::getInternetStreamURL(){
-+ return mInternetStreamURL;
-+}
-+
-diff --git a/indra/llaudio/audioengine_openal.h b/indra/llaudio/audioengine_openal.h
-new file mode 100644
-index 0000000..604e8eb
---- /dev/null
-+++ b/indra/llaudio/audioengine_openal.h
-@@ -0,0 +1,123 @@
-+/**
-+ * @file audioengine_openal.cpp
-+ * @brief implementation of audio engine using OpenAL
-+ * support as a OpenAL 3D implementation
-+ *
-+ * Copyright (c) 2002-2008, Linden Research, Inc.
-+ *
-+ * Second Life Viewer Source Code
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlife.com/developers/opensource/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlife.com/developers/opensource/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ */
-+
-+
-+#ifndef LL_AUDIOENGINE_OpenAL_H
-+#define LL_AUDIOENGINE_OpenAL_H
-+
-+#undef XMLCALL
-+
-+#include <string>
-+
-+#include "audioengine.h"
-+#include "listener_openal.h"
-+
-+
-+#if LL_GSTREAMER_ENABLED
-+#include "llmediamanager.h"
-+#include "llmediaimplgstreamer.h"
-+#endif
-+
-+#include "llrand.h"
-+
-+class LLAudioEngine_OpenAL : public LLAudioEngine{
-+ public:
-+ LLAudioEngine_OpenAL();
-+ virtual ~LLAudioEngine_OpenAL();
-+
-+ virtual BOOL init(const S32 num_channels, void *user_data);
-+ virtual void allocateListener();
-+
-+ virtual void shutdown();
-+
-+ virtual void idle(F32 max_decode_time = 0.f);
-+
-+ void setInternalGain(F32 gain);
-+
-+ LLAudioBuffer* createBuffer();
-+ LLAudioChannel* createChannel();
-+
-+ // Internet stream methods
-+ virtual void initInternetStream();
-+ virtual void startInternetStream(const std::string& url);
-+ virtual void stopInternetStream();
-+ virtual void updateInternetStream();
-+ virtual void pauseInternetStream(int pause);
-+ virtual int isInternetStreamPlaying();
-+ virtual void getInternetStreamInfo(char* artist, char* title);
-+ virtual void setInternetStreamGain(F32 vol);
-+ virtual const std::string& getInternetStreamURL();
-+ virtual void InitStreamer();
-+
-+ void initWind();
-+ void cleanupWind();
-+ void updateWind(LLVector3 direction, F32 camera_altitude);
-+
-+ protected:
-+ std::string mInternetStreamURL;
-+ void * windDSP(void *newbuffer, int length);
-+#if LL_GSTREAMER_ENABLED
-+ LLMediaManagerData * mMedia_data;
-+ LLMediaImplGStreamer * m_streamer;
-+#endif
-+};
-+
-+class LLAudioChannelOpenAL : public LLAudioChannel{
-+ public:
-+ LLAudioChannelOpenAL();
-+ virtual ~LLAudioChannelOpenAL();
-+ protected:
-+ void play();
-+ void playSynced(LLAudioChannel *channelp);
-+ void cleanup();
-+ BOOL isPlaying();
-+
-+ BOOL updateBuffer();
-+ void update3DPosition();
-+ void updateLoop(){};
-+
-+ ALuint ALSource;
-+};
-+
-+class LLAudioBufferOpenAL : public LLAudioBuffer{
-+ public:
-+ LLAudioBufferOpenAL();
-+ virtual ~LLAudioBufferOpenAL();
-+
-+ BOOL loadWAV(const std::string& filename);
-+ U32 getLength();
-+
-+ friend class LLAudioChannelOpenAL;
-+ protected:
-+ void cleanup();
-+ ALuint getBuffer(){return ALBuffer;}
-+ ALuint ALBuffer;
-+};
-+
-+#endif
-diff --git a/indra/llaudio/listener_openal.cpp b/indra/llaudio/listener_openal.cpp
-new file mode 100644
-index 0000000..e4c6f64
---- /dev/null
-+++ b/indra/llaudio/listener_openal.cpp
-@@ -0,0 +1,95 @@
-+/**
-+ * @file audioengine_openal.cpp
-+ * @brief implementation of audio engine using OpenAL
-+ * support as a OpenAL 3D implementation
-+ *
-+ * Copyright (c) 2002-2007, Linden Research, Inc.
-+ *
-+ * Second Life Viewer Source Code
-+ * The source code in this file ("Source Code") is provided by Linden Lab
-+ * to you under the terms of the GNU General Public License, version 2.0
-+ * ("GPL"), unless you have obtained a separate licensing agreement
-+ * ("Other License"), formally executed by you and Linden Lab. Terms of
-+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
-+ * online at http://secondlife.com/developers/opensource/gplv2
-+ *
-+ * There are special exceptions to the terms and conditions of the GPL as
-+ * it is applied to this Source Code. View the full text of the exception
-+ * in the file doc/FLOSS-exception.txt in this software distribution, or
-+ * online at http://secondlife.com/developers/opensource/flossexception
-+ *
-+ * By copying, modifying or distributing this software, you acknowledge
-+ * that you have read and understood your obligations described above,
-+ * and agree to abide by those obligations.
-+ *
-+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-+ * COMPLETENESS OR PERFORMANCE.
-+ */
-+
-+#include "linden_common.h"
-+#include "audioengine.h"
-+
-+#include "listener_openal.h"
-+
-+LLListener_OpenAL::LLListener_OpenAL(){
-+ init();
-+}
-+
-+LLListener_OpenAL::~LLListener_OpenAL(){
-+}
-+
-+void LLListener_OpenAL::translate(LLVector3 offset){
-+ LLListener::translate(offset);
-+ llinfos << "LLListener_OpenAL::translate() : " << offset << llendl;
-+}
-+
-+void LLListener_OpenAL::setPosition(LLVector3 pos){
-+ LLListener::setPosition(pos);
-+ //llinfos << "LLListener_OpenAL::setPosition() : " << pos << llendl;
-+}
-+
-+void LLListener_OpenAL::setVelocity(LLVector3 vel){
-+ LLListener::setVelocity(vel);
-+}
-+
-+void LLListener_OpenAL::orient(LLVector3 up, LLVector3 at){
-+ LLListener::orient(up, at);
-+ //llinfos << "LLListener_OpenAL::orient() up: " << up << " at: " << at << llendl;
-+}
-+
-+void LLListener_OpenAL::commitDeferredChanges(){
-+ ALfloat orientation[6];
-+ orientation[0] = mListenAt.mV[0];
-+ orientation[1] = mListenAt.mV[1];
-+ orientation[2] = mListenAt.mV[2];
-+ orientation[3] = mListenUp.mV[0];
-+ orientation[4] = mListenUp.mV[1];
-+ orientation[5] = mListenUp.mV[2];
-+
-+ // Why is this backwards?
-+ ALfloat velocity[3];
-+ velocity[0] = -mVelocity.mV[0];
-+ velocity[1] = -mVelocity.mV[1];
-+ velocity[2] = -mVelocity.mV[2];
-+
-+ alListenerfv(AL_ORIENTATION, orientation);
-+ alListenerfv(AL_POSITION, mPosition.mV);
-+ alListenerfv(AL_VELOCITY, velocity);
-+}
-+
-+void LLListener_OpenAL::setDopplerFactor(F32 factor){
-+ // Effect is way too strong by default, scale it down here.
-+ // Scaling the speed of sound up causes crashes.
-+ factor *= 0.01f;
-+ //llinfos << "LLListener_OpenAL::setDopplerFactor() : " << factor << llendl;
-+ alDopplerFactor(factor);
-+}
-+
-+F32 LLListener_OpenAL::getDopplerFactor(){
-+ ALfloat factor=0;
-+ alDopplerFactor(factor);
-+ llinfos << "LLListener_OpenAL::getDopplerFactor() : " << factor << llendl;
-+ return factor;
-+}
-+
-diff --git a/indra/llaudio/listener_openal.h b/indra/llaudio/listener_openal.h
-index cc4bb9e..0a8bb6f 100644
---- a/indra/llaudio/listener_openal.h
-+++ b/indra/llaudio/listener_openal.h
-@@ -54,6 +54,10 @@ class LLListener_OpenAL : public LLListener
- virtual void setPosition(LLVector3 pos);
- virtual void setVelocity(LLVector3 vel);
- virtual void orient(LLVector3 up, LLVector3 at);
-+ virtual void commitDeferredChanges();
-+
-+ virtual void setDopplerFactor(F32 factor);
-+ virtual F32 getDopplerFactor();
- };
-
- #endif
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..f1a2e02 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -9,6 +9,7 @@ include(DBusGlib)
- include(DirectX)
- include(ELFIO)
- include(FMOD)
-+include(OPENAL)
- include(FindOpenGL)
- include(LLAudio)
- include(LLCharacter)
-@@ -57,6 +58,7 @@ include_directories(
- ${LLXML_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}
- ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
-+ ${GSTREAMER_INCLUDE_DIRS}
- )
-
- set(viewer_SOURCE_FILES
-@@ -1246,6 +1248,10 @@ set_source_files_properties(${viewer_CHARACTER_FILES}
-
- list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
-
-+if (OPENAL)
-+ set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS -DLL_OPENAL)
-+endif (OPENAL)
-+
- if (WINDOWS)
- file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi)
-
-diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
-index 2ce111f..2a5c5ff 100644
---- a/indra/newview/llstartup.cpp
-+++ b/indra/newview/llstartup.cpp
-@@ -17,7 +17,7 @@
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
-- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
-+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexceptionOP
- *
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
-@@ -45,6 +45,10 @@
- # include "audioengine_fmod.h"
- #endif
-
-+#ifdef LL_OPENAL
-+#include "audioengine_openal.h"
-+#endif
-+
- #include "llares.h"
- #include "llcachename.h"
- #include "llviewercontrol.h"
-@@ -581,10 +585,14 @@ bool idle_startup()
-
- if (FALSE == gSavedSettings.getBOOL("NoAudio"))
- {
-+ gAudiop = NULL;
-+
- #ifdef LL_FMOD
- gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
--#else
-- gAudiop = NULL;
-+#endif
-+
-+#ifdef LL_OPENAL
-+ gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
- #endif
-
- if (gAudiop)
---
-tg: (c8fb40a..) topic/features/jira-sent/openal_1.21.0 (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-backported/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION.diff b/debian/patches/topic/fixes/jira-backported/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION.diff
deleted file mode 100644
index 9f8ad30..0000000
--- a/debian/patches/topic/fixes/jira-backported/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-backported/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION
-
-Apply correct tooltips for script editing, adding some missing defines
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/lscript/lscript_library/lscript_library.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp
-index 505b123..41ed444 100644
---- a/indra/lscript/lscript_library/lscript_library.cpp
-+++ b/indra/lscript/lscript_library/lscript_library.cpp
-@@ -221,7 +221,7 @@ void LLScriptLibrary::init()
- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llBreakAllLinks", NULL, NULL, "llBreakAllLinks()\nDelinks all tasks in the link set (requires permission PERMISSION_CHANGE_LINKS be set)"));
- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetLinkKey", "k", "i", "key llGetLinkKey(integer linknum)\nGet the key of linknumber in link set"));
- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetLinkName", "s", "i", "string llGetLinkName(integer linknum)\nGet the name of linknumber in link set"));
-- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetInventoryNumber", "i", "i", "integer llGetInventoryNumber(integer type)\nGet the number of items of a given type in the task's inventory.\nValid types: INVENTORY_TEXTURE, INVENTORY_SOUND, INVENTORY_OBJECT, INVENTORY_SCRIPT, INVENTORY_CLOTHING, INVENTORY_BODYPART, INVENTORY_NOTECARD, INVENTORY_LANDMARK, INVENTORY_ALL"));
-+ addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetInventoryNumber", "i", "i", "integer llGetInventoryNumber(integer type)\nGet the number of items of a given type in the task's inventory.\nValid types: INVENTORY_TEXTURE, INVENTORY_SOUND, INVENTORY_OBJECT, INVENTORY_SCRIPT, INVENTORY_CLOTHING, INVENTORY_BODYPART, INVENTORY_NOTECARD, INVENTORY_LANDMARK, INVENTORY_ANIMATION, INVENTORY_GESTURE, INVENTORY_ALL"));
- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetInventoryName", "s", "ii", "string llGetInventoryName(integer type, integer number)\nGet the name of the inventory item number of type"));
- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetScriptState", NULL, "si", "llSetScriptState(string name, integer run)\nControl the state of a script name."));
- addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetEnergy", "f", NULL, "float llGetEnergy()\nReturns how much energy is in the object as a percentage of maximum"));
---
-tg: (c8fb40a..) topic/fixes/jira-backported/VWR-3766_llGetInventoryNumber_tooltip_missing_INVENTORY_ANIMATION (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-backported/VWR5717_text_not_replaced_by_input_with_japanses_im.diff b/debian/patches/topic/fixes/jira-backported/VWR5717_text_not_replaced_by_input_with_japanses_im.diff
deleted file mode 100644
index 5d324dc..0000000
--- a/debian/patches/topic/fixes/jira-backported/VWR5717_text_not_replaced_by_input_with_japanses_im.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-backported/VWR5717_text_not_replaced_by_input_with_japanses_im
-
-Fix to allow Japanese input, taken from VWR-5717
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llui/lllineeditor.cpp | 12 +++++++++---
- indra/llui/lltexteditor.cpp | 12 +++++++++---
- 2 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
-index a0af463..9f543e8 100644
---- a/indra/llui/lllineeditor.cpp
-+++ b/indra/llui/lllineeditor.cpp
-@@ -2370,14 +2370,20 @@ BOOL LLLineEditor::hasPreeditString() const
-
- void LLLineEditor::resetPreedit()
- {
-- if (hasPreeditString())
-+ if (hasSelection())
- {
-- if (hasSelection())
-+ if (hasPreeditString())
- {
- llwarns << "Preedit and selection!" << llendl;
- deselect();
- }
--
-+ else
-+ {
-+ deleteSelection();
-+ }
-+ }
-+ if (hasPreeditString())
-+ {
- const S32 preedit_pos = mPreeditPositions.front();
- mText.erase(preedit_pos, mPreeditPositions.back() - preedit_pos);
- mText.insert(preedit_pos, mPreeditOverwrittenWString);
-diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
-index 4b0acf8..847545f 100644
---- a/indra/llui/lltexteditor.cpp
-+++ b/indra/llui/lltexteditor.cpp
-@@ -4410,14 +4410,20 @@ BOOL LLTextEditor::hasPreeditString() const
-
- void LLTextEditor::resetPreedit()
- {
-- if (hasPreeditString())
-+ if (hasSelection())
- {
-- if (hasSelection())
-+ if (hasPreeditString())
- {
- llwarns << "Preedit and selection!" << llendl;
- deselect();
- }
--
-+ else
-+ {
-+ deleteSelection(FALSE);
-+ }
-+ }
-+ if (hasPreeditString())
-+ {
- mCursorPos = mPreeditPositions.front();
- removeStringNoUndo(mCursorPos, mPreeditPositions.back() - mCursorPos);
- insertStringNoUndo(mCursorPos, mPreeditOverwrittenWString);
---
-tg: (c8fb40a..) topic/fixes/jira-backported/VWR5717_text_not_replaced_by_input_with_japanses_im (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-backported/glh_linear.diff b/debian/patches/topic/fixes/jira-backported/glh_linear.diff
deleted file mode 100644
index 8f5eef0..0000000
--- a/debian/patches/topic/fixes/jira-backported/glh_linear.diff
+++ /dev/null
@@ -1,1640 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/fixes/jira-backported/glh_linear
-
-Adds the missing glh_linear.h header.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/llwindow/glh/glh_linear.h | 1621 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1621 insertions(+), 0 deletions(-)
-
-diff --git a/indra/llwindow/glh/glh_linear.h b/indra/llwindow/glh/glh_linear.h
-new file mode 100644
-index 0000000..04ae1bd
---- /dev/null
-+++ b/indra/llwindow/glh/glh_linear.h
-@@ -0,0 +1,1621 @@
-+/*
-+ glh - is a platform-indepenedent C++ OpenGL helper library
-+
-+
-+ Copyright (c) 2000 Cass Everitt
-+ Copyright (c) 2000 NVIDIA Corporation
-+ All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or
-+ without modification, are permitted provided that the following
-+ conditions are met:
-+
-+ * Redistributions of source code must retain the above
-+ copyright notice, this list of conditions and the following
-+ disclaimer.
-+
-+ * Redistributions in binary form must reproduce the above
-+ copyright notice, this list of conditions and the following
-+ disclaimer in the documentation and/or other materials
-+ provided with the distribution.
-+
-+ * The names of contributors to this software may not be used
-+ to endorse or promote products derived from this software
-+ without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+ Cass Everitt - cass at r3.nu
-+*/
-+
-+/*
-+glh_linear.h
-+*/
-+
-+// Author: Cass W. Everitt
-+
-+#ifndef GLH_LINEAR_H
-+#define GLH_LINEAR_H
-+
-+#include <memory.h>
-+#include <math.h>
-+#include <assert.h>
-+
-+// only supports float for now...
-+#define GLH_REAL_IS_FLOAT
-+
-+#ifdef GLH_REAL_IS_FLOAT
-+# define GLH_REAL float
-+# define GLH_REAL_NAMESPACE ns_float
-+#endif
-+
-+#define GLH_QUATERNION_NORMALIZATION_THRESHOLD 64
-+
-+#define GLH_RAD_TO_DEG GLH_REAL(57.2957795130823208767981548141052)
-+#define GLH_DEG_TO_RAD GLH_REAL(0.0174532925199432957692369076848861)
-+#define GLH_ZERO GLH_REAL(0.0)
-+#define GLH_ONE GLH_REAL(1.0)
-+#define GLH_TWO GLH_REAL(2.0)
-+#define GLH_EPSILON GLH_REAL(10e-6)
-+#define GLH_PI GLH_REAL(3.1415926535897932384626433832795)
-+
-+#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
-+
-+namespace glh
-+{
-+
-+ inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
-+ inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }
-+
-+ // forward declarations for friend template functions.
-+ template <int N, class T> class vec;
-+
-+ // forward declarations for friend template functions.
-+ template <int N, class T>
-+ bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 );
-+
-+ // forward declarations for friend template functions.
-+ template <int N, class T>
-+ bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 );
-+
-+ template <int N, class T>
-+ class vec
-+ {
-+ public:
-+ int size() const { return N; }
-+
-+ vec(const T & t = T())
-+ { for(int i = 0; i < N; i++) v[i] = t; }
-+ vec(const T * tp)
-+ { for(int i = 0; i < N; i++) v[i] = tp[i]; }
-+
-+ const T * get_value() const
-+ { return v; }
-+
-+
-+ T dot( const vec<N,T> & rhs ) const
-+ {
-+ T r = 0;
-+ for(int i = 0; i < N; i++) r += v[i]*rhs.v[i];
-+ return r;
-+ }
-+
-+ T length() const
-+ {
-+ T r = 0;
-+ for(int i = 0; i < N; i++) r += v[i]*v[i];
-+ return T(sqrt(r));
-+ }
-+
-+ T square_norm() const
-+ {
-+ T r = 0;
-+ for(int i = 0; i < N; i++) r += v[i]*v[i];
-+ return r;
-+ }
-+
-+ void negate()
-+ { for(int i = 0; i < N; i++) v[i] = -v[i]; }
-+
-+
-+ T normalize()
-+ {
-+ T sum(0);
-+ for(int i = 0; i < N; i++)
-+ sum += v[i]*v[i];
-+ sum = T(sqrt(sum));
-+ if (sum > GLH_EPSILON)
-+ for(int i = 0; i < N; i++)
-+ v[i] /= sum;
-+ return sum;
-+ }
-+
-+
-+ vec<N,T> & set_value( const T * rhs )
-+ { for(int i = 0; i < N; i++) v[i] = rhs[i]; return *this; }
-+
-+ T & operator [] ( int i )
-+ { return v[i]; }
-+
-+ const T & operator [] ( int i ) const
-+ { return v[i]; }
-+
-+ vec<N,T> & operator *= ( T d )
-+ { for(int i = 0; i < N; i++) v[i] *= d; return *this;}
-+
-+ vec<N,T> & operator *= ( const vec<N,T> & u )
-+ { for(int i = 0; i < N; i++) v[i] *= u[i]; return *this;}
-+
-+ vec<N,T> & operator /= ( T d )
-+ { if(d == 0) return *this; for(int i = 0; i < N; i++) v[i] /= d; return *this;}
-+
-+ vec<N,T> & operator += ( const vec<N,T> & u )
-+ { for(int i = 0; i < N; i++) v[i] += u.v[i]; return *this;}
-+
-+ vec<N,T> & operator -= ( const vec<N,T> & u )
-+ { for(int i = 0; i < N; i++) v[i] -= u.v[i]; return *this;}
-+
-+
-+ vec<N,T> operator - () const
-+ { vec<N,T> rv = v; rv.negate(); return rv; }
-+
-+ vec<N,T> operator + ( const vec<N,T> &v) const
-+ { vec<N,T> rt(*this); return rt += v; }
-+
-+ vec<N,T> operator - ( const vec<N,T> &v) const
-+ { vec<N,T> rt(*this); return rt -= v; }
-+
-+ vec<N,T> operator * ( T d) const
-+ { vec<N,T> rt(*this); return rt *= d; }
-+
-+ friend bool operator == <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-+ friend bool operator != <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-+
-+
-+ //protected:
-+ T v[N];
-+ };
-+
-+
-+
-+ // vector friend operators
-+
-+ template <int N, class T> inline
-+ vec<N,T> operator * ( const vec<N,T> & b, T d )
-+ {
-+ vec<N,T> rt(b);
-+ return rt *= d;
-+ }
-+
-+ template <int N, class T> inline
-+ vec<N,T> operator * ( T d, const vec<N,T> & b )
-+ { return b*d; }
-+
-+ template <int N, class T> inline
-+ vec<N,T> operator * ( const vec<N,T> & b, const vec<N,T> & d )
-+ {
-+ vec<N,T> rt(b);
-+ return rt *= d;
-+ }
-+
-+ template <int N, class T> inline
-+ vec<N,T> operator / ( const vec<N,T> & b, T d )
-+ { vec<N,T> rt(b); return rt /= d; }
-+
-+ template <int N, class T> inline
-+ vec<N,T> operator + ( const vec<N,T> & v1, const vec<N,T> & v2 )
-+ { vec<N,T> rt(v1); return rt += v2; }
-+
-+ template <int N, class T> inline
-+ vec<N,T> operator - ( const vec<N,T> & v1, const vec<N,T> & v2 )
-+ { vec<N,T> rt(v1); return rt -= v2; }
-+
-+
-+ template <int N, class T> inline
-+ bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 )
-+ {
-+ for(int i = 0; i < N; i++)
-+ if(v1.v[i] != v2.v[i])
-+ return false;
-+ return true;
-+ }
-+
-+ template <int N, class T> inline
-+ bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 )
-+ { return !(v1 == v2); }
-+
-+
-+ typedef vec<3,unsigned char> vec3ub;
-+ typedef vec<4,unsigned char> vec4ub;
-+
-+
-+
-+
-+
-+ namespace GLH_REAL_NAMESPACE
-+ {
-+ typedef GLH_REAL real;
-+
-+ class line;
-+ class plane;
-+ class matrix4;
-+ class quaternion;
-+ typedef quaternion rotation;
-+
-+ class vec2 : public vec<2,real>
-+ {
-+ public:
-+ vec2(const real & t = real()) : vec<2,real>(t)
-+ {}
-+ vec2(const vec<2,real> & t) : vec<2,real>(t)
-+ {}
-+ vec2(const real * tp) : vec<2,real>(tp)
-+ {}
-+
-+ vec2(real x, real y )
-+ { v[0] = x; v[1] = y; }
-+
-+ void get_value(real & x, real & y) const
-+ { x = v[0]; y = v[1]; }
-+
-+ vec2 & set_value( const real & x, const real & y)
-+ { v[0] = x; v[1] = y; return *this; }
-+
-+ };
-+
-+
-+ class vec3 : public vec<3,real>
-+ {
-+ public:
-+ vec3(const real & t = real()) : vec<3,real>(t)
-+ {}
-+ vec3(const vec<3,real> & t) : vec<3,real>(t)
-+ {}
-+ vec3(const real * tp) : vec<3,real>(tp)
-+ {}
-+
-+ vec3(real x, real y, real z)
-+ { v[0] = x; v[1] = y; v[2] = z; }
-+
-+ void get_value(real & x, real & y, real & z) const
-+ { x = v[0]; y = v[1]; z = v[2]; }
-+
-+ vec3 cross( const vec3 &rhs ) const
-+ {
-+ vec3 rt;
-+ rt.v[0] = v[1]*rhs.v[2]-v[2]*rhs.v[1];
-+ rt.v[1] = v[2]*rhs.v[0]-v[0]*rhs.v[2];
-+ rt.v[2] = v[0]*rhs.v[1]-v[1]*rhs.v[0];
-+ return rt;
-+ }
-+
-+ vec3 & set_value( const real & x, const real & y, const real & z)
-+ { v[0] = x; v[1] = y; v[2] = z; return *this; }
-+
-+ };
-+
-+
-+ class vec4 : public vec<4,real>
-+ {
-+ public:
-+ vec4(const real & t = real()) : vec<4,real>(t)
-+ {}
-+ vec4(const vec<4,real> & t) : vec<4,real>(t)
-+ {}
-+
-+ vec4(const vec<3,real> & t, real fourth)
-+
-+ { v[0] = t.v[0]; v[1] = t.v[1]; v[2] = t.v[2]; v[3] = fourth; }
-+ vec4(const real * tp) : vec<4,real>(tp)
-+ {}
-+ vec4(real x, real y, real z, real w)
-+ { v[0] = x; v[1] = y; v[2] = z; v[3] = w; }
-+
-+ void get_value(real & x, real & y, real & z, real & w) const
-+ { x = v[0]; y = v[1]; z = v[2]; w = v[3]; }
-+
-+ vec4 & set_value( const real & x, const real & y, const real & z, const real & w)
-+ { v[0] = x; v[1] = y; v[2] = z; v[3] = w; return *this; }
-+ };
-+
-+ inline
-+ vec3 homogenize(const vec4 & v)
-+ {
-+ vec3 rt;
-+ assert(v.v[3] != GLH_ZERO);
-+ rt.v[0] = v.v[0]/v.v[3];
-+ rt.v[1] = v.v[1]/v.v[3];
-+ rt.v[2] = v.v[2]/v.v[3];
-+ return rt;
-+ }
-+
-+
-+
-+ class line
-+ {
-+ public:
-+
-+ line()
-+ { set_value(vec3(0,0,0),vec3(0,0,1)); }
-+
-+ line( const vec3 & p0, const vec3 &p1)
-+ { set_value(p0,p1); }
-+
-+ void set_value( const vec3 &p0, const vec3 &p1)
-+ {
-+ position = p0;
-+ direction = p1-p0;
-+ direction.normalize();
-+ }
-+
-+ bool get_closest_points(const line &line2,
-+ vec3 &pointOnThis,
-+ vec3 &pointOnThat)
-+ {
-+
-+ // quick check to see if parallel -- if so, quit.
-+ if(fabs(direction.dot(line2.direction)) == 1.0)
-+ return 0;
-+ line l2 = line2;
-+
-+ // Algorithm: Brian Jean
-+ //
-+ register real u;
-+ register real v;
-+ vec3 Vr = direction;
-+ vec3 Vs = l2.direction;
-+ register real Vr_Dot_Vs = Vr.dot(Vs);
-+ register real detA = real(1.0 - (Vr_Dot_Vs * Vr_Dot_Vs));
-+ vec3 C = l2.position - position;
-+ register real C_Dot_Vr = C.dot(Vr);
-+ register real C_Dot_Vs = C.dot(Vs);
-+
-+ u = (C_Dot_Vr - Vr_Dot_Vs * C_Dot_Vs)/detA;
-+ v = (C_Dot_Vr * Vr_Dot_Vs - C_Dot_Vs)/detA;
-+
-+ pointOnThis = position;
-+ pointOnThis += direction * u;
-+ pointOnThat = l2.position;
-+ pointOnThat += l2.direction * v;
-+
-+ return 1;
-+ }
-+
-+ vec3 get_closest_point(const vec3 &point)
-+ {
-+ vec3 np = point - position;
-+ vec3 rp = direction*direction.dot(np)+position;
-+ return rp;
-+ }
-+
-+ const vec3 & get_position() const {return position;}
-+
-+ const vec3 & get_direction() const {return direction;}
-+
-+ //protected:
-+ vec3 position;
-+ vec3 direction;
-+ };
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ // matrix
-+
-+
-+ class matrix4
-+ {
-+
-+ public:
-+
-+ matrix4() { make_identity(); }
-+
-+ matrix4( real r )
-+ { set_value(r); }
-+
-+ matrix4( real * m )
-+ { set_value(m); }
-+
-+ matrix4( real a00, real a01, real a02, real a03,
-+ real a10, real a11, real a12, real a13,
-+ real a20, real a21, real a22, real a23,
-+ real a30, real a31, real a32, real a33 )
-+ {
-+ element(0,0) = a00;
-+ element(0,1) = a01;
-+ element(0,2) = a02;
-+ element(0,3) = a03;
-+
-+ element(1,0) = a10;
-+ element(1,1) = a11;
-+ element(1,2) = a12;
-+ element(1,3) = a13;
-+
-+ element(2,0) = a20;
-+ element(2,1) = a21;
-+ element(2,2) = a22;
-+ element(2,3) = a23;
-+
-+ element(3,0) = a30;
-+ element(3,1) = a31;
-+ element(3,2) = a32;
-+ element(3,3) = a33;
-+ }
-+
-+
-+ void get_value( real * mp ) const
-+ {
-+ int c = 0;
-+ for(int j=0; j < 4; j++)
-+ for(int i=0; i < 4; i++)
-+ mp[c++] = element(i,j);
-+ }
-+
-+
-+ const real * get_value() const
-+ { return m; }
-+
-+ void set_value( real * mp)
-+ {
-+ int c = 0;
-+ for(int j=0; j < 4; j++)
-+ for(int i=0; i < 4; i++)
-+ element(i,j) = mp[c++];
-+ }
-+
-+ void set_value( real r )
-+ {
-+ for(int i=0; i < 4; i++)
-+ for(int j=0; j < 4; j++)
-+ element(i,j) = r;
-+ }
-+
-+ void make_identity()
-+ {
-+ element(0,0) = 1.0;
-+ element(0,1) = 0.0;
-+ element(0,2) = 0.0;
-+ element(0,3) = 0.0;
-+
-+ element(1,0) = 0.0;
-+ element(1,1) = 1.0;
-+ element(1,2) = 0.0;
-+ element(1,3) = 0.0;
-+
-+ element(2,0) = 0.0;
-+ element(2,1) = 0.0;
-+ element(2,2) = 1.0;
-+ element(2,3) = 0.0;
-+
-+ element(3,0) = 0.0;
-+ element(3,1) = 0.0;
-+ element(3,2) = 0.0;
-+ element(3,3) = 1.0;
-+ }
-+
-+
-+ static matrix4 identity()
-+ {
-+ static matrix4 mident (
-+ 1.0, 0.0, 0.0, 0.0,
-+ 0.0, 1.0, 0.0, 0.0,
-+ 0.0, 0.0, 1.0, 0.0,
-+ 0.0, 0.0, 0.0, 1.0 );
-+ return mident;
-+ }
-+
-+
-+ void set_scale( real s )
-+ {
-+ element(0,0) = s;
-+ element(1,1) = s;
-+ element(2,2) = s;
-+ }
-+
-+ void set_scale( const vec3 & s )
-+ {
-+ element(0,0) = s.v[0];
-+ element(1,1) = s.v[1];
-+ element(2,2) = s.v[2];
-+ }
-+
-+
-+ void set_translate( const vec3 & t )
-+ {
-+ element(0,3) = t.v[0];
-+ element(1,3) = t.v[1];
-+ element(2,3) = t.v[2];
-+ }
-+
-+ void set_row(int r, const vec4 & t)
-+ {
-+ element(r,0) = t.v[0];
-+ element(r,1) = t.v[1];
-+ element(r,2) = t.v[2];
-+ element(r,3) = t.v[3];
-+ }
-+
-+ void set_column(int c, const vec4 & t)
-+ {
-+ element(0,c) = t.v[0];
-+ element(1,c) = t.v[1];
-+ element(2,c) = t.v[2];
-+ element(3,c) = t.v[3];
-+ }
-+
-+
-+ void get_row(int r, vec4 & t) const
-+ {
-+ t.v[0] = element(r,0);
-+ t.v[1] = element(r,1);
-+ t.v[2] = element(r,2);
-+ t.v[3] = element(r,3);
-+ }
-+
-+ vec4 get_row(int r) const
-+ {
-+ vec4 v; get_row(r, v);
-+ return v;
-+ }
-+
-+ void get_column(int c, vec4 & t) const
-+ {
-+ t.v[0] = element(0,c);
-+ t.v[1] = element(1,c);
-+ t.v[2] = element(2,c);
-+ t.v[3] = element(3,c);
-+ }
-+
-+ vec4 get_column(int c) const
-+ {
-+ vec4 v; get_column(c, v);
-+ return v;
-+ }
-+
-+ matrix4 inverse() const
-+ {
-+ matrix4 minv;
-+
-+ real r1[8], r2[8], r3[8], r4[8];
-+ real *s[4], *tmprow;
-+
-+ s[0] = &r1[0];
-+ s[1] = &r2[0];
-+ s[2] = &r3[0];
-+ s[3] = &r4[0];
-+
-+ register int i,j,p,jj;
-+ for(i=0;i<4;i++)
-+ {
-+ for(j=0;j<4;j++)
-+ {
-+ s[i][j] = element(i,j);
-+ if(i==j) s[i][j+4] = 1.0;
-+ else s[i][j+4] = 0.0;
-+ }
-+ }
-+ real scp[4];
-+ for(i=0;i<4;i++)
-+ {
-+ scp[i] = real(fabs(s[i][0]));
-+ for(j=1;j<4;j++)
-+ if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
-+ if(scp[i] == 0.0) return minv; // singular matrix!
-+ }
-+
-+ int pivot_to;
-+ real scp_max;
-+ for(i=0;i<4;i++)
-+ {
-+ // select pivot row
-+ pivot_to = i;
-+ scp_max = real(fabs(s[i][i]/scp[i]));
-+ // find out which row should be on top
-+ for(p=i+1;p<4;p++)
-+ if(real(fabs(s[p][i]/scp[p])) > scp_max)
-+ { scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
-+ // Pivot if necessary
-+ if(pivot_to != i)
-+ {
-+ tmprow = s[i];
-+ s[i] = s[pivot_to];
-+ s[pivot_to] = tmprow;
-+ real tmpscp;
-+ tmpscp = scp[i];
-+ scp[i] = scp[pivot_to];
-+ scp[pivot_to] = tmpscp;
-+ }
-+
-+ real mji;
-+ // perform gaussian elimination
-+ for(j=i+1;j<4;j++)
-+ {
-+ mji = s[j][i]/s[i][i];
-+ s[j][i] = 0.0;
-+ for(jj=i+1;jj<8;jj++)
-+ s[j][jj] -= mji*s[i][jj];
-+ }
-+ }
-+ if(s[3][3] == 0.0) return minv; // singular matrix!
-+
-+ //
-+ // Now we have an upper triangular matrix.
-+ //
-+ // x x x x | y y y y
-+ // 0 x x x | y y y y
-+ // 0 0 x x | y y y y
-+ // 0 0 0 x | y y y y
-+ //
-+ // we'll back substitute to get the inverse
-+ //
-+ // 1 0 0 0 | z z z z
-+ // 0 1 0 0 | z z z z
-+ // 0 0 1 0 | z z z z
-+ // 0 0 0 1 | z z z z
-+ //
-+
-+ real mij;
-+ for(i=3;i>0;i--)
-+ {
-+ for(j=i-1;j > -1; j--)
-+ {
-+ mij = s[j][i]/s[i][i];
-+ for(jj=j+1;jj<8;jj++)
-+ s[j][jj] -= mij*s[i][jj];
-+ }
-+ }
-+
-+ for(i=0;i<4;i++)
-+ for(j=0;j<4;j++)
-+ minv(i,j) = s[i][j+4] / s[i][i];
-+
-+ return minv;
-+ }
-+
-+
-+ matrix4 transpose() const
-+ {
-+ matrix4 mtrans;
-+
-+ for(int i=0;i<4;i++)
-+ for(int j=0;j<4;j++)
-+ mtrans(i,j) = element(j,i);
-+ return mtrans;
-+ }
-+
-+ matrix4 & mult_right( const matrix4 & b )
-+ {
-+ matrix4 mt(*this);
-+ set_value(real(0));
-+
-+ for(int i=0; i < 4; i++)
-+ for(int j=0; j < 4; j++)
-+ for(int c=0; c < 4; c++)
-+ element(i,j) += mt(i,c) * b(c,j);
-+ return *this;
-+ }
-+
-+ matrix4 & mult_left( const matrix4 & b )
-+ {
-+ matrix4 mt(*this);
-+ set_value(real(0));
-+
-+ for(int i=0; i < 4; i++)
-+ for(int j=0; j < 4; j++)
-+ for(int c=0; c < 4; c++)
-+ element(i,j) += b(i,c) * mt(c,j);
-+ return *this;
-+ }
-+
-+ // dst = M * src
-+ void mult_matrix_vec( const vec3 &src, vec3 &dst ) const
-+ {
-+ real w = (
-+ src.v[0] * element(3,0) +
-+ src.v[1] * element(3,1) +
-+ src.v[2] * element(3,2) +
-+ element(3,3) );
-+
-+ assert(w != GLH_ZERO);
-+
-+ dst.v[0] = (
-+ src.v[0] * element(0,0) +
-+ src.v[1] * element(0,1) +
-+ src.v[2] * element(0,2) +
-+ element(0,3) ) / w;
-+ dst.v[1] = (
-+ src.v[0] * element(1,0) +
-+ src.v[1] * element(1,1) +
-+ src.v[2] * element(1,2) +
-+ element(1,3) ) / w;
-+ dst.v[2] = (
-+ src.v[0] * element(2,0) +
-+ src.v[1] * element(2,1) +
-+ src.v[2] * element(2,2) +
-+ element(2,3) ) / w;
-+ }
-+
-+ void mult_matrix_vec( vec3 & src_and_dst) const
-+ { mult_matrix_vec(vec3(src_and_dst), src_and_dst); }
-+
-+
-+ // dst = src * M
-+ void mult_vec_matrix( const vec3 &src, vec3 &dst ) const
-+ {
-+ real w = (
-+ src.v[0] * element(0,3) +
-+ src.v[1] * element(1,3) +
-+ src.v[2] * element(2,3) +
-+ element(3,3) );
-+
-+ assert(w != GLH_ZERO);
-+
-+ dst.v[0] = (
-+ src.v[0] * element(0,0) +
-+ src.v[1] * element(1,0) +
-+ src.v[2] * element(2,0) +
-+ element(3,0) ) / w;
-+ dst.v[1] = (
-+ src.v[0] * element(0,1) +
-+ src.v[1] * element(1,1) +
-+ src.v[2] * element(2,1) +
-+ element(3,1) ) / w;
-+ dst.v[2] = (
-+ src.v[0] * element(0,2) +
-+ src.v[1] * element(1,2) +
-+ src.v[2] * element(2,2) +
-+ element(3,2) ) / w;
-+ }
-+
-+
-+ void mult_vec_matrix( vec3 & src_and_dst) const
-+ { mult_vec_matrix(vec3(src_and_dst), src_and_dst); }
-+
-+ // dst = M * src
-+ void mult_matrix_vec( const vec4 &src, vec4 &dst ) const
-+ {
-+ dst.v[0] = (
-+ src.v[0] * element(0,0) +
-+ src.v[1] * element(0,1) +
-+ src.v[2] * element(0,2) +
-+ src.v[3] * element(0,3));
-+ dst.v[1] = (
-+ src.v[0] * element(1,0) +
-+ src.v[1] * element(1,1) +
-+ src.v[2] * element(1,2) +
-+ src.v[3] * element(1,3));
-+ dst.v[2] = (
-+ src.v[0] * element(2,0) +
-+ src.v[1] * element(2,1) +
-+ src.v[2] * element(2,2) +
-+ src.v[3] * element(2,3));
-+ dst.v[3] = (
-+ src.v[0] * element(3,0) +
-+ src.v[1] * element(3,1) +
-+ src.v[2] * element(3,2) +
-+ src.v[3] * element(3,3));
-+ }
-+
-+ void mult_matrix_vec( vec4 & src_and_dst) const
-+ { mult_matrix_vec(vec4(src_and_dst), src_and_dst); }
-+
-+
-+ // dst = src * M
-+ void mult_vec_matrix( const vec4 &src, vec4 &dst ) const
-+ {
-+ dst.v[0] = (
-+ src.v[0] * element(0,0) +
-+ src.v[1] * element(1,0) +
-+ src.v[2] * element(2,0) +
-+ src.v[3] * element(3,0));
-+ dst.v[1] = (
-+ src.v[0] * element(0,1) +
-+ src.v[1] * element(1,1) +
-+ src.v[2] * element(2,1) +
-+ src.v[3] * element(3,1));
-+ dst.v[2] = (
-+ src.v[0] * element(0,2) +
-+ src.v[1] * element(1,2) +
-+ src.v[2] * element(2,2) +
-+ src.v[3] * element(3,2));
-+ dst.v[3] = (
-+ src.v[0] * element(0,3) +
-+ src.v[1] * element(1,3) +
-+ src.v[2] * element(2,3) +
-+ src.v[3] * element(3,3));
-+ }
-+
-+
-+ void mult_vec_matrix( vec4 & src_and_dst) const
-+ { mult_vec_matrix(vec4(src_and_dst), src_and_dst); }
-+
-+
-+ // dst = M * src
-+ void mult_matrix_dir( const vec3 &src, vec3 &dst ) const
-+ {
-+ dst.v[0] = (
-+ src.v[0] * element(0,0) +
-+ src.v[1] * element(0,1) +
-+ src.v[2] * element(0,2) ) ;
-+ dst.v[1] = (
-+ src.v[0] * element(1,0) +
-+ src.v[1] * element(1,1) +
-+ src.v[2] * element(1,2) ) ;
-+ dst.v[2] = (
-+ src.v[0] * element(2,0) +
-+ src.v[1] * element(2,1) +
-+ src.v[2] * element(2,2) ) ;
-+ }
-+
-+
-+ void mult_matrix_dir( vec3 & src_and_dst) const
-+ { mult_matrix_dir(vec3(src_and_dst), src_and_dst); }
-+
-+
-+ // dst = src * M
-+ void mult_dir_matrix( const vec3 &src, vec3 &dst ) const
-+ {
-+ dst.v[0] = (
-+ src.v[0] * element(0,0) +
-+ src.v[1] * element(1,0) +
-+ src.v[2] * element(2,0) ) ;
-+ dst.v[1] = (
-+ src.v[0] * element(0,1) +
-+ src.v[1] * element(1,1) +
-+ src.v[2] * element(2,1) ) ;
-+ dst.v[2] = (
-+ src.v[0] * element(0,2) +
-+ src.v[1] * element(1,2) +
-+ src.v[2] * element(2,2) ) ;
-+ }
-+
-+
-+ void mult_dir_matrix( vec3 & src_and_dst) const
-+ { mult_dir_matrix(vec3(src_and_dst), src_and_dst); }
-+
-+
-+ real & operator () (int row, int col)
-+ { return element(row,col); }
-+
-+ const real & operator () (int row, int col) const
-+ { return element(row,col); }
-+
-+ real & element (int row, int col)
-+ { return m[row | (col<<2)]; }
-+
-+ const real & element (int row, int col) const
-+ { return m[row | (col<<2)]; }
-+
-+ matrix4 & operator *= ( const matrix4 & mat )
-+ {
-+ mult_right( mat );
-+ return *this;
-+ }
-+
-+ matrix4 & operator *= ( const real & r )
-+ {
-+ for (int i = 0; i < 4; ++i)
-+ {
-+ element(0,i) *= r;
-+ element(1,i) *= r;
-+ element(2,i) *= r;
-+ element(3,i) *= r;
-+ }
-+ return *this;
-+ }
-+
-+ matrix4 & operator += ( const matrix4 & mat )
-+ {
-+ for (int i = 0; i < 4; ++i)
-+ {
-+ element(0,i) += mat.element(0,i);
-+ element(1,i) += mat.element(1,i);
-+ element(2,i) += mat.element(2,i);
-+ element(3,i) += mat.element(3,i);
-+ }
-+ return *this;
-+ }
-+
-+ friend matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 );
-+ friend bool operator == ( const matrix4 & m1, const matrix4 & m2 );
-+ friend bool operator != ( const matrix4 & m1, const matrix4 & m2 );
-+
-+ //protected:
-+ real m[16];
-+ };
-+
-+ inline
-+ matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 )
-+ {
-+ matrix4 product;
-+
-+ product = m1;
-+ product.mult_right(m2);
-+
-+ return product;
-+ }
-+
-+ inline
-+ bool operator ==( const matrix4 &m1, const matrix4 &m2 )
-+ {
-+ return (
-+ m1(0,0) == m2(0,0) &&
-+ m1(0,1) == m2(0,1) &&
-+ m1(0,2) == m2(0,2) &&
-+ m1(0,3) == m2(0,3) &&
-+ m1(1,0) == m2(1,0) &&
-+ m1(1,1) == m2(1,1) &&
-+ m1(1,2) == m2(1,2) &&
-+ m1(1,3) == m2(1,3) &&
-+ m1(2,0) == m2(2,0) &&
-+ m1(2,1) == m2(2,1) &&
-+ m1(2,2) == m2(2,2) &&
-+ m1(2,3) == m2(2,3) &&
-+ m1(3,0) == m2(3,0) &&
-+ m1(3,1) == m2(3,1) &&
-+ m1(3,2) == m2(3,2) &&
-+ m1(3,3) == m2(3,3) );
-+ }
-+
-+ inline
-+ bool operator != ( const matrix4 & m1, const matrix4 & m2 )
-+ { return !( m1 == m2 ); }
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ class quaternion
-+ {
-+ public:
-+
-+ quaternion()
-+ {
-+ *this = identity();
-+ }
-+
-+ quaternion( const real v[4] )
-+ {
-+ set_value( v );
-+ }
-+
-+
-+ quaternion( real q0, real q1, real q2, real q3 )
-+ {
-+ set_value( q0, q1, q2, q3 );
-+ }
-+
-+
-+ quaternion( const matrix4 & m )
-+ {
-+ set_value( m );
-+ }
-+
-+
-+ quaternion( const vec3 &axis, real radians )
-+ {
-+ set_value( axis, radians );
-+ }
-+
-+
-+ quaternion( const vec3 &rotateFrom, const vec3 &rotateTo )
-+ {
-+ set_value( rotateFrom, rotateTo );
-+ }
-+
-+ quaternion( const vec3 & from_look, const vec3 & from_up,
-+ const vec3 & to_look, const vec3& to_up)
-+ {
-+ set_value(from_look, from_up, to_look, to_up);
-+ }
-+
-+ const real * get_value() const
-+ {
-+ return &q[0];
-+ }
-+
-+ void get_value( real &q0, real &q1, real &q2, real &q3 ) const
-+ {
-+ q0 = q[0];
-+ q1 = q[1];
-+ q2 = q[2];
-+ q3 = q[3];
-+ }
-+
-+ quaternion & set_value( real q0, real q1, real q2, real q3 )
-+ {
-+ q[0] = q0;
-+ q[1] = q1;
-+ q[2] = q2;
-+ q[3] = q3;
-+ counter = 0;
-+ return *this;
-+ }
-+
-+ void get_value( vec3 &axis, real &radians ) const
-+ {
-+ radians = real(acos( q[3] ) * GLH_TWO);
-+ if ( radians == GLH_ZERO )
-+ axis = vec3( 0.0, 0.0, 1.0 );
-+ else
-+ {
-+ axis.v[0] = q[0];
-+ axis.v[1] = q[1];
-+ axis.v[2] = q[2];
-+ axis.normalize();
-+ }
-+ }
-+
-+ void get_value( matrix4 & m ) const
-+ {
-+ real s, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
-+
-+ real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
-+
-+ s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
-+
-+ xs = q[0] * s;
-+ ys = q[1] * s;
-+ zs = q[2] * s;
-+
-+ wx = q[3] * xs;
-+ wy = q[3] * ys;
-+ wz = q[3] * zs;
-+
-+ xx = q[0] * xs;
-+ xy = q[0] * ys;
-+ xz = q[0] * zs;
-+
-+ yy = q[1] * ys;
-+ yz = q[1] * zs;
-+ zz = q[2] * zs;
-+
-+ m(0,0) = real( GLH_ONE - ( yy + zz ));
-+ m(1,0) = real ( xy + wz );
-+ m(2,0) = real ( xz - wy );
-+
-+ m(0,1) = real ( xy - wz );
-+ m(1,1) = real ( GLH_ONE - ( xx + zz ));
-+ m(2,1) = real ( yz + wx );
-+
-+ m(0,2) = real ( xz + wy );
-+ m(1,2) = real ( yz - wx );
-+ m(2,2) = real ( GLH_ONE - ( xx + yy ));
-+
-+ m(3,0) = m(3,1) = m(3,2) = m(0,3) = m(1,3) = m(2,3) = GLH_ZERO;
-+ m(3,3) = GLH_ONE;
-+ }
-+
-+ quaternion & set_value( const real * qp )
-+ {
-+ memcpy(q,qp,sizeof(real) * 4);
-+
-+ counter = 0;
-+ return *this;
-+ }
-+
-+ quaternion & set_value( const matrix4 & m )
-+ {
-+ real tr, s;
-+ int i, j, k;
-+ const int nxt[3] = { 1, 2, 0 };
-+
-+ tr = m(0,0) + m(1,1) + m(2,2);
-+
-+ if ( tr > GLH_ZERO )
-+ {
-+ s = real(sqrt( tr + m(3,3) ));
-+ q[3] = real ( s * 0.5 );
-+ s = real(0.5) / s;
-+
-+ q[0] = real ( ( m(1,2) - m(2,1) ) * s );
-+ q[1] = real ( ( m(2,0) - m(0,2) ) * s );
-+ q[2] = real ( ( m(0,1) - m(1,0) ) * s );
-+ }
-+ else
-+ {
-+ i = 0;
-+ if ( m(1,1) > m(0,0) )
-+ i = 1;
-+
-+ if ( m(2,2) > m(i,i) )
-+ i = 2;
-+
-+ j = nxt[i];
-+ k = nxt[j];
-+
-+ s = real(sqrt( ( m(i,j) - ( m(j,j) + m(k,k) )) + GLH_ONE ));
-+
-+ q[i] = real ( s * 0.5 );
-+ s = real(0.5 / s);
-+
-+ q[3] = real ( ( m(j,k) - m(k,j) ) * s );
-+ q[j] = real ( ( m(i,j) + m(j,i) ) * s );
-+ q[k] = real ( ( m(i,k) + m(k,i) ) * s );
-+ }
-+
-+ counter = 0;
-+ return *this;
-+ }
-+
-+ quaternion & set_value( const vec3 &axis, real theta )
-+ {
-+ real sqnorm = axis.square_norm();
-+
-+ if (sqnorm <= GLH_EPSILON)
-+ {
-+ // axis too small.
-+ x = y = z = 0.0;
-+ w = 1.0;
-+ }
-+ else
-+ {
-+ theta *= real(0.5);
-+ real sin_theta = real(sin(theta));
-+
-+ if (!equivalent(sqnorm,GLH_ONE))
-+ sin_theta /= real(sqrt(sqnorm));
-+ x = sin_theta * axis.v[0];
-+ y = sin_theta * axis.v[1];
-+ z = sin_theta * axis.v[2];
-+ w = real(cos(theta));
-+ }
-+ return *this;
-+ }
-+
-+ quaternion & set_value( const vec3 & rotateFrom, const vec3 & rotateTo )
-+ {
-+ vec3 p1, p2;
-+ real alpha;
-+
-+ p1 = rotateFrom;
-+ p1.normalize();
-+ p2 = rotateTo;
-+ p2.normalize();
-+
-+ alpha = p1.dot(p2);
-+
-+ if(equivalent(alpha,GLH_ONE))
-+ {
-+ *this = identity();
-+ return *this;
-+ }
-+
-+ // ensures that the anti-parallel case leads to a positive dot
-+ if(equivalent(alpha,-GLH_ONE))
-+ {
-+ vec3 v;
-+
-+ if(p1.v[0] != p1.v[1] || p1.v[0] != p1.v[2])
-+ v = vec3(p1.v[1], p1.v[2], p1.v[0]);
-+ else
-+ v = vec3(-p1.v[0], p1.v[1], p1.v[2]);
-+
-+ v -= p1 * p1.dot(v);
-+ v.normalize();
-+
-+ set_value(v, GLH_PI);
-+ return *this;
-+ }
-+
-+ p1 = p1.cross(p2);
-+ p1.normalize();
-+ set_value(p1,real(acos(alpha)));
-+
-+ counter = 0;
-+ return *this;
-+ }
-+
-+ quaternion & set_value( const vec3 & from_look, const vec3 & from_up,
-+ const vec3 & to_look, const vec3 & to_up)
-+ {
-+ quaternion r_look = quaternion(from_look, to_look);
-+
-+ vec3 rotated_from_up(from_up);
-+ r_look.mult_vec(rotated_from_up);
-+
-+ quaternion r_twist = quaternion(rotated_from_up, to_up);
-+
-+ *this = r_twist;
-+ *this *= r_look;
-+ return *this;
-+ }
-+
-+ quaternion & operator *= ( const quaternion & qr )
-+ {
-+ quaternion ql(*this);
-+
-+ w = ql.w * qr.w - ql.x * qr.x - ql.y * qr.y - ql.z * qr.z;
-+ x = ql.w * qr.x + ql.x * qr.w + ql.y * qr.z - ql.z * qr.y;
-+ y = ql.w * qr.y + ql.y * qr.w + ql.z * qr.x - ql.x * qr.z;
-+ z = ql.w * qr.z + ql.z * qr.w + ql.x * qr.y - ql.y * qr.x;
-+
-+ counter += qr.counter;
-+ counter++;
-+ counter_normalize();
-+ return *this;
-+ }
-+
-+ void normalize()
-+ {
-+ real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
-+ if (equivalent(rnorm, GLH_ZERO))
-+ return;
-+ x *= rnorm;
-+ y *= rnorm;
-+ z *= rnorm;
-+ w *= rnorm;
-+ counter = 0;
-+ }
-+
-+ friend bool operator == ( const quaternion & q1, const quaternion & q2 );
-+
-+ friend bool operator != ( const quaternion & q1, const quaternion & q2 );
-+
-+ friend quaternion operator * ( const quaternion & q1, const quaternion & q2 );
-+
-+ bool equals( const quaternion & r, real tolerance ) const
-+ {
-+ real t;
-+
-+ t = (
-+ (q[0]-r.q[0])*(q[0]-r.q[0]) +
-+ (q[1]-r.q[1])*(q[1]-r.q[1]) +
-+ (q[2]-r.q[2])*(q[2]-r.q[2]) +
-+ (q[3]-r.q[3])*(q[3]-r.q[3]) );
-+ if(t > GLH_EPSILON)
-+ return false;
-+ return 1;
-+ }
-+
-+ quaternion & conjugate()
-+ {
-+ q[0] *= -GLH_ONE;
-+ q[1] *= -GLH_ONE;
-+ q[2] *= -GLH_ONE;
-+ return *this;
-+ }
-+
-+ quaternion & invert()
-+ {
-+ return conjugate();
-+ }
-+
-+ quaternion inverse() const
-+ {
-+ quaternion r = *this;
-+ return r.invert();
-+ }
-+
-+ //
-+ // Quaternion multiplication with cartesian vector
-+ // v' = q*v*q(star)
-+ //
-+ void mult_vec( const vec3 &src, vec3 &dst ) const
-+ {
-+ real v_coef = w * w - x * x - y * y - z * z;
-+ real u_coef = GLH_TWO * (src.v[0] * x + src.v[1] * y + src.v[2] * z);
-+ real c_coef = GLH_TWO * w;
-+
-+ dst.v[0] = v_coef * src.v[0] + u_coef * x + c_coef * (y * src.v[2] - z * src.v[1]);
-+ dst.v[1] = v_coef * src.v[1] + u_coef * y + c_coef * (z * src.v[0] - x * src.v[2]);
-+ dst.v[2] = v_coef * src.v[2] + u_coef * z + c_coef * (x * src.v[1] - y * src.v[0]);
-+ }
-+
-+ void mult_vec( vec3 & src_and_dst) const
-+ {
-+ mult_vec(vec3(src_and_dst), src_and_dst);
-+ }
-+
-+ void scale_angle( real scaleFactor )
-+ {
-+ vec3 axis;
-+ real radians;
-+
-+ get_value(axis, radians);
-+ radians *= scaleFactor;
-+ set_value(axis, radians);
-+ }
-+
-+ static quaternion slerp( const quaternion & p, const quaternion & q, real alpha )
-+ {
-+ quaternion r;
-+
-+ real cos_omega = p.x * q.x + p.y * q.y + p.z * q.z + p.w * q.w;
-+ // if B is on opposite hemisphere from A, use -B instead
-+
-+ int bflip;
-+ if ( ( bflip = (cos_omega < GLH_ZERO)) )
-+ cos_omega = -cos_omega;
-+
-+ // complementary interpolation parameter
-+ real beta = GLH_ONE - alpha;
-+
-+ if(cos_omega <= GLH_ONE - GLH_EPSILON)
-+ return p;
-+
-+ real omega = real(acos(cos_omega));
-+ real one_over_sin_omega = GLH_ONE / real(sin(omega));
-+
-+ beta = real(sin(omega*beta) * one_over_sin_omega);
-+ alpha = real(sin(omega*alpha) * one_over_sin_omega);
-+
-+ if (bflip)
-+ alpha = -alpha;
-+
-+ r.x = beta * p.q[0]+ alpha * q.q[0];
-+ r.y = beta * p.q[1]+ alpha * q.q[1];
-+ r.z = beta * p.q[2]+ alpha * q.q[2];
-+ r.w = beta * p.q[3]+ alpha * q.q[3];
-+ return r;
-+ }
-+
-+ static quaternion identity()
-+ {
-+ static quaternion ident( vec3( 0.0, 0.0, 0.0 ), GLH_ONE );
-+ return ident;
-+ }
-+
-+ real & operator []( int i )
-+ {
-+ assert(i < 4);
-+ return q[i];
-+ }
-+
-+ const real & operator []( int i ) const
-+ {
-+ assert(i < 4);
-+ return q[i];
-+ }
-+
-+ protected:
-+
-+ void counter_normalize()
-+ {
-+ if (counter > GLH_QUATERNION_NORMALIZATION_THRESHOLD)
-+ normalize();
-+ }
-+
-+ union
-+ {
-+ struct
-+ {
-+ real q[4];
-+ };
-+ struct
-+ {
-+ real x;
-+ real y;
-+ real z;
-+ real w;
-+ };
-+ };
-+
-+ // renormalization counter
-+ unsigned char counter;
-+ };
-+
-+ inline
-+ bool operator == ( const quaternion & q1, const quaternion & q2 )
-+ {
-+ return (equivalent(q1.x, q2.x) &&
-+ equivalent(q1.y, q2.y) &&
-+ equivalent(q1.z, q2.z) &&
-+ equivalent(q1.w, q2.w) );
-+ }
-+
-+ inline
-+ bool operator != ( const quaternion & q1, const quaternion & q2 )
-+ {
-+ return ! ( q1 == q2 );
-+ }
-+
-+ inline
-+ quaternion operator * ( const quaternion & q1, const quaternion & q2 )
-+ {
-+ quaternion r(q1);
-+ r *= q2;
-+ return r;
-+ }
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ class plane
-+ {
-+ public:
-+
-+ plane()
-+ {
-+ planedistance = 0.0;
-+ planenormal.set_value( 0.0, 0.0, 1.0 );
-+ }
-+
-+
-+ plane( const vec3 &p0, const vec3 &p1, const vec3 &p2 )
-+ {
-+ vec3 v0 = p1 - p0;
-+ vec3 v1 = p2 - p0;
-+ planenormal = v0.cross(v1);
-+ planenormal.normalize();
-+ planedistance = p0.dot(planenormal);
-+ }
-+
-+ plane( const vec3 &normal, real distance )
-+ {
-+ planedistance = distance;
-+ planenormal = normal;
-+ planenormal.normalize();
-+ }
-+
-+ plane( const vec3 &normal, const vec3 &point )
-+ {
-+ planenormal = normal;
-+ planenormal.normalize();
-+ planedistance = point.dot(planenormal);
-+ }
-+
-+ void offset( real d )
-+ {
-+ planedistance += d;
-+ }
-+
-+ bool intersect( const line &l, vec3 &intersection ) const
-+ {
-+ vec3 pos, dir;
-+ vec3 pn = planenormal;
-+ real pd = planedistance;
-+
-+ pos = l.get_position();
-+ dir = l.get_direction();
-+
-+ if(dir.dot(pn) == 0.0) return 0;
-+ pos -= pn*pd;
-+ // now we're talking about a plane passing through the origin
-+ if(pos.dot(pn) < 0.0) pn.negate();
-+ if(dir.dot(pn) > 0.0) dir.negate();
-+ vec3 ppos = pn * pos.dot(pn);
-+ pos = (ppos.length()/dir.dot(-pn))*dir;
-+ intersection = l.get_position();
-+ intersection += pos;
-+ return 1;
-+ }
-+ void transform( const matrix4 &matrix )
-+ {
-+ matrix4 invtr = matrix.inverse();
-+ invtr = invtr.transpose();
-+
-+ vec3 pntOnplane = planenormal * planedistance;
-+ vec3 newPntOnplane;
-+ vec3 newnormal;
-+
-+ invtr.mult_dir_matrix(planenormal, newnormal);
-+ matrix.mult_vec_matrix(pntOnplane, newPntOnplane);
-+
-+ newnormal.normalize();
-+ planenormal = newnormal;
-+ planedistance = newPntOnplane.dot(planenormal);
-+ }
-+
-+ bool is_in_half_space( const vec3 &point ) const
-+ {
-+
-+ if(( point.dot(planenormal) - planedistance) < 0.0)
-+ return 0;
-+ return 1;
-+ }
-+
-+
-+ real distance( const vec3 & point ) const
-+ {
-+ return planenormal.dot(point - planenormal*planedistance);
-+ }
-+
-+ const vec3 &get_normal() const
-+ {
-+ return planenormal;
-+ }
-+
-+
-+ real get_distance_from_origin() const
-+ {
-+ return planedistance;
-+ }
-+
-+
-+ friend bool operator == ( const plane & p1, const plane & p2 );
-+
-+
-+ friend bool operator != ( const plane & p1, const plane & p2 );
-+
-+ //protected:
-+ vec3 planenormal;
-+ real planedistance;
-+ };
-+
-+ inline
-+ bool operator == (const plane & p1, const plane & p2 )
-+ {
-+ return ( p1.planedistance == p2.planedistance && p1.planenormal == p2.planenormal);
-+ }
-+
-+ inline
-+ bool operator != ( const plane & p1, const plane & p2 )
-+ { return ! (p1 == p2); }
-+
-+
-+
-+ } // "ns_##GLH_REAL"
-+
-+ // make common typedefs...
-+#ifdef GLH_REAL_IS_FLOAT
-+ typedef GLH_REAL_NAMESPACE::vec2 vec2f;
-+ typedef GLH_REAL_NAMESPACE::vec3 vec3f;
-+ typedef GLH_REAL_NAMESPACE::vec4 vec4f;
-+ typedef GLH_REAL_NAMESPACE::quaternion quaternionf;
-+ typedef GLH_REAL_NAMESPACE::quaternion rotationf;
-+ typedef GLH_REAL_NAMESPACE::line linef;
-+ typedef GLH_REAL_NAMESPACE::plane planef;
-+ typedef GLH_REAL_NAMESPACE::matrix4 matrix4f;
-+#endif
-+
-+
-+
-+
-+} // namespace glh
-+
-+
-+
-+#endif
-+
---
-tg: (c8fb40a..) topic/fixes/jira-backported/glh_linear (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/50_get_cpu_clock_count_for_more_than_just_i386.diff b/debian/patches/topic/fixes/jira-sent/50_get_cpu_clock_count_for_more_than_just_i386.diff
deleted file mode 100644
index 95a9a11..0000000
--- a/debian/patches/topic/fixes/jira-sent/50_get_cpu_clock_count_for_more_than_just_i386.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/50_get_cpu_clock_count_for_more_than_just_i386
-
-Fix CPU clock count for non i386 based processors eg PPC.
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llcommon/llfasttimer.cpp | 16 ++--------------
- 1 files changed, 2 insertions(+), 14 deletions(-)
-
-diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
-index 01db945..fee83dc 100644
---- a/indra/llcommon/llfasttimer.cpp
-+++ b/indra/llcommon/llfasttimer.cpp
-@@ -91,20 +91,8 @@ U64 get_cpu_clock_count()
- #endif // LL_WINDOWS
-
-
--#if (LL_LINUX || LL_SOLARIS) && (defined(__i386__) || defined(__amd64__))
--U64 get_cpu_clock_count()
--{
-- U64 x;
-- __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
-- return x;
--}
--#endif
--
--#if LL_DARWIN || (LL_SOLARIS && defined(__sparc__))
--//
--// Mac implementation of CPU clock
--//
--// Just use gettimeofday implementation for now
-+#if LL_LINUX || LL_DARWIN || LL_SOLARIS
-+// Both Linux and Mac use gettimeofday for accurate time
-
- U64 get_cpu_clock_count()
- {
---
-tg: (c8fb40a..) topic/fixes/jira-sent/50_get_cpu_clock_count_for_more_than_just_i386 (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/59_need_llpreprocessor_to_access_endian_macros.diff b/debian/patches/topic/fixes/jira-sent/59_need_llpreprocessor_to_access_endian_macros.diff
deleted file mode 100644
index 5c092c4..0000000
--- a/debian/patches/topic/fixes/jira-sent/59_need_llpreprocessor_to_access_endian_macros.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/59_need_llpreprocessor_to_access_endian_macros
-
-PPC compile fix, give access to endian macros
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llmessage/message.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
-index b72aa9a..db12b97 100644
---- a/indra/llmessage/message.h
-+++ b/indra/llmessage/message.h
-@@ -48,6 +48,7 @@
- #include "winsock2.h" // htons etc.
- #endif
-
-+#include "llpreprocessor.h"
- #include "llerror.h"
- #include "net.h"
- #include "string_table.h"
---
-tg: (c8fb40a..) topic/fixes/jira-sent/59_need_llpreprocessor_to_access_endian_macros (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/VWR-1815_top_corner_fix.diff b/debian/patches/topic/fixes/jira-sent/VWR-1815_top_corner_fix.diff
deleted file mode 100644
index f913fa9..0000000
--- a/debian/patches/topic/fixes/jira-sent/VWR-1815_top_corner_fix.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/VWR-1815_top_corner_fix
-
-Remains of the top corner texture fix, this part accellerates downloads
-for stuck textures
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/lltexturefetch.cpp | 16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
-index 80b8b4d..781ff4d 100644
---- a/indra/newview/lltexturefetch.cpp
-+++ b/indra/newview/lltexturefetch.cpp
-@@ -53,6 +53,9 @@ class LLTextureFetchWorker : public LLWorkerClass
- {
- friend class LLTextureFetch;
-
-+public:
-+ BOOL mAccelerateDownloadStuckTexture;
-+
- private:
- #if 0
- class URLResponder : public LLHTTPClient::Responder
-@@ -1061,6 +1064,14 @@ bool LLTextureFetchWorker::processSimulatorPackets()
- }
- bool have_all_data = mLastPacket >= mTotalPackets-1;
- llassert_always(mRequestedSize > 0);
-+
-+ if((buffer_size >= mRequestedSize) && mRequestedDiscard <=0)
-+ {
-+ if(!mAccelerateDownloadStuckTexture);
-+ llwarns << "Accelerating download of a stuck texture :"<<mID << llendl
-+ mAccelerateDownloadStuckTexture=TRUE;
-+ }
-+
- if (buffer_size >= mRequestedSize || have_all_data)
- {
- /// We have enough (or all) data
-@@ -1557,6 +1568,7 @@ void LLTextureFetch::sendRequestListToSimulators()
- const F32 LAZY_FLUSH_TIMEOUT = 15.f; // 10.0f // temp
- const F32 MIN_REQUEST_TIME = 1.0f;
- const F32 MIN_DELTA_PRIORITY = 1000.f;
-+ const F32 MIN_ACCEL_KICK = 0.5f;
-
- LLMutexLock lock(&mQueueMutex);
-
-@@ -1587,7 +1599,9 @@ void LLTextureFetch::sendRequestListToSimulators()
- F32 delta_priority = llabs(req->mRequestedPriority - req->mImagePriority);
- if ((req->mSimRequestedDiscard != req->mDesiredDiscard) ||
- (delta_priority > MIN_DELTA_PRIORITY && elapsed >= MIN_REQUEST_TIME) ||
-- (elapsed >= LAZY_FLUSH_TIMEOUT))
-+ (elapsed >= LAZY_FLUSH_TIMEOUT) ||
-+ (req->mAccelerateDownloadStuckTexture && (elapsed >=MIN_ACCEL_KICK))
-+ )
- {
- requests[req->mHost].insert(req);
- }
---
-tg: (c8fb40a..) topic/fixes/jira-sent/VWR-1815_top_corner_fix (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/VWR-8194_clamp_outline_for_broken_nvidia.diff b/debian/patches/topic/fixes/jira-sent/VWR-8194_clamp_outline_for_broken_nvidia.diff
deleted file mode 100644
index 561caab..0000000
--- a/debian/patches/topic/fixes/jira-sent/VWR-8194_clamp_outline_for_broken_nvidia.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/VWR-8194_clamp_outline_for_broken_nvidia
-
-Prevent buffer overflow in temp GL matrix
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llrender/llrender.cpp | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
-index 80fed06..fbe186e 100644
---- a/indra/llrender/llrender.cpp
-+++ b/indra/llrender/llrender.cpp
-@@ -903,6 +903,9 @@ void LLRender::vertex3fv(const GLfloat* v)
-
- void LLRender::texCoord2f(const GLfloat& x, const GLfloat& y)
- {
-+ if (mCount >= 4096)
-+ return;
-+
- mTexcoordsp[mCount] = LLVector2(x,y);
- }
-
-@@ -918,6 +921,10 @@ void LLRender::texCoord2fv(const GLfloat* tc)
-
- void LLRender::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a)
- {
-+
-+ if (mCount >= 4096)
-+ return;
-+
- mColorsp[mCount] = LLColor4U(r,g,b,a);
- }
- void LLRender::color4ubv(const GLubyte* c)
---
-tg: (c8fb40a..) topic/fixes/jira-sent/VWR-8194_clamp_outline_for_broken_nvidia (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.diff b/debian/patches/topic/fixes/jira-sent/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.diff
deleted file mode 100644
index e509132..0000000
--- a/debian/patches/topic/fixes/jira-sent/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders
-
-Enable the build to succeed with either the mesa gl.h or the nvidia gl.h headers
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llrender/llgl.cpp | 17 ++++++++++++++---
- indra/llrender/llglheaders.h | 9 +++++++++
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
-index 67d258e..f74b13d 100644
---- a/indra/llrender/llgl.cpp
-+++ b/indra/llrender/llgl.cpp
-@@ -252,6 +252,12 @@ PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
- PFNGLCOLORTABLEEXTPROC glColorTableEXT = NULL;
- #endif // LL_LINUX
-
-+#if LL_LINUX && defined(WINGDIAPI)
-+PFNGLACTIVETEXTUREARBPROC glActiveTextureARB=NULL;
-+PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB=NULL;
-+PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements=NULL;
-+#endif
-+
- #endif
-
- LLGLManager gGLManager;
-@@ -762,15 +768,20 @@ void LLGLManager::initExtensions()
- glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGetFramebufferAttachmentParameterivEXT");
- glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glGenerateMipmapEXT");
- }
--#if !LL_LINUX
-- // This is expected to be a static symbol on Linux GL implementations
-+#if !LL_LINUX || (LL_LINUX && defined(WINGDIAPI))
-+ // This is expected to be a static symbol on Linux GL implementations, except if we use the nvidia headers
- glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)GLH_EXT_GET_PROC_ADDRESS("glDrawRangeElements");
- if (!glDrawRangeElements)
- {
- mGLMaxVertexRange = 0;
- mGLMaxIndexRange = 0;
- }
--#endif // !LL_LINUX
-+#endif //!LL_LINUX
-+
-+#if LL_LINUX && defined(WINGDIAPI)
-+ glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glActiveTextureARB");
-+ glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)GLH_EXT_GET_PROC_ADDRESS("glClientActiveTextureARB");
-+#endif
-
- if (mHasOcclusionQuery)
- {
-diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
-index f047262..9d04f1c 100644
---- a/indra/llrender/llglheaders.h
-+++ b/indra/llrender/llglheaders.h
-@@ -76,6 +76,15 @@
- #undef Status
- #endif // LL_LINUX && !LL_MESA_HEADLESS
-
-+#if LL_LINUX && defined(WINGDIAPI)
-+// WINGDIAPI gets set if we are using the linux nvidia gl.h header which needs the
-+// functions below setting up
-+// Missing functions when using nvidia header
-+extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
-+extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB;
-+extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
-+
-+#endif
-
- // GL_ARB_vertex_buffer_object
- extern PFNGLBINDBUFFERARBPROC glBindBufferARB;
---
-tg: (c8fb40a..) topic/fixes/jira-sent/VWR-9557-EnableBuildWithNvidiaOrMesaHeaders (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/correctly_find_dbus_headers_on_standalone.diff b/debian/patches/topic/fixes/jira-sent/correctly_find_dbus_headers_on_standalone.diff
deleted file mode 100644
index fe7d76c..0000000
--- a/debian/patches/topic/fixes/jira-sent/correctly_find_dbus_headers_on_standalone.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/correctly_find_dbus_headers_on_standalone
-
-Correctly find the DBUS headers in cmake, patch sent up stream to LL and in the queue to be applied
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- doc/contributions.txt | 1 +
- indra/newview/CMakeLists.txt | 5 +++++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/doc/contributions.txt b/doc/contributions.txt
-index 54aad6e..26cb09b 100644
---- a/doc/contributions.txt
-+++ b/doc/contributions.txt
-@@ -226,6 +226,7 @@ Michelle2 Zenovka
- VWR-8889
- VWR-8310
- VWR-4022
-+ VWR-9499
- Mm Alder
- VWR-3777
- VWR-4794
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..84436b3 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -59,6 +59,11 @@ include_directories(
- ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
- )
-
-+if (LINUX)
-+ include_directories (${DBUSGLIB_INCLUDE_DIRS})
-+endif (LINUX)
-+
-+
- set(viewer_SOURCE_FILES
- llagent.cpp
- llagentdata.cpp
---
-tg: (c8fb40a..) topic/fixes/jira-sent/correctly_find_dbus_headers_on_standalone (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/dont_depend_on_artwork_to_build.diff b/debian/patches/topic/fixes/jira-sent/dont_depend_on_artwork_to_build.diff
deleted file mode 100644
index 562b347..0000000
--- a/debian/patches/topic/fixes/jira-sent/dont_depend_on_artwork_to_build.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/dont_depend_on_artwork_to_build
-
-Do not require the artwork to be present in the cmake tree, sent
-upstream and discussed with BoS expected to be fixed upstream at
-some point.
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..4da2f50 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -1244,7 +1244,7 @@ source_group("Character File" FILES ${viewer_CHARACTER_FILES})
- set_source_files_properties(${viewer_CHARACTER_FILES}
- PROPERTIES HEADER_FILE_ONLY TRUE)
-
--list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
-+#list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
-
- if (WINDOWS)
- file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi)
---
-tg: (c8fb40a..) topic/fixes/jira-sent/dont_depend_on_artwork_to_build (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/gcc_warning_on_llwindowsdl_var_not_set.diff b/debian/patches/topic/fixes/jira-sent/gcc_warning_on_llwindowsdl_var_not_set.diff
deleted file mode 100644
index 684c067..0000000
--- a/debian/patches/topic/fixes/jira-sent/gcc_warning_on_llwindowsdl_var_not_set.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/gcc_warning_on_llwindowsdl_var_not_set
-
-Prevent FTBFS error with gcc and a wild variable.
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llwindow/llwindowsdl.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
-index 361126d..aff320f 100644
---- a/indra/llwindow/llwindowsdl.cpp
-+++ b/indra/llwindow/llwindowsdl.cpp
-@@ -2646,6 +2646,7 @@ BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
- orig_color.red = guint16(65535 * *r);
- orig_color.green= guint16(65535 * *g);
- orig_color.blue = guint16(65535 * *b);
-+ orig_color.pixel = -1; //Default this to something or the copy next will produce a gcc warning
- color = orig_color;
-
- gtk_color_selection_set_previous_color (colorsel, &color);
---
-tg: (c8fb40a..) topic/fixes/jira-sent/gcc_warning_on_llwindowsdl_var_not_set (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/lltemplatemessagereader_memcpy.diff b/debian/patches/topic/fixes/jira-sent/lltemplatemessagereader_memcpy.diff
deleted file mode 100644
index 8cdb7f4..0000000
--- a/debian/patches/topic/fixes/jira-sent/lltemplatemessagereader_memcpy.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/lltemplatemessagereader_memcpy
-
-Fix gcc FTBFS bug, possibly a gcc bug.
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llmessage/lltemplatemessagereader.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
-index 2c457e8..28daceb 100644
---- a/indra/llmessage/lltemplatemessagereader.cpp
-+++ b/indra/llmessage/lltemplatemessagereader.cpp
-@@ -676,7 +676,8 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
- // default to 0s.
- U32 size = mvci.getSize();
- std::vector<U8> data(size);
-- memset(&(data[0]), 0, size);
-+ if(size>0)
-+ memset(&(data[0]), 0, size);
- cur_data_block->addData(mvci.getName(), &(data[0]),
- size, mvci.getType());
- }
---
-tg: (c8fb40a..) topic/fixes/jira-sent/lltemplatemessagereader_memcpy (depends on: upstream)
diff --git a/debian/patches/topic/fixes/jira-sent/use_c_locale_and_dont_spam_me_because_i_am_not_american.diff b/debian/patches/topic/fixes/jira-sent/use_c_locale_and_dont_spam_me_because_i_am_not_american.diff
deleted file mode 100644
index 6edd900..0000000
--- a/debian/patches/topic/fixes/jira-sent/use_c_locale_and_dont_spam_me_because_i_am_not_american.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/jira-sent/use_c_locale_and_dont_spam_me_because_i_am_not_american
-
-Better protection of locales, and don't enforce en_US.UTF-8
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llui/llresmgr.cpp | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp
-index bd05d43..b44af9f 100644
---- a/indra/llui/llresmgr.cpp
-+++ b/indra/llui/llresmgr.cpp
-@@ -446,7 +446,10 @@ const std::string LLLocale::SYSTEM_LOCALE("en_US.iso8859-1");
- const std::string LLLocale::USER_LOCALE("en_US.ISO8859-1");
- const std::string LLLocale::SYSTEM_LOCALE("C");
- #else // LL_LINUX likes this
--const std::string LLLocale::USER_LOCALE("en_US.utf8");
-+//const std::string LLLocale::USER_LOCALE("en_US.utf8");
-+// this is a good chance that I AM NOT AN AMERICAN don't assume that i am and
-+// assume i have an american locale installed, C should do for the viewer
-+const std::string LLLocale::USER_LOCALE("C");
- const std::string LLLocale::SYSTEM_LOCALE("C");
- #endif
-
---
-tg: (c8fb40a..) topic/fixes/jira-sent/use_c_locale_and_dont_spam_me_because_i_am_not_american (depends on: upstream)
diff --git a/debian/patches/topic/fixes/new/allow_compilation_when_GST_DISABLE_GST_DEBUG_is_defined.diff b/debian/patches/topic/fixes/new/allow_compilation_when_GST_DISABLE_GST_DEBUG_is_defined.diff
deleted file mode 100644
index 7e06077..0000000
--- a/debian/patches/topic/fixes/new/allow_compilation_when_GST_DISABLE_GST_DEBUG_is_defined.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/fixes/new/allow_compilation_when_GST_DISABLE_GST_DEBUG_is_defined
-
-Allow compilation when GST_DISABLE_GST_DEBUG is defined.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/llmedia/llmediaimplgstreamer_syms.h | 2 ++
- indra/llmedia/llmediaimplgstreamer_syms_raw.inc | 2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/indra/llmedia/llmediaimplgstreamer_syms.h b/indra/llmedia/llmediaimplgstreamer_syms.h
-index 92d46b7..0c423e3 100644
---- a/indra/llmedia/llmediaimplgstreamer_syms.h
-+++ b/indra/llmedia/llmediaimplgstreamer_syms.h
-@@ -67,8 +67,10 @@ void ungrab_gst_syms();
- #define GST_TYPE_VIDEO_SINK (llgst_video_sink_get_type())
- #undef _gst_debug_register_funcptr
- #define _gst_debug_register_funcptr ll_gst_debug_register_funcptr
-+#ifndef GST_DISABLE_GST_DEBUG
- #undef _gst_debug_category_new
- #define _gst_debug_category_new ll_gst_debug_category_new
-+#endif
- #undef __gst_debug_enabled
- #define __gst_debug_enabled (0)
-
-diff --git a/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
-index 08ba6df..eb2b3ee 100644
---- a/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
-+++ b/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
-@@ -19,8 +19,10 @@ LL_GST_SYM(true, gst_element_class_add_pad_template, void, GstElementClass *klas
- LL_GST_SYM(true, gst_element_class_set_details, void, GstElementClass *klass, const GstElementDetails *details);
- LL_GST_SYM(true, gst_caps_unref, void, GstCaps* caps);
- LL_GST_SYM(true, gst_caps_ref, GstCaps *, GstCaps* caps);
-+#ifndef GST_DISABLE_GST_DEBUG
- LL_GST_SYM(true, _gst_debug_register_funcptr, void, GstDebugFuncPtr func, gchar* ptrname);
- LL_GST_SYM(true, _gst_debug_category_new, GstDebugCategory *, gchar *name, guint color, gchar *description);
-+#endif
- LL_GST_SYM(true, gst_caps_is_empty, gboolean, const GstCaps *caps);
- LL_GST_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string);
- LL_GST_SYM(true, gst_caps_replace, void, GstCaps **caps, GstCaps *newcaps);
---
-tg: (c8fb40a..) topic/fixes/new/allow_compilation_when_GST_DISABLE_GST_DEBUG_is_defined (depends on: upstream)
diff --git a/debian/patches/topic/fixes/new/delete_LLImageTGA_mColorMap_as_array.diff b/debian/patches/topic/fixes/new/delete_LLImageTGA_mColorMap_as_array.diff
deleted file mode 100644
index 1206ceb..0000000
--- a/debian/patches/topic/fixes/new/delete_LLImageTGA_mColorMap_as_array.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/fixes/new/delete_LLImageTGA_mColorMap_as_array
-
-The destructor of LLImageTGA should delete mColorMap with 'operator delete[]', not 'operator delete'.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/llimage/llimagetga.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
-index 32c2111..21d0fd1 100644
---- a/indra/llimage/llimagetga.cpp
-+++ b/indra/llimage/llimagetga.cpp
-@@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name)
-
- LLImageTGA::~LLImageTGA()
- {
-- delete mColorMap;
-+ delete [] mColorMap;
- }
-
- BOOL LLImageTGA::updateData()
---
-tg: (c8fb40a..) topic/fixes/new/delete_LLImageTGA_mColorMap_as_array (depends on: upstream)
diff --git a/debian/patches/topic/fixes/new/delete_LLMediaImplGStreamer_mediaData_as_array.diff b/debian/patches/topic/fixes/new/delete_LLMediaImplGStreamer_mediaData_as_array.diff
deleted file mode 100644
index 900e2e0..0000000
--- a/debian/patches/topic/fixes/new/delete_LLMediaImplGStreamer_mediaData_as_array.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/fixes/new/delete_LLMediaImplGStreamer_mediaData_as_array
-
-LLMediaImplGStreamer::mediaData is a pointer to an array.
-Delete with operator [] instead of operator delete.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- indra/llmedia/llmediaimplgstreamer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llmedia/llmediaimplgstreamer.cpp b/indra/llmedia/llmediaimplgstreamer.cpp
-index b1d36f0..5e52f1c 100644
---- a/indra/llmedia/llmediaimplgstreamer.cpp
-+++ b/indra/llmedia/llmediaimplgstreamer.cpp
-@@ -431,7 +431,7 @@ unload ()
-
- if (mediaData)
- {
-- delete mediaData;
-+ delete [] mediaData;
- mediaData = NULL;
- }
-
---
-tg: (7d04aa9..) topic/fixes/new/delete_LLMediaImplGStreamer_mediaData_as_array (depends on: build)
diff --git a/debian/patches/topic/fixes/thirdparty/0000_keep_statbars_from_overshooting.patch.diff b/debian/patches/topic/fixes/thirdparty/0000_keep_statbars_from_overshooting.patch.diff
deleted file mode 100644
index 8644292..0000000
--- a/debian/patches/topic/fixes/thirdparty/0000_keep_statbars_from_overshooting.patch.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/0000_keep_statbars_from_overshooting.patch
-
-fix an issue with status bars overshooting their window
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/llstatbar.cpp | 13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/indra/newview/llstatbar.cpp b/indra/newview/llstatbar.cpp
-index d88e89f..b3a7a05 100644
---- a/indra/newview/llstatbar.cpp
-+++ b/indra/newview/llstatbar.cpp
-@@ -213,6 +213,7 @@ void LLStatBar::draw()
- }
-
- right = (S32) ((max - mMinBar) * value_scale);
-+ right = llclamp(0, right, width);
- gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 0.f, 0.f, 0.25f));
-
- S32 num_values = mStatp->getNumValues() - 1;
-@@ -228,22 +229,22 @@ void LLStatBar::draw()
- if (mPerSec)
- {
- left = (S32)((mStatp->getPrevPerSec(i) - mMinBar) * value_scale);
-- right = (S32)((mStatp->getPrevPerSec(i) - mMinBar) * value_scale) + 1;
-- gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
- }
- else
- {
- left = (S32)((mStatp->getPrev(i) - mMinBar) * value_scale);
-- right = (S32)((mStatp->getPrev(i) - mMinBar) * value_scale) + 1;
-- gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
-- }
-+ }
-+ left = llclamp(0, left, width-1);
-+ right = left+1;
-+ gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
- }
- }
- else
- {
- // draw current
- left = (S32) ((current - mMinBar) * value_scale) - 1;
-- right = (S32) ((current - mMinBar) * value_scale) + 1;
-+ left = llclamp(0, left, width-1);
-+ right = left + 2;
- gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 0.f, 0.f, 1.f));
- }
-
---
-tg: (c8fb40a..) topic/fixes/thirdparty/0000_keep_statbars_from_overshooting.patch (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/0001_possible_crash_and_leak_llassetstorage.patch.diff b/debian/patches/topic/fixes/thirdparty/0001_possible_crash_and_leak_llassetstorage.patch.diff
deleted file mode 100644
index 154e918..0000000
--- a/debian/patches/topic/fixes/thirdparty/0001_possible_crash_and_leak_llassetstorage.patch.diff
+++ /dev/null
@@ -1,148 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/0001_possible_crash_and_leak_llassetstorage.patch
-
-possible crash and memory leak
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llmessage/llassetstorage.cpp | 41 ++++++++++++++++++-----------------
- 1 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
-index fa14a2b..2d85011 100644
---- a/indra/llmessage/llassetstorage.cpp
-+++ b/indra/llmessage/llassetstorage.cpp
-@@ -522,16 +522,19 @@ void LLAssetStorage::downloadCompleteCallback(
- S32 result,
- const LLUUID& file_id,
- LLAssetType::EType file_type,
-- void* user_data, LLExtStat ext_status)
-+ void* callback_parm_req, LLExtStat ext_status)
- {
- lldebugs << "LLAssetStorage::downloadCompleteCallback() for " << file_id
- << "," << LLAssetType::lookup(file_type) << llendl;
-- LLAssetRequest* req = (LLAssetRequest*)user_data;
-+
-+ // be careful! req may be a ptr to memory already freed (a timeout does this)
-+ LLAssetRequest* req = (LLAssetRequest*)callback_parm_req;
- if(!req)
- {
- llwarns << "LLAssetStorage::downloadCompleteCallback called without"
- "a valid request." << llendl;
-- return;
-+ // we can live with a null pointer, we're not allowed to deref the ptr anyway (see above)
-+ // return;
- }
- if (!gAssetStorage)
- {
-@@ -539,12 +542,10 @@ void LLAssetStorage::downloadCompleteCallback(
- return;
- }
-
-- req->setUUID(file_id);
-- req->setType(file_type);
- if (LL_ERR_NOERR == result)
- {
- // we might have gotten a zero-size file
-- LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
-+ LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
- if (vfile.getSize() <= 0)
- {
- llwarns << "downloadCompleteCallback has non-existent or zero-size asset " << req->getUUID() << llendl;
-@@ -563,7 +564,7 @@ void LLAssetStorage::downloadCompleteCallback(
- {
- request_list_t::iterator curiter = iter++;
- LLAssetRequest* tmp = *curiter;
-- if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
-+ if ((tmp->getUUID() == file_id) && (tmp->getType() == file_type))
- {
- requests.push_front(tmp);
- iter = gAssetStorage->mPendingDownloads.erase(curiter);
-@@ -576,7 +577,7 @@ void LLAssetStorage::downloadCompleteCallback(
- LLAssetRequest* tmp = *curiter;
- if (tmp->mDownCallback)
- {
-- tmp->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), tmp->mUserData, result, ext_status);
-+ tmp->mDownCallback(gAssetStorage->mVFS, tmp->getUUID(), tmp->getType(), tmp->mUserData, result, ext_status);
- }
- delete tmp;
- }
-@@ -672,10 +673,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
- S32 result,
- const LLUUID& file_id,
- LLAssetType::EType file_type,
-- void* user_data,
-+ void* callback_parm_req,
- LLExtStat ext_status)
- {
-- LLEstateAssetRequest *req = (LLEstateAssetRequest*)user_data;
-+ LLEstateAssetRequest *req = (LLEstateAssetRequest*)callback_parm_req;
- if(!req)
- {
- llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
-@@ -689,12 +690,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
- return;
- }
-
-- req->setUUID(file_id);
-- req->setType(file_type);
- if (LL_ERR_NOERR == result)
- {
- // we might have gotten a zero-size file
-- LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getAType());
-+ LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
- if (vfile.getSize() <= 0)
- {
- llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
-@@ -704,7 +703,9 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
- }
- }
-
-- req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getAType(), req->mUserData, result, ext_status);
-+ req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
-+
-+ delete req;
- }
-
- void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,
-@@ -809,10 +810,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
- S32 result,
- const LLUUID& file_id,
- LLAssetType::EType file_type,
-- void* user_data,
-+ void* callback_parm_req,
- LLExtStat ext_status)
- {
-- LLInvItemRequest *req = (LLInvItemRequest*)user_data;
-+ LLInvItemRequest *req = (LLInvItemRequest*)callback_parm_req;
- if(!req)
- {
- llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
-@@ -825,12 +826,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
- return;
- }
-
-- req->setUUID(file_id);
-- req->setType(file_type);
- if (LL_ERR_NOERR == result)
- {
- // we might have gotten a zero-size file
-- LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
-+ LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
- if (vfile.getSize() <= 0)
- {
- llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
-@@ -840,7 +839,9 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
- }
- }
-
-- req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), req->mUserData, result, ext_status);
-+ req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
-+
-+ delete req;
- }
-
- /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
---
-tg: (c8fb40a..) topic/fixes/thirdparty/0001_possible_crash_and_leak_llassetstorage.patch (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/0001_possible_crash_in_llviewerpartssim.diff b/debian/patches/topic/fixes/thirdparty/0001_possible_crash_in_llviewerpartssim.diff
deleted file mode 100644
index 814bbec..0000000
--- a/debian/patches/topic/fixes/thirdparty/0001_possible_crash_in_llviewerpartssim.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/0001_possible_crash_in_llviewerpartssim
-
-Another possible crash fix
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/llviewerpartsim.cpp | 13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
-index 95fb307..8ab456b 100644
---- a/indra/newview/llviewerpartsim.cpp
-+++ b/indra/newview/llviewerpartsim.cpp
-@@ -686,10 +686,17 @@ void LLViewerPartSim::updateSimulation()
- S32 visirate = 1;
- if (vobj)
- {
-- LLSpatialGroup* group = vobj->mDrawable->getSpatialGroup();
-- if (group && !group->isVisible()) // && !group->isState(LLSpatialGroup::OBJECT_DIRTY))
-+ if(vobj->mDrawable)
- {
-- visirate = 8;
-+ LLSpatialGroup* group = vobj->mDrawable->getSpatialGroup();
-+ if (group && !group->isVisible()) // && !group->isState(LLSpatialGroup::OBJECT_DIRTY))
-+ {
-+ visirate = 8;
-+ }
-+ }
-+ else
-+ {
-+ llwarns << "Crash avoided, vobj->mDrawable is NULL" << llendl;
- }
- }
-
---
-tg: (c8fb40a..) topic/fixes/thirdparty/0001_possible_crash_in_llviewerpartssim (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/1294_llworkerthread_when_terminating_program.patch.diff b/debian/patches/topic/fixes/thirdparty/1294_llworkerthread_when_terminating_program.patch.diff
deleted file mode 100644
index 71db1ca..0000000
--- a/debian/patches/topic/fixes/thirdparty/1294_llworkerthread_when_terminating_program.patch.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/1294_llworkerthread_when_terminating_program.patch
-
-Kill a llworker thread when exiting
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llcommon/llworkerthread.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
-index 0389cff..cb6c2ec 100644
---- a/indra/llcommon/llworkerthread.cpp
-+++ b/indra/llcommon/llworkerthread.cpp
-@@ -111,7 +111,7 @@ S32 LLWorkerThread::update(U32 max_time_ms)
- }
- LLWorkerClass::sDeleteLock = FALSE ;
- // delete and aborted entries mean there's still work to do
-- res += delete_list.size() + abort_list.size();
-+ res += !mDeleteList.empty() + !delete_list.empty(); // deleted entries mean there's still work to do
- return res;
- }
-
---
-tg: (c8fb40a..) topic/fixes/thirdparty/1294_llworkerthread_when_terminating_program.patch (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/1857_apr_thread_mutex_nested.patch.diff b/debian/patches/topic/fixes/thirdparty/1857_apr_thread_mutex_nested.patch.diff
deleted file mode 100644
index 4fca000..0000000
--- a/debian/patches/topic/fixes/thirdparty/1857_apr_thread_mutex_nested.patch.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/1857_apr_thread_mutex_nested.patch
-
-Fix issue with nested apt thread mutex
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llcommon/llapr.cpp | 2 +-
- indra/llcommon/llthread.cpp | 2 +-
- indra/llmessage/llpumpio.cpp | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
-index 17c753d..9f52960 100644
---- a/indra/llcommon/llapr.cpp
-+++ b/indra/llcommon/llapr.cpp
-@@ -47,7 +47,7 @@ void ll_init_apr()
- apr_pool_create(&gAPRPoolp, NULL);
-
- // Initialize the logging mutex
-- apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
-+ apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_NESTED, gAPRPoolp);
- }
- }
-
-diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
-index 8bc9aac..dab5cd2 100644
---- a/indra/llcommon/llthread.cpp
-+++ b/indra/llcommon/llthread.cpp
-@@ -276,7 +276,7 @@ LLMutex::LLMutex(apr_pool_t *poolp) :
- mIsLocalPool = TRUE;
- apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
- }
-- apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_UNNESTED, mAPRPoolp);
-+ apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_NESTED, mAPRPoolp);
- }
-
-
-diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp
-index 467502b..35a6d21 100644
---- a/indra/llmessage/llpumpio.cpp
-+++ b/indra/llmessage/llpumpio.cpp
-@@ -830,8 +830,8 @@ void LLPumpIO::initialize(apr_pool_t* pool)
- if(!pool) return;
- #if LL_THREADS_APR
- // SJB: Windows defaults to NESTED and OSX defaults to UNNESTED, so use UNNESTED explicitly.
-- apr_thread_mutex_create(&mChainsMutex, APR_THREAD_MUTEX_UNNESTED, pool);
-- apr_thread_mutex_create(&mCallbackMutex, APR_THREAD_MUTEX_UNNESTED, pool);
-+ apr_thread_mutex_create(&mChainsMutex, APR_THREAD_MUTEX_NESTED, pool);
-+ apr_thread_mutex_create(&mCallbackMutex, APR_THREAD_MUTEX_NESTED, pool);
- #endif
- mPool = pool;
- }
---
-tg: (c8fb40a..) topic/fixes/thirdparty/1857_apr_thread_mutex_nested.patch (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/2003_possible_crash_draganddrop.patch.diff b/debian/patches/topic/fixes/thirdparty/2003_possible_crash_draganddrop.patch.diff
deleted file mode 100644
index 510c2c0..0000000
--- a/debian/patches/topic/fixes/thirdparty/2003_possible_crash_draganddrop.patch.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/2003_possible_crash_draganddrop.patch
-
-Possible crash fix
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/lltooldraganddrop.cpp | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
-index 39070b7..72ee24b 100644
---- a/indra/newview/lltooldraganddrop.cpp
-+++ b/indra/newview/lltooldraganddrop.cpp
-@@ -850,6 +850,12 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
- {
- LLInventoryObject* cargo = locateInventory(item, cat);
-
-+ if (!cargo)
-+ {
-+ handled = FALSE;
-+ break;
-+ }
-+
- EAcceptance item_acceptance = ACCEPT_NO;
- handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE,
- mCargoTypes[mCurItemIndex],
---
-tg: (c8fb40a..) topic/fixes/thirdparty/2003_possible_crash_draganddrop.patch (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/2543_possible_crash_in_group_voting_propsals.patch.diff b/debian/patches/topic/fixes/thirdparty/2543_possible_crash_in_group_voting_propsals.patch.diff
deleted file mode 100644
index f913494..0000000
--- a/debian/patches/topic/fixes/thirdparty/2543_possible_crash_in_group_voting_propsals.patch.diff
+++ /dev/null
@@ -1,126 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/2543_possible_crash_in_group_voting_propsals.patch
-
-Possible crash fix
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/llui/llscrolllistctrl.cpp | 18 ++++++++++++++++++
- indra/newview/llpanelgroupvoting.cpp | 9 ++++++++-
- 2 files changed, 26 insertions(+), 1 deletions(-)
-
-diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
-index 92bcb88..c990a1f 100644
---- a/indra/llui/llscrolllistctrl.cpp
-+++ b/indra/llui/llscrolllistctrl.cpp
-@@ -676,6 +676,11 @@ void LLScrollListCtrl::clearRows()
-
- LLScrollListItem* LLScrollListCtrl::getFirstSelected() const
- {
-+ if (!getCanSelect())
-+ {
-+ return NULL;
-+ }
-+
- item_list::const_iterator iter;
- for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
- {
-@@ -691,6 +696,13 @@ LLScrollListItem* LLScrollListCtrl::getFirstSelected() const
- std::vector<LLScrollListItem*> LLScrollListCtrl::getAllSelected() const
- {
- std::vector<LLScrollListItem*> ret;
-+
-+ if (!getCanSelect())
-+ {
-+ return ret;
-+ }
-+
-+
- item_list::const_iterator iter;
- for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
- {
-@@ -705,6 +717,12 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllSelected() const
-
- S32 LLScrollListCtrl::getFirstSelectedIndex() const
- {
-+ if (!getCanSelect())
-+ {
-+ return -1;
-+ }
-+
-+
- S32 CurSelectedIndex = 0;
- item_list::const_iterator iter;
- for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
-diff --git a/indra/newview/llpanelgroupvoting.cpp b/indra/newview/llpanelgroupvoting.cpp
-index b1e3e15..5d21f4e 100644
---- a/indra/newview/llpanelgroupvoting.cpp
-+++ b/indra/newview/llpanelgroupvoting.cpp
-@@ -592,6 +592,7 @@ void LLPanelGroupVoting::impl::sendGroupProposalsRequest(const LLUUID& group_id)
- //we're pining the server in high latency situations
- addPendingActiveScrollListItem(0, 0, ADD_BOTTOM);
- mProposals->setCanSelect(FALSE);
-+ mBtnViewProposalItem->setEnabled(FALSE);
-
- LLMessageSystem *msg = gMessageSystem;
- msg->newMessageFast(_PREHASH_GroupActiveProposalsRequest);
-@@ -870,6 +871,7 @@ void LLPanelGroupVoting::impl::sendGroupVoteHistoryRequest(const LLUUID& group_i
- //add some text so the user knows we're doing something
- addPendingHistoryScrollListItem(0, 0, ADD_BOTTOM);
- mVotesHistory->setCanSelect(FALSE);
-+ mBtnViewHistoryItem->setEnabled(FALSE);
-
- LLMessageSystem *msg = gMessageSystem;
- msg->newMessageFast(_PREHASH_GroupVoteHistoryRequest);
-@@ -1066,6 +1068,7 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
- //no active proposals and make the scroll list unselectable
- self->addNoActiveScrollListItem(ADD_BOTTOM);
- self->mProposals->setCanSelect(FALSE);
-+ self->mBtnViewProposalItem->setEnabled(FALSE);
- }
- else if ( (U32)received != num_expected )
- {
-@@ -1073,6 +1076,7 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
- num_expected,
- ADD_BOTTOM);
- self->mProposals->setCanSelect(FALSE);
-+ self->mBtnViewProposalItem->setEnabled(FALSE);
- }
- else
- {
-@@ -1086,6 +1090,7 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
- }
-
- self->mProposals->setCanSelect(TRUE);
-+ self->mBtnViewProposalItem->setEnabled(TRUE);
- }
- }
-
-@@ -1134,7 +1139,7 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
- //no active proposals and make the scroll list unselectable
- self->addNoHistoryScrollListItem(ADD_BOTTOM);
- self->mVotesHistory->setCanSelect(FALSE);
--
-+ self->mBtnViewHistoryItem->setEnabled(FALSE);
- return;
- }
-
-@@ -1248,6 +1253,7 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
- num_expected,
- ADD_BOTTOM);
- self->mVotesHistory->setCanSelect(FALSE);
-+ self->mBtnViewHistoryItem->setEnabled(FALSE);
- }
- else
- {
-@@ -1261,6 +1267,7 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
- }
-
- self->mVotesHistory->setCanSelect(TRUE);
-+ self->mBtnViewHistoryItem->setEnabled(TRUE);
- }
- }
-
---
-tg: (c8fb40a..) topic/fixes/thirdparty/2543_possible_crash_in_group_voting_propsals.patch (depends on: upstream)
diff --git a/debian/patches/topic/fixes/thirdparty/2683_possible_crash_update_speaker_list.patch.diff b/debian/patches/topic/fixes/thirdparty/2683_possible_crash_update_speaker_list.patch.diff
deleted file mode 100644
index 479aca8..0000000
--- a/debian/patches/topic/fixes/thirdparty/2683_possible_crash_update_speaker_list.patch.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Robin Cornelius <robin.cornelius at gmail.com>
-Subject: [PATCH] topic/fixes/thirdparty/2683_possible_crash_update_speaker_list.patch
-
-Possible crash fix
-
-Signed-off-by: Robin Cornelius <robin.cornelius at gmail.com>
-
----
- indra/newview/llfloateractivespeakers.cpp | 4 ++--
- indra/newview/llviewerobjectlist.cpp | 4 ++++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp
-index bee6155..7c12e15 100644
---- a/indra/newview/llfloateractivespeakers.cpp
-+++ b/indra/newview/llfloateractivespeakers.cpp
-@@ -1369,7 +1369,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
- for(avatar_it = LLCharacter::sInstances.begin(); avatar_it != LLCharacter::sInstances.end(); ++avatar_it)
- {
- LLVOAvatar* avatarp = (LLVOAvatar*)*avatar_it;
-- if (dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
-+ if (!avatarp->isDead() && dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
- {
- setSpeaker(avatarp->getID());
- }
-@@ -1383,7 +1383,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
- if (speakerp->mStatus == LLSpeaker::STATUS_TEXT_ONLY)
- {
- LLVOAvatar* avatarp = (LLVOAvatar*)gObjectList.findObject(speaker_id);
-- if (!avatarp || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
-+ if (!avatarp || avatarp->isDead() || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
- {
- speakerp->mStatus = LLSpeaker::STATUS_NOT_IN_CHANNEL;
- speakerp->mDotColor = INACTIVE_COLOR;
-diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
-index f3d7bd9..e81c78c 100644
---- a/indra/newview/llviewerobjectlist.cpp
-+++ b/indra/newview/llviewerobjectlist.cpp
-@@ -873,6 +873,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
- if (objectp->mRegionp == regionp)
- {
- killObject(objectp);
-+
-+ // invalidate region pointer. region will become invalid, but
-+ // refcounted objects may survive the cleanDeadObjects() call below
-+ objectp->mRegionp = NULL;
- }
- }
-
---
-tg: (c8fb40a..) topic/fixes/thirdparty/2683_possible_crash_update_speaker_list.patch (depends on: upstream)
diff --git a/debian/patches/topic/pandora/add_support_for_libcwd.diff b/debian/patches/topic/pandora/add_support_for_libcwd.diff
deleted file mode 100644
index 6357a37..0000000
--- a/debian/patches/topic/pandora/add_support_for_libcwd.diff
+++ /dev/null
@@ -1,815 +0,0 @@
-From: Carlo Wood <carlo at alinoe.com>
-Subject: [PATCH] topic/pandora/add_support_for_libcwd
-
-This adds support for libcwd (version 1.0.1 or higher).
-In order to actually link with libcwd_r, you need to set
-the correct environment variables (and reconfigure):
-
-LDFLAGS+=" $(pkg-config --libs libcwd_r)"
-CXXFLAGS+=" $(pkg-config --cflags libcwd_r)"
-
-Furthermore, for debugging in general, it is
-highly recommended to use:
-
-CXXFLAGS+="-g3"
-DEB_BUILD_OPTIONS="noopt"
-
-This patch also introduces two commands that can be run
-from without gdb:
-
-(gdb) call cwdebug_start
-(gdb) c
-^C
-(gdb) call cwdebug_stop
-
-which starts and stops recording backtraces for
-calls to malloc.
-
-Signed-off-by: Carlo Wood <carlo at alinoe.com>
-
----
- debian/conffiles/libcwd | 19 ++
- indra/CMakeLists.txt | 1 +
- indra/cmake/Cwdebug.cmake | 1 +
- indra/cwdebug/CMakeLists.txt | 31 +++
- indra/cwdebug/cwdebug.h | 9 +
- indra/cwdebug/debug.cc | 388 +++++++++++++++++++++++++++++++
- indra/cwdebug/debug.h | 176 ++++++++++++++
- indra/cwdebug/debug_ostream_operators.h | 1 +
- indra/cwdebug/sys.h | 9 +
- indra/linux_crash_logger/CMakeLists.txt | 2 +
- indra/llcommon/llerror.cpp | 8 +
- indra/newview/CMakeLists.txt | 2 +
- indra/newview/llappviewerlinux.cpp | 3 +
- 13 files changed, 650 insertions(+), 0 deletions(-)
-
-diff --git a/debian/conffiles/libcwd b/debian/conffiles/libcwd
-new file mode 100644
-index 0000000..1b49a26
---- /dev/null
-+++ b/debian/conffiles/libcwd
-@@ -0,0 +1,19 @@
-+# Debug code and actually linking with libcwd_r is only done if
-+# DEB_BUILD_OPTIONS contains the string 'libcwd'.
-+for opt in $DEB_BUILD_OPTIONS dummy; do
-+ if [ "$opt" = "libcwd" ]; then
-+ LDFLAGS+=" $(pkg-config --libs libcwd_r)"
-+ CXXFLAGS+=" $(pkg-config --cflags libcwd_r)"
-+ if [ $? -ne 0 ]; then
-+ exit $?
-+ fi
-+ fi
-+done
-+
-+# We have to use a full path here in order for cmake's 'compile a simple test'
-+# to work. Correct would be to add ${CWDEBUG_INCLUDE_DIRS} to the
-+# include_directories of every CMakeLists.txt, but the whole point of
-+# doing this -include is to avoid too many collision with upstream
-+# changes by NOT having to change a lot of files.
-+CXXFLAGS+=" -I`pwd`/indra/cwdebug -include cwdebug.h"
-+
-diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
-index c473b94..7aa95cc 100644
---- a/indra/CMakeLists.txt
-+++ b/indra/CMakeLists.txt
-@@ -34,6 +34,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/temp)
- file(WRITE ${CMAKE_BINARY_DIR}/temp/sentinel_installed "0")
- add_subdirectory(cmake)
-
-+add_subdirectory(${LIBS_OPEN_PREFIX}cwdebug)
- add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
- add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
- add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
-diff --git a/indra/cmake/Cwdebug.cmake b/indra/cmake/Cwdebug.cmake
-new file mode 100644
-index 0000000..9568a62
---- /dev/null
-+++ b/indra/cmake/Cwdebug.cmake
-@@ -0,0 +1 @@
-+set(CWDEBUG_LIBRARIES cwdebug)
-diff --git a/indra/cwdebug/CMakeLists.txt b/indra/cwdebug/CMakeLists.txt
-new file mode 100644
-index 0000000..e3dc504
---- /dev/null
-+++ b/indra/cwdebug/CMakeLists.txt
-@@ -0,0 +1,31 @@
-+# -*- cmake -*-
-+
-+project(cwdebug)
-+
-+include(00-Common)
-+include(LLCommon)
-+include(LLMath)
-+include(LLMessage)
-+include(LLVFS)
-+
-+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-+
-+set(cwdebug_SOURCE_FILES
-+ debug.cc
-+ )
-+
-+set(cwdebug_HEADER_FILES
-+ CMakeLists.txt
-+
-+ cwdebug.h
-+ sys.h
-+ debug.h
-+ debug_ostream_operators.h
-+ )
-+
-+set_source_files_properties(${cwdebug_HEADER_FILES}
-+ PROPERTIES HEADER_FILE_ONLY TRUE)
-+
-+list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
-+
-+add_library (cwdebug ${cwdebug_SOURCE_FILES})
-diff --git a/indra/cwdebug/cwdebug.h b/indra/cwdebug/cwdebug.h
-new file mode 100644
-index 0000000..37415df
---- /dev/null
-+++ b/indra/cwdebug/cwdebug.h
-@@ -0,0 +1,9 @@
-+// We support compiling C++ source files that are not
-+// thread-safe, but in that case we assume that they
-+// will not be linked with libcwd_r.
-+#if !defined(_REENTRANT) || !defined(__linux__)
-+#undef CWDEBUG
-+#endif
-+
-+#include "sys.h"
-+#include "debug.h"
-diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
-new file mode 100644
-index 0000000..92fa8e4
---- /dev/null
-+++ b/indra/cwdebug/debug.cc
-@@ -0,0 +1,388 @@
-+// slviewer -- Second Life Viewer Source Code
-+//
-+//! @file debug.cc
-+//! @brief This file contains the definitions of debug related objects and functions.
-+//
-+// Copyright (C) 2008, by
-+//
-+// Carlo Wood, Run on IRC <carlo at alinoe.com>
-+// RSA-1024 0x624ACAD5 1997-01-26 Sign & Encrypt
-+// Fingerprint16 = 32 EC A7 B6 AC DB 65 A6 F6 F6 55 DD 1C DC FF 61
-+//
-+// This program is free software: you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation, either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-+
-+#ifndef USE_PCH
-+#include "sys.h" // Needed for platform-specific code
-+#endif
-+
-+#ifdef CWDEBUG
-+
-+#ifndef USE_PCH
-+#include <cctype> // Needed for std::isprint
-+#include <iomanip> // Needed for setfill
-+#include <map>
-+#include <string>
-+#include <sstream>
-+#include <boost/shared_array.hpp>
-+#include "debug.h"
-+#ifdef USE_LIBCW
-+#include <libcw/memleak.h> // memleak_filter
-+#endif
-+#endif // USE_PCH
-+
-+#define BACKTRACE_AQUIRE_LOCK libcwd::_private_::mutex_tct<libcwd::_private_::backtrace_instance>::lock()
-+#define BACKTRACE_RELEASE_LOCK libcwd::_private_::mutex_tct<libcwd::_private_::backtrace_instance>::unlock()
-+
-+namespace debug {
-+
-+static int total_calls = 0;
-+static int number_of_stack_traces = 0;
-+
-+class BackTrace {
-+ private:
-+ boost::shared_array<void*> M_buffer;
-+ int M_frames;
-+ public:
-+ BackTrace(void** buffer, int frames) : M_buffer(new void* [frames]), M_frames(frames) { std::memcpy(M_buffer.get(), buffer, sizeof(void*) * frames); }
-+
-+ friend bool operator<(BackTrace const& bt1, BackTrace const& bt2)
-+ {
-+ if (bt1.M_frames != bt2.M_frames)
-+ return bt1.M_frames < bt2.M_frames;
-+ for (int frame = 0; frame < bt1.M_frames; ++frame)
-+ if (bt1.M_buffer[frame] < bt2.M_buffer[frame])
-+ return true;
-+ else if (bt1.M_buffer[frame] > bt2.M_buffer[frame])
-+ return true;
-+ return false;
-+ }
-+
-+ void dump_backtrace(void) const;
-+
-+ int frames(void) const { return M_frames; }
-+ boost::shared_array<void*> const& buffer(void) const { return M_buffer; }
-+};
-+
-+void BackTrace::dump_backtrace(void) const
-+{
-+ for (int frame = 0; frame < frames(); ++frame)
-+ {
-+ Dout(dc::notice, '#' << frame << ' ' << buffer()[frame] << ' ' << location_ct((char*)buffer()[frame] + libcwd::builtin_return_address_offset));
-+ }
-+}
-+
-+typedef std::map<BackTrace, int, std::less<BackTrace>, libcwd::_private_::internal_allocator> backtrace_map_t;
-+backtrace_map_t* backtrace_map;
-+
-+void my_backtrace_hook(void** buffer, int frames LIBCWD_COMMA_TSD_PARAM)
-+{
-+ ++total_calls;
-+
-+ backtrace_map_t::iterator iter;
-+
-+ set_alloc_checking_off(__libcwd_tsd);
-+ {
-+ BackTrace backtrace(buffer, frames);
-+ std::pair<backtrace_map_t::iterator, bool> res = backtrace_map->insert(backtrace_map_t::value_type(backtrace, 0));
-+ if (res.second)
-+ ++number_of_stack_traces;
-+ ++res.first->second;
-+ iter = res.first;
-+ }
-+ set_alloc_checking_on(__libcwd_tsd);
-+#if 0
-+ // Dump the stack trace.
-+ iter->first.dump_backtrace();
-+#endif
-+}
-+
-+void start_recording_backtraces(void)
-+{
-+ BACKTRACE_AQUIRE_LOCK;
-+ libcwd::backtrace_hook = my_backtrace_hook;
-+ BACKTRACE_RELEASE_LOCK;
-+ //Debug(dc::malloc.on());
-+ LIBCWD_TSD_DECLARATION;
-+ set_alloc_checking_off(__libcwd_tsd);
-+ backtrace_map = new backtrace_map_t;
-+ set_alloc_checking_on(__libcwd_tsd);
-+}
-+
-+struct Compare {
-+ bool operator()(backtrace_map_t::const_iterator const& iter1, backtrace_map_t::const_iterator const& iter2)
-+ {
-+ return iter1->second > iter2->second;
-+ }
-+};
-+
-+void stop_recording_backtraces(void)
-+{
-+ //Debug(dc::malloc.off());
-+ BACKTRACE_AQUIRE_LOCK;
-+ libcwd::backtrace_hook = NULL;
-+
-+ if (!backtrace_map)
-+ {
-+ Dout(dc::notice, "Not recording; call cwdebug_start() first.");
-+ return;
-+ }
-+
-+ Dout(dc::notice, "Total number of calls: " << total_calls);
-+ Dout(dc::notice, "Number of different stack traces: " << number_of_stack_traces);
-+ Dout(dc::notice, "First 10 stack traces:");
-+ std::list<backtrace_map_t::const_iterator> entries;
-+ for (backtrace_map_t::const_iterator iter = backtrace_map->begin(); iter != backtrace_map->end(); ++iter)
-+ entries.push_back(iter);
-+ entries.sort(Compare());
-+ int count = 0;
-+ for (std::list<backtrace_map_t::const_iterator>::iterator iter = entries.begin(); iter != entries.end(); ++iter, ++count)
-+ {
-+ Dout(dc::notice, "Used: " << (*iter)->second);
-+ // Dump the stack trace.
-+ (*iter)->first.dump_backtrace();
-+ if (count == 10)
-+ break;
-+ }
-+
-+ // Clear all data.
-+ LIBCWD_TSD_DECLARATION;
-+ set_alloc_checking_off(__libcwd_tsd);
-+ delete backtrace_map;
-+ set_alloc_checking_on(__libcwd_tsd);
-+ backtrace_map = NULL;
-+ total_calls = 0;
-+ number_of_stack_traces = 0;
-+
-+ BACKTRACE_RELEASE_LOCK;
-+}
-+
-+ namespace channels { // namespace DEBUGCHANNELS
-+ namespace dc {
-+
-+#ifndef DOXYGEN
-+#define DDCN(x) (x)
-+#endif
-+ // Add new debug channels here.
-+
-+ channel_ct viewer DDCN("VIEWER"); //!< This debug channel is used for the normal debugging out of the viewer.
-+
-+ } // namespace dc
-+ } // namespace DEBUGCHANNELS
-+
-+ // Anonymous namespace, this map and its initialization functions are private to this file
-+ // for Thead-safeness reasons.
-+ namespace {
-+
-+ /*! @brief The type of rcfile_dc_states.
-+ * @internal
-+ */
-+ typedef std::map<std::string, bool> rcfile_dc_states_type;
-+
-+ /*! @brief Map containing the default debug channel states used at the start of each new thread.
-+ * @internal
-+ *
-+ * The first thread calls main, which calls debug::init which will initialize this
-+ * map with all debug channel labels and whether or not they were turned on in the
-+ * rcfile or not.
-+ */
-+ rcfile_dc_states_type rcfile_dc_states;
-+
-+ /*! @brief Set the default state of debug channel \a dc_label.
-+ * @internal
-+ *
-+ * This function is called once for each debug channel.
-+ */
-+ void set_state(char const* dc_label, bool is_on)
-+ {
-+ std::pair<rcfile_dc_states_type::iterator, bool> res =
-+ rcfile_dc_states.insert(rcfile_dc_states_type::value_type(std::string(dc_label), is_on));
-+ if (!res.second)
-+ Dout(dc::warning, "Calling set_state() more than once for the same label!");
-+ return;
-+ }
-+
-+ /*! @brief Save debug channel states.
-+ * @internal
-+ *
-+ * One time initialization function of rcfile_dc_state.
-+ * This must be called from debug::init after reading the rcfile.
-+ */
-+ void save_dc_states(void)
-+ {
-+ // We may only call this function once: it reflects the states as stored
-+ // in the rcfile and that won't change. Therefore it is not needed to
-+ // lock `rcfile_dc_states', it is only written to by the first thread
-+ // (once, via main -> init) when there are no other threads yet.
-+ static bool second_time = false;
-+ if (second_time)
-+ {
-+ Dout(dc::warning, "Calling save_dc_states() more than once!");
-+ return;
-+ }
-+ second_time = true;
-+ ForAllDebugChannels( set_state(debugChannel.get_label(), debugChannel.is_on()) );
-+ }
-+
-+ } // anonymous namespace
-+
-+ /*! @brief Returns the the original state of a debug channel.
-+ * @internal
-+ *
-+ * For a given \a dc_label, which must be the exact name (<tt>channel_ct::get_label</tt>) of an
-+ * existing debug channel, this function returns \c true when the corresponding debug channel was
-+ * <em>on</em> at the startup of the application, directly after reading the libcwd runtime
-+ * configuration file (.libcwdrc).
-+ *
-+ * If the label/channel did not exist at the start of the application, it will return \c false
-+ * (note that libcwd disallows adding debug channels to modules - so this would probably
-+ * a bug).
-+ */
-+ bool is_on_in_rcfile(char const* dc_label)
-+ {
-+ rcfile_dc_states_type::const_iterator iter = rcfile_dc_states.find(std::string(dc_label));
-+ if (iter == rcfile_dc_states.end())
-+ {
-+ Dout(dc::warning, "is_on_in_rcfile(\"" << dc_label << "\"): \"" << dc_label << "\" is an unknown label!");
-+ return false;
-+ }
-+ return iter->second;
-+ }
-+
-+#if LIBCWD_THREAD_SAFE
-+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-+ // I can cause I'm the maintainer of libcwd ;).
-+ libcwd::_private_::pthread_lock_interface_ct cout_mutex(&mutex);
-+ libcwd::_private_::lock_interface_base_ct* cout_mutex_ptr(&cout_mutex);
-+#endif
-+
-+ /*! @brief Initialize debugging code from new threads.
-+ *
-+ * This function needs to be called at the start of each new thread,
-+ * because a new thread starts in a completely reset state.
-+ *
-+ * The function turns on all debug channels that were turned on
-+ * after reading the rcfile at the start of the application.
-+ * Furthermore it initializes the debug ostream, its mutex and the
-+ * margin of the default debug object (Dout).
-+ */
-+ void init_thread(void)
-+ {
-+ // Turn on all debug channels that are turned on as per rcfile configuration.
-+ ForAllDebugChannels(
-+ if (!debugChannel.is_on() && is_on_in_rcfile(debugChannel.get_label()))
-+ debugChannel.on();
-+ );
-+
-+ // Turn on debug output.
-+ Debug( libcw_do.on() );
-+#if LIBCWD_THREAD_SAFE
-+ Debug( libcw_do.set_ostream(&std::cout, cout_mutex_ptr) );
-+#else
-+ Debug( libcw_do.set_ostream(&std::cout) );
-+#endif
-+
-+ static bool first_thread = true;
-+ if (!first_thread) // So far, the application has only one thread. So don't add a thread id.
-+ {
-+ // Set the thread id in the margin.
-+ char margin[22];
-+ sprintf(margin, "%-20lu ", pthread_self());
-+ Debug( libcw_do.margin().assign(margin, 21) );
-+ }
-+ }
-+
-+ /*! @brief Initialize debugging code from main.
-+ *
-+ * This function initializes the debug code.
-+ */
-+ void init(void)
-+ {
-+#if CWDEBUG_ALLOC && defined(USE_LIBCW)
-+ // Tell the memory leak detector which parts of the code are
-+ // expected to leak so that we won't get an alarm for those.
-+ {
-+ std::vector<std::pair<std::string, std::string> > hide_list;
-+ hide_list.push_back(std::pair<std::string, std::string>("libdl.so.2", "_dlerror_run"));
-+ hide_list.push_back(std::pair<std::string, std::string>("libstdc++.so.6", "__cxa_get_globals"));
-+ // The following is actually necessary because of a bug in glibc
-+ // (see http://sources.redhat.com/bugzilla/show_bug.cgi?id=311).
-+ hide_list.push_back(std::pair<std::string, std::string>("libc.so.6", "dl_open_worker"));
-+ memleak_filter().hide_functions_matching(hide_list);
-+ }
-+ {
-+ std::vector<std::string> hide_list;
-+ // Also because of http://sources.redhat.com/bugzilla/show_bug.cgi?id=311
-+ hide_list.push_back(std::string("ld-linux.so.2"));
-+ memleak_filter().hide_objectfiles_matching(hide_list);
-+ }
-+ memleak_filter().set_flags(libcwd::show_objectfile|libcwd::show_function);
-+#endif
-+
-+ // The following call allocated the filebuf's of cin, cout, cerr, wcin, wcout and wcerr.
-+ // Because this causes a memory leak being reported, make them invisible.
-+ Debug(set_invisible_on());
-+
-+ // You want this, unless you mix streams output with C output.
-+ // Read http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#8 for an explanation.
-+ //std::ios::sync_with_stdio(false);
-+
-+ // Cancel previous call to set_invisible_on.
-+ Debug(set_invisible_off());
-+
-+ // This will warn you when you are using header files that do not belong to the
-+ // shared libcwd object that you linked with.
-+ Debug( check_configuration() );
-+
-+ Debug(
-+ libcw_do.on(); // Show which rcfile we are reading!
-+ ForAllDebugChannels(
-+ while (debugChannel.is_on())
-+ debugChannel.off() // Print as little as possible though.
-+ );
-+ read_rcfile(); // Put 'silent = on' in the rcfile to suppress most of the output here.
-+ libcw_do.off()
-+ );
-+ save_dc_states();
-+
-+ init_thread();
-+ }
-+
-+#if CWDEBUG_LOCATION
-+ /*! @brief Return call location.
-+ *
-+ * @param return_addr The return address of the call.
-+ */
-+ std::string call_location(void const* return_addr)
-+ {
-+ libcwd::location_ct loc((char*)return_addr + libcwd::builtin_return_address_offset);
-+ std::ostringstream convert;
-+ convert << loc;
-+ return convert.str();
-+ }
-+#endif
-+
-+} // namespace debug
-+
-+// These can be called from gdb.
-+void cwdebug_start()
-+{
-+ debug::start_recording_backtraces();
-+}
-+
-+void cwdebug_stop()
-+{
-+ debug::stop_recording_backtraces();
-+}
-+
-+#endif // CWDEBUG
-diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
-new file mode 100644
-index 0000000..0fe75c5
---- /dev/null
-+++ b/indra/cwdebug/debug.h
-@@ -0,0 +1,176 @@
-+// slviewer -- Second Life Viewer Source Code
-+//
-+//! @file debug.h
-+//! @brief This file contains the declaration of debug related macros, objects and functions.
-+//
-+// Copyright (C) 2008, by
-+//
-+// Carlo Wood, Run on IRC <carlo at alinoe.com>
-+// RSA-1024 0x624ACAD5 1997-01-26 Sign & Encrypt
-+// Fingerprint16 = 32 EC A7 B6 AC DB 65 A6 F6 F6 55 DD 1C DC FF 61
-+//
-+// This program is free software: you can redistribute it and/or modify
-+// it under the terms of the GNU General Public License as published by
-+// the Free Software Foundation, either version 2 of the License, or
-+// (at your option) any later version.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+// GNU General Public License for more details.
-+//
-+// You should have received a copy of the GNU General Public License
-+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-+
-+#ifndef DEBUG_H
-+#define DEBUG_H
-+
-+#ifndef CWDEBUG
-+
-+#ifndef DOXYGEN // No need to document this. See http://libcwd.sourceforge.net/ for more info.
-+
-+#include <iostream>
-+#include <cstdlib> // std::exit, EXIT_FAILURE
-+
-+#define AllocTag1(p)
-+#define AllocTag2(p, desc)
-+#define AllocTag_dynamic_description(p, x)
-+#define AllocTag(p, x)
-+#define Debug(x)
-+#define Dout(a, b)
-+#define DoutEntering(a, b)
-+#define DoutFatal(a, b) LibcwDoutFatal(::std, , a, b)
-+#define ForAllDebugChannels(STATEMENT)
-+#define ForAllDebugObjects(STATEMENT)
-+#define LibcwDebug(dc_namespace, x)
-+#define LibcwDout(a, b, c, d)
-+#define LibcwDoutFatal(a, b, c, d) do { ::std::cerr << d << ::std::endl; ::std::exit(EXIT_FAILURE); } while (1)
-+#define NEW(x) new x
-+#define CWDEBUG_ALLOC 0
-+#define CWDEBUG_MAGIC 0
-+#define CWDEBUG_LOCATION 0
-+#define CWDEBUG_LIBBFD 0
-+#define CWDEBUG_DEBUG 0
-+#define CWDEBUG_DEBUGOUTPUT 0
-+#define CWDEBUG_DEBUGM 0
-+#define CWDEBUG_DEBUGT 0
-+#define CWDEBUG_MARKER 0
-+
-+#endif // !DOXYGEN
-+
-+#include <cassert>
-+#ifdef DEBUG
-+#define ASSERT(x) assert(x)
-+#else
-+#define ASSERT(x)
-+#endif
-+
-+#else // CWDEBUG
-+
-+//! Assert \a x, if debugging is turned on.
-+#define ASSERT(x) LIBCWD_ASSERT(x)
-+
-+#ifndef DEBUGCHANNELS
-+//! @brief The namespace in which the \c dc namespace is declared.
-+//
-+// <A HREF="http://libcwd.sourceforge.net/">Libcwd</A> demands that this macro is defined
-+// before <libcwd/debug.h> is included and must be the name of the namespace containing
-+// the \c dc (Debug Channels) namespace.
-+//
-+// @sa debug::channels::dc
-+
-+#define DEBUGCHANNELS ::debug::channels
-+#endif
-+#include <libcwd/debug.h>
-+
-+//! Debug specific code.
-+namespace debug {
-+
-+void init(void); // Initialize debugging code, called once from main.
-+void init_thread(void); // Initialize debugging code, called once for each thread.
-+
-+//! @brief Debug Channels (dc) namespace.
-+//
-+// @sa debug::channels::dc
-+namespace channels { // namespace DEBUGCHANNELS
-+
-+//! The namespace containing the actual debug channels.
-+namespace dc {
-+using namespace libcwd::channels::dc;
-+using libcwd::channel_ct;
-+
-+#ifndef DOXYGEN // Doxygen bug causes a warning here.
-+// Add the declaration of new debug channels here
-+// and add their definition in a custom debug.cc file.
-+extern channel_ct viewer; // The normal logging output of the viewer (normally to stderr).
-+
-+#endif
-+
-+} // namespace dc
-+} // namespace DEBUGCHANNELS
-+
-+#if CWDEBUG_LOCATION
-+std::string call_location(void const* return_addr);
-+#endif
-+
-+//! @brief Interface for marking scopes of invisible memory allocations.
-+//
-+// Creation of the object does nothing, you have to explicitly call
-+// InvisibleAllocations::on. Destruction of the object automatically
-+// cancels any call to \c on of this object. This makes it exception-
-+// (stack unwinding) and recursive-safe.
-+struct InvisibleAllocations {
-+ int M_on; //!< The number of times that InvisibleAllocations::on() was called.
-+ //! Constructor.
-+ InvisibleAllocations() : M_on(0) { }
-+ //! Destructor.
-+ ~InvisibleAllocations() { while (M_on > 0) off(); }
-+ //! Set invisible allocations on. Can be called recursively.
-+ void on(void) { libcwd::set_invisible_on(); ++M_on; }
-+ //! Cancel one call to on().
-+ void off(void) { assert(M_on > 0); --M_on; libcwd::set_invisible_off(); }
-+};
-+
-+//! @brief Interface for marking scopes with indented debug output.
-+//
-+// Creation of the object increments the debug indentation. Destruction
-+// of the object automatically decrements the indentation again.
-+struct Indent {
-+ int M_indent; //!< The extra number of spaces that were added to the indentation.
-+ //! Construct an Indent object.
-+ Indent(int indent) : M_indent(indent) { if (M_indent > 0) libcwd::libcw_do.inc_indent(M_indent); }
-+ //! Destructor.
-+ ~Indent() { if (M_indent > 0) libcwd::libcw_do.dec_indent(M_indent); }
-+};
-+
-+} // namespace debug
-+
-+//! Debugging macro.
-+//
-+// Print "Entering " << \a data to channel \a cntrl and increment
-+// debugging output indentation until the end of the current scope.
-+#define DoutEntering(cntrl, data) \
-+ int __slviewer_debug_indentation = 2; \
-+ { \
-+ LIBCWD_TSD_DECLARATION; \
-+ if (LIBCWD_DO_TSD_MEMBER_OFF(::libcwd::libcw_do) < 0) \
-+ { \
-+ ::libcwd::channel_set_bootstrap_st __libcwd_channel_set(LIBCWD_DO_TSD(::libcwd::libcw_do) LIBCWD_COMMA_TSD); \
-+ bool on; \
-+ { \
-+ using namespace LIBCWD_DEBUGCHANNELS; \
-+ on = (__libcwd_channel_set|cntrl).on; \
-+ } \
-+ if (on) \
-+ Dout(cntrl, "Entering " << data); \
-+ else \
-+ __slviewer_debug_indentation = 0; \
-+ } \
-+ } \
-+ debug::Indent __slviewer_debug_indent(__slviewer_debug_indentation);
-+
-+#endif // CWDEBUG
-+
-+#include "debug_ostream_operators.h"
-+
-+#endif // DEBUG_H
-diff --git a/indra/cwdebug/debug_ostream_operators.h b/indra/cwdebug/debug_ostream_operators.h
-new file mode 100644
-index 0000000..4459e9f
---- /dev/null
-+++ b/indra/cwdebug/debug_ostream_operators.h
-@@ -0,0 +1 @@
-+// Empty so far...
-diff --git a/indra/cwdebug/sys.h b/indra/cwdebug/sys.h
-new file mode 100644
-index 0000000..c18df17
---- /dev/null
-+++ b/indra/cwdebug/sys.h
-@@ -0,0 +1,9 @@
-+// The following is the libcwd related mandatory part.
-+// It must be included before any system header file is included.
-+#ifdef CWDEBUG
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <libcwd/sys.h>
-+#endif
-+
-diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
-index 6f6754e..edc0a94 100644
---- a/indra/linux_crash_logger/CMakeLists.txt
-+++ b/indra/linux_crash_logger/CMakeLists.txt
-@@ -11,6 +11,7 @@ include(LLVFS)
- include(LLXML)
- include(Linking)
- include(UI)
-+include(Cwdebug)
-
- include_directories(
- ${LLCOMMON_INCLUDE_DIRS}
-@@ -52,6 +53,7 @@ target_link_libraries(linux-crash-logger
- ${LLCOMMON_LIBRARIES}
- ${UI_LIBRARIES}
- ${DB_LIBRARIES}
-+ ${CWDEBUG_LIBRARIES}
- )
-
- add_custom_command(
-diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
-index 5c7c3cd..0593d6b 100644
---- a/indra/llcommon/llerror.cpp
-+++ b/indra/llcommon/llerror.cpp
-@@ -162,7 +162,15 @@ namespace {
- break;
- }
- }
-+#ifdef CWDEBUG
-+ // Include normal logging in libcwd's message processing.
-+ // This takes care of prefixing with thread ID's, locking
-+ // and allows us to (temporarily) turn off normal logging
-+ // output.
-+ Dout(dc::viewer, message);
-+#else
- fprintf(stderr, "%s\n", message.c_str());
-+#endif
- if (ANSI_YES == mUseANSI) colorANSI("0"); // reset
- }
-
-diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
-index 4dd4c74..fafc547 100644
---- a/indra/newview/CMakeLists.txt
-+++ b/indra/newview/CMakeLists.txt
-@@ -34,6 +34,7 @@ include(UI)
- include(UnixInstall)
- include(LLKDU)
- include(ViewerMiscLibs)
-+include(Cwdebug)
-
- if (WINDOWS)
- include(CopyWinLibs)
-@@ -1410,6 +1411,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
- ${WINDOWS_LIBRARIES}
- ${XMLRPCEPI_LIBRARIES}
- ${ELFIO_LIBRARIES}
-+ ${CWDEBUG_LIBRARIES}
- )
-
- build_version(viewer)
-diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
-index 643013b..7d1e71d 100644
---- a/indra/newview/llappviewerlinux.cpp
-+++ b/indra/newview/llappviewerlinux.cpp
-@@ -93,6 +93,9 @@ static void exceptionTerminateHandler()
-
- int main( int argc, char **argv )
- {
-+ Debug(debug::init());
-+ Debug(libcw_do.on());
-+
- LLMemType mt1(LLMemType::MTYPE_STARTUP);
-
- #if LL_SOLARIS && defined(__sparc)
---
-tg: (b606591..) topic/pandora/add_support_for_libcwd (depends on: master)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 563caaa..17b26d4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -57,6 +57,7 @@ Alissa Sabre
VWR-7168
VWR-7087
VWR-7086
+ VWR-10728
Angus Boyd
VWR-592
Argent Stonecutter
@@ -133,6 +134,8 @@ Fluf Fredriksson
VWR-3450
Fremont Cunningham
VWR-1147
+Geneko Nemeth
+ CT-117
Gudmund Shepherd
VWR-1873
Gigs Taggart
@@ -203,6 +206,8 @@ Kage Pixel
Kunnis Basiat
VWR-82
VWR-102
+maciek marksman
+ CT-86
march Korda
SVC-1020
Matthew Dowd
@@ -321,6 +326,9 @@ Peekay Semyorka
VWR-19
VWR-49
VWR-79
+princess niven
+ VWR-5733
+ CT-85
Renault Clio
VWR-1976
Robin Cornelius
diff --git a/indra/llaudio/audioengine.cpp b/indra/llaudio/audioengine.cpp
index 298ab1d..baea815 100644
--- a/indra/llaudio/audioengine.cpp
+++ b/indra/llaudio/audioengine.cpp
@@ -170,13 +170,6 @@ void LLAudioEngine::updateChannels()
{
if (mChannels[i])
{
- // set secondary gain if type is available
- LLAudioSource* source = mChannels[i]->getSource();
- if (source)
- {
- mChannels[i]->setSecondaryGain(mSecondaryGain[source->getType()]);
- }
-
mChannels[i]->updateBuffer();
mChannels[i]->update3DPosition();
mChannels[i]->updateLoop();
@@ -1578,6 +1571,8 @@ void LLAudioChannel::setSource(LLAudioSource *sourcep)
}
mCurrentSourcep = sourcep;
+
+
updateBuffer();
update3DPosition();
}
@@ -1592,6 +1587,12 @@ BOOL LLAudioChannel::updateBuffer()
return FALSE;
}
+ // Initialize the channel's gain setting for this sound.
+ if(gAudiop)
+ {
+ setSecondaryGain(gAudiop->getSecondaryGain(mCurrentSourcep->getType()));
+ }
+
LLAudioBuffer *bufferp = mCurrentSourcep->getCurrentBuffer();
if (bufferp == mCurrentBufferp)
{
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index e027fad..1750068 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 22;
-const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Release";
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 3abbb2d..9672af3 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -123,6 +123,33 @@ void trimSLLog(std::string& sllog)
}
}
+std::string getStartupStateFromLog(std::string& sllog)
+{
+ std::string startup_state = "STATE_FIRST";
+ std::string startup_token = "Startup state changing from ";
+
+ int index = sllog.rfind(startup_token);
+ if (index < 0 || index + startup_token.length() > sllog.length()) {
+ return startup_state;
+ }
+
+ // find new line
+ char cur_char = sllog[index + startup_token.length()];
+ std::string::size_type newline_loc = index + startup_token.length();
+ while(cur_char != '\n' && newline_loc < sllog.length())
+ {
+ newline_loc++;
+ cur_char = sllog[newline_loc];
+ }
+
+ // get substring and find location of " to "
+ std::string state_line = sllog.substr(index, newline_loc - index);
+ std::string::size_type state_index = state_line.find(" to ");
+ startup_state = state_line.substr(state_index + 4, state_line.length() - state_index - 4);
+
+ return startup_state;
+}
+
void LLCrashLogger::gatherFiles()
{
@@ -232,6 +259,10 @@ void LLCrashLogger::gatherFiles()
std::string crash_info = s.str();
if(itr->first == "SecondLifeLog")
{
+ if(!mCrashInfo["DebugLog"].has("StartupState"))
+ {
+ mCrashInfo["DebugLog"]["StartupState"] = getStartupStateFromLog(crash_info);
+ }
trimSLLog(crash_info);
}
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 68529b6..13dea38 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -465,7 +465,8 @@ void LLImageJPEG::errorOutputMessage( j_common_ptr cinfo )
char buffer[JMSG_LENGTH_MAX]; /* Flawfinder: ignore */
(*cinfo->err->format_message) (cinfo, buffer);
- ((LLImageJPEG*) cinfo->client_data)->setLastError( buffer );
+ std::string error = buffer ;
+ LLImage::setLastError(error);
BOOL is_decode = (cinfo->is_decompressor != 0);
llwarns << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << llendl;
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 7b6c6a9..d87bae3 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1759,13 +1759,24 @@ BOOL LLVolume::generate()
if (regenPath || regenProf )
{
- sNumMeshPoints -= mMesh.size();
- mMesh.resize(mProfilep->mProfile.size() * mPathp->mPath.size());
- sNumMeshPoints += mMesh.size();
-
S32 sizeS = mPathp->mPath.size();
S32 sizeT = mProfilep->mProfile.size();
+ //debug info
+ if((U32)(sizeS * sizeT) > (1u << 20))
+ {
+ llinfos << "regenPath: " << (S32)regenPath << " regenProf: " << (S32)regenProf << llendl ;
+ llinfos << "sizeS: " << sizeS << " sizeT: " << sizeT << llendl ;
+ llinfos << "path_detail : " << path_detail << " split: " << split << " profile_detail: " << profile_detail << llendl ;
+ llinfos << mParams << llendl ;
+
+ llerrs << "LLVolume corrupted!" << llendl ;
+ }
+
+ sNumMeshPoints -= mMesh.size();
+ mMesh.resize(sizeT * sizeS);
+ sNumMeshPoints += mMesh.size();
+
//generate vertex positions
// Run along the path.
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index a41b931..9a392d7 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -748,7 +748,7 @@ BOOL LLImageGL::setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S3
// Copy sub image from frame buffer
BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height)
{
- if (gGL.getTexUnit(0)->bind(this))
+ if (gGL.getTexUnit(0)->bind(this, true))
{
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height);
mInitialized = true;
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index a15f44a..fcd76d4 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -175,7 +175,7 @@ void LLTexUnit::disable(void)
}
}
-bool LLTexUnit::bind(const LLImageGL* texture)
+bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind)
{
if (mIndex < 0) return false;
@@ -183,29 +183,27 @@ bool LLTexUnit::bind(const LLImageGL* texture)
if (texture == NULL)
{
- return texture->bindError(mIndex);
+ llwarns << "NULL LLTexUnit::bind texture" << llendl;
+ return false;
}
- if (!texture->isInitialized())
+ if (!texture->isInitialized() && !forceBind)
{
return texture->bindDefaultImage(mIndex);
}
+
if (!texture->getTexName()) //if texture does not exist
{
return texture->bindDefaultImage(mIndex);
}
// Disabled caching of binding state.
- if (texture != NULL)
- {
- activate();
- enable(texture->getTarget());
- mCurrTexture = texture->getTexName();
- glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
- texture->updateBindStats();
- return true;
- }
- return false;
+ activate();
+ enable(texture->getTarget());
+ mCurrTexture = texture->getTexName();
+ glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
+ texture->updateBindStats();
+ return true;
}
bool LLTexUnit::bind(LLCubeMap* cubeMap)
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 8c648f3..7dcb504 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -135,12 +135,17 @@ public:
// Disables the current texture unit
void disable(void);
- // Binds the LLImageGL to this texture unit (automatically enables the unit for the LLImageGL's texture type)
- bool bind(const LLImageGL* texture);
- // Binds a cubemap to this texture unit (automatically enables the texture unit for cubemaps)
+ // Binds the LLImageGL to this texture unit
+ // (automatically enables the unit for the LLImageGL's texture type)
+ bool bind(const LLImageGL* texture, bool forceBind = false);
+
+ // Binds a cubemap to this texture unit
+ // (automatically enables the texture unit for cubemaps)
bool bind(LLCubeMap* cubeMap);
+
// Binds a render target to this texture unit (automatically enables the texture unit for the RT's texture type)
bool bind(LLRenderTarget * renderTarget, bool bindDepth = false);
+
// Manually binds a texture to the texture unit (automatically enables the tex unit for the given texture type)
bool bindManual(eTextureType type, U32 texture);
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 047342f..de4f6ce 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -544,6 +544,7 @@ void LLFloater::close(bool app_quitting)
if (getHost())
{
((LLMultiFloater*)getHost())->removeFloater(this);
+ gFloaterView->addChild(this);
}
if (getSoundFlags() != SILENT
@@ -1318,8 +1319,8 @@ void LLFloater::onClickEdit(void *userdata)
self->mEditing = self->mEditing ? FALSE : TRUE;
}
-// static
-void LLFloater::closeFocusedFloater()
+// static
+LLFloater* LLFloater::getClosableFloaterFromFocus()
{
LLFloater* focused_floater = NULL;
@@ -1336,10 +1337,32 @@ void LLFloater::closeFocusedFloater()
if (iter == sFloaterMap.end())
{
// nothing found, return
- return;
+ return NULL;
+ }
+
+ // The focused floater may not be closable,
+ // Find and close a parental floater that is closeable, if any.
+ for(LLFloater* floater_to_close = focused_floater;
+ NULL != floater_to_close;
+ floater_to_close = gFloaterView->getParentFloater(floater_to_close))
+ {
+ if(floater_to_close->isCloseable())
+ {
+ return floater_to_close;
+ }
}
- focused_floater->close();
+ return NULL;
+}
+
+// static
+void LLFloater::closeFocusedFloater()
+{
+ LLFloater* floater_to_close = LLFloater::getClosableFloaterFromFocus();
+ if(floater_to_close)
+ {
+ floater_to_close->close();
+ }
// if nothing took focus after closing focused floater
// give it to next floater (to allow closing multiple windows via keyboard in rapid succession)
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 0be5d44..267707f 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -206,6 +206,11 @@ public:
LLHandle<LLFloater> getHandle() const { return mHandle; }
+ // Return a closeable floater, if any, given the current focus.
+ static LLFloater* getClosableFloaterFromFocus();
+
+ // Close the floater returned by getClosableFloaterFromFocus() and
+ // handle refocusing.
static void closeFocusedFloater();
static void onClickClose(void *userdata);
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 4b0acf8..2205005 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -471,9 +471,9 @@ void LLTextEditor::updateLineStartList(S32 startpos)
}
// if scrolled to bottom, stay at bottom
- // unless user is editing text
+ // unless user is selecting text
// do this after updating page size
- if (mScrolledToBottom && mTrackBottom && !hasFocus())
+ if (mScrolledToBottom && mTrackBottom && !hasMouseCapture())
{
endOfDoc();
}
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index ef3cf68..8d0ab65 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1559,7 +1559,13 @@ void LLWindowWin32::captureMouse()
void LLWindowWin32::releaseMouse()
{
+ // *NOTE:Mani ReleaseCapture will spawn new windows messages...
+ // which will in turn call our MainWindowProc. It therefore requires
+ // pausing *and more importantly resumption* of the mainlooptimeout...
+ // just like DispatchMessage below.
+ mCallbacks->handlePauseWatchdog(this);
ReleaseCapture();
+ mCallbacks->handleResumeWatchdog(this);
}
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1ebe77a..688dcab 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -33,10 +33,10 @@
<string>Color4</string>
<key>Value</key>
<array>
- <real>0.0196078431372</real>
- <real>0.6862745098039</real>
- <real>0.9803921568627</real>
- <real>1</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
</array>
</map>
<key>AgentChatColor</key>
@@ -10100,7 +10100,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>WaterEditPresets</key>
<map>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 7af05a5..c02ba86 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 18
+version 19
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
@@ -367,28 +367,40 @@ Disregard96DefaultDrawDistance 1 0
list ATI_Radeon_X300
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X400
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X500
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X600
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X700
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X1300
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
UseStartScreen 0 0
list ATI_Radeon_X1400
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X1500
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
UseStartScreen 0 0
list ATI_Radeon_X1600
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Radeon_X1700
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
list ATI_Mobility_Radeon_X1xxx
Disregard128DefaultDrawDistance 1 0
+RenderVBOEnable 1 0
+
list ATI_Radeon_HD_2300
Disregard128DefaultDrawDistance 1 0
list ATI_Radeon_HD_2400
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 0036f11..09105b8 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 18
+version 19
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 54a7c11..fd2496d 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 18
+version 19
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 150e7f3..7484005 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -48,12 +48,12 @@ ATI ASUS EAH34xx .*ATI.*ASUS.*EAH34.* 1 1
ATI ASUS EAH36xx .*ATI.*ASUS.*EAH36.* 3 1
ATI ASUS EAH38xx .*ATI.*ASUS.*EAH38.* 3 1
ATI ASUS EAH48xx .*ATI.*ASUS.*EAH48.* 3 1
-ATI ASUS X1xxx .*ATI.*ASUS.*X1.* 2 1
-ATI ASUS X7xx .*ATI.*ASUS.*X7.* 1 1
-ATI Diamond X550 .*ATI.*Diamond X550.* 1 1
-ATI Diamond X13xx .*ATI.*Diamond X13.* 1 1
-ATI Diamond X16xx .*ATI.*Diamond X16.* 1 1
-ATI Diamond X19xx .*ATI.*Diamond X19.* 1 1
+ATI Radeon X1xxx .*ATI.*ASUS.*X1.* 2 1
+ATI Radeon X7xx .*ATI.*ASUS.*X7.* 1 1
+ATI Radeon X500 .*ATI.*Diamond X5.* 1 1
+ATI Radeon X13xx .*ATI.*Diamond X13.* 1 1
+ATI Radeon X16xx .*ATI.*Diamond X16.* 1 1
+ATI Radeon X19xx .*ATI.*Diamond X19.* 1 1
ATI Display Adapter .*ATI.*display adapter.* 0 1
ATI FireGL 5200 .*ATI.*FireGL V52.* 0 1
ATI FireGL 5xxx .*ATI.*FireGL V5.* 1 1
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 35acafc..53685e4 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1405,6 +1405,25 @@ bool LLAppViewer::cleanup()
return true;
}
+// A callback for llerrs to call during the watchdog error.
+void watchdog_llerrs_callback(const std::string &error_string)
+{
+ gLLErrorActivated = true;
+
+#ifdef LL_WINDOWS
+ RaiseException(0,0,0,0);
+#else
+ raise(SIGQUIT);
+#endif
+}
+
+// A callback for the watchdog to call.
+void watchdog_killer_callback()
+{
+ LLError::setFatalFunction(watchdog_llerrs_callback);
+ llerrs << "Watchdog killer event" << llendl;
+}
+
bool LLAppViewer::initThreads()
{
#if MEM_TRACK_MEM
@@ -1414,10 +1433,11 @@ bool LLAppViewer::initThreads()
#endif
const S32 NEVER_SUBMIT_REPORT = 2;
- if(TRUE == gSavedSettings.getBOOL("WatchdogEnabled")
- && (gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT))
+ bool use_watchdog = gSavedSettings.getBOOL("WatchdogEnabled");
+ bool send_reports = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT;
+ if(use_watchdog && send_reports)
{
- LLWatchdog::getInstance()->init();
+ LLWatchdog::getInstance()->init(watchdog_killer_callback);
}
LLVFSThread::initClass(enable_threads && true);
@@ -2280,7 +2300,8 @@ void LLAppViewer::handleViewerCrash()
gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
-
+ gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+
if(gLogoutInProgress)
{
gDebugInfo["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH;
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 2a6fd60..34e6d42 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -124,6 +124,27 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
return retval;
}
+// Create app mutex creates a unique global windows object.
+// If the object can be created it returns true, otherwise
+// it returns false. The false result can be used to determine
+// if another instance of a second life app (this vers. or later)
+// is running.
+// *NOTE: Do not use this method to run a single instance of the app.
+// This is intended to help debug problems with the cross-platform
+// locked file method used for that purpose.
+bool create_app_mutex()
+{
+ bool result = true;
+ LPCWSTR unique_mutex_name = L"SecondLifeAppMutex";
+ HANDLE hMutex;
+ hMutex = CreateMutex(NULL, TRUE, unique_mutex_name);
+ if(GetLastError() == ERROR_ALREADY_EXISTS)
+ {
+ result = false;
+ }
+ return result;
+}
+
//#define DEBUGGING_SEH_FILTER 1
#if DEBUGGING_SEH_FILTER
# define WINMAIN DebuggingWinMain
@@ -151,6 +172,10 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
+ // Set a debug info flag to indicate if multiple instances are running.
+ bool found_other_instance = !create_app_mutex();
+ gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance);
+
bool ok = viewer_app_ptr->init();
if(!ok)
{
@@ -204,11 +229,8 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
//start updater
if(LLAppViewer::sUpdaterInfo)
{
-#if LL_WINDOWS
_spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL);
-#elif LL_DARWIN
- system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
-#endif
+
delete LLAppViewer::sUpdaterInfo ;
LLAppViewer::sUpdaterInfo = NULL ;
}
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index d308210..a825511 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -206,8 +206,8 @@ void LLFloaterInspect::refresh()
mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
//List all transient objects, then all linked objects
- for (LLObjectSelection::iterator iter = mObjectSelection->begin();
- iter != mObjectSelection->end(); iter++)
+ for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin();
+ iter != mObjectSelection->valid_end(); iter++)
{
LLSelectNode* obj = *iter;
LLSD row;
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index afa0785..6cf6ae1 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -899,6 +899,13 @@ void LLSnapshotLivePreview::getSize(S32& w, S32& h) const
LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
{
+ if(mViewerImage[mCurImageIndex].isNull())
+ {
+ //this should never happen!!
+ llwarns << "The snapshot image has not been generated!" << llendl ;
+ return NULL ;
+ }
+
// calculate and pass in image scale in case image data only use portion
// of viewerimage buffer
LLVector2 image_scale(1.f, 1.f);
@@ -914,9 +921,10 @@ LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
return NULL;
}
LLFloaterPostcard* floater = LLFloaterPostcard::showFromSnapshot(jpg, mViewerImage[mCurImageIndex], image_scale, mPosTakenGlobal);
- // relinquish lifetime of viewerimage and jpeg image to postcard floater
- mViewerImage[mCurImageIndex] = NULL;
+ // relinquish lifetime of jpeg image to postcard floater
mFormattedImage = NULL;
+ mDataSize = 0;
+ updateSnapshot(FALSE, FALSE);
return floater;
}
@@ -961,11 +969,19 @@ void LLSnapshotLivePreview::saveTexture()
}
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );
+
+ mDataSize = 0;
}
BOOL LLSnapshotLivePreview::saveLocal()
{
BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage);
+
+ // Relinquish image memory. Save button will be disabled as a side-effect.
+ mFormattedImage = NULL;
+ mDataSize = 0;
+ updateSnapshot(FALSE, FALSE);
+
if(success)
{
gViewerWindow->playSnapshotAnimAndSound();
@@ -1245,14 +1261,14 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
BOOL got_bytes = previewp && previewp->getDataSize() > 0;
BOOL got_snap = previewp->getSnapshotUpToDate();
- floater->childSetEnabled("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_bytes && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
- floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE && got_bytes && got_snap);
- floater->childSetEnabled("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL && got_bytes && got_snap);
+ floater->childSetEnabled("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
+ floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE && got_snap);
+ floater->childSetEnabled("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL && got_snap);
LLLocale locale(LLLocale::USER_LOCALE);
std::string bytes_string;
LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
- floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : got_bytes ? floater->getString("unknown") : std::string("???"));
+ floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : floater->getString("unknown"));
floater->childSetColor("file_size_label",
shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
&& got_bytes
@@ -1382,6 +1398,8 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
{
checkAutoSnapshot(previewp);
}
+
+ updateControls(view);
}
}
@@ -1636,6 +1654,9 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
LLSnapshotLivePreview* previewp = getPreviewView(view);
if (previewp && combobox->getCurrentIndex() >= 0)
{
+ S32 original_width = 0 , original_height = 0 ;
+ previewp->getSize(original_width, original_height) ;
+
if (width == 0 || height == 0)
{
// take resolution from current window size
@@ -1660,19 +1681,24 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
{
resetSnapshotSizeOnUI(view, width, height) ;
}
- previewp->setSize(width, height);
-
+
if(view->childGetValue("snapshot_width").asInteger() != width || view->childGetValue("snapshot_height").asInteger() != height)
{
- view->childSetValue("snapshot_width", width);
- view->childSetValue("snapshot_height", height);
- // hide old preview as the aspect ratio could be wrong
- checkAutoSnapshot(previewp, FALSE);
+ view->childSetValue("snapshot_width", width);
+ view->childSetValue("snapshot_height", height);
+ }
+
+ if(original_width != width || original_height != height)
+ {
+ previewp->setSize(width, height);
+
+ // hide old preview as the aspect ratio could be wrong
+ checkAutoSnapshot(previewp, FALSE);
getPreviewView(view)->updateSnapshot(FALSE, TRUE);
if(do_update)
{
updateControls(view);
- }
+ }
}
}
}
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 96492e8..0afa618 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -212,7 +212,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
&& have_extended_data)
{
- element["columns"][5]["column"] = "Mono Time";
+ element["columns"][5]["column"] = "mono_time";
element["columns"][5]["value"] = llformat("%0.3f", mono_score);
element["columns"][5]["font"] = "SANSSERIF";
}
@@ -238,6 +238,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
{
setTitle(getString("top_scripts_title"));
list->setColumnLabel("score", getString("scripts_score_label"));
+ list->setColumnLabel("mono_time", getString("scripts_mono_time_label"));
LLUIString format = getString("top_scripts_text");
format.setArg("[COUNT]", llformat("%d", total_count));
@@ -248,6 +249,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
{
setTitle(getString("top_colliders_title"));
list->setColumnLabel("score", getString("colliders_score_label"));
+ list->setColumnLabel("mono_time", "");
LLUIString format = getString("top_colliders_text");
format.setArg("[COUNT]", llformat("%d", total_count));
childSetValue("title_text", LLSD(format));
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index c3392ce..9149658 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1499,7 +1499,7 @@ void LLInventoryModel::stopBackgroundFetch()
//static
void LLInventoryModel::backgroundFetch(void*)
{
- if (sBackgroundFetchActive)
+ if (sBackgroundFetchActive && gAgent.getRegion())
{
//If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 2ce111f..2d37eb3 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2896,7 +2896,10 @@ void update_dialog_callback(S32 option, void *userdata)
LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &";
LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL;
-
+
+ // Run the auto-updater.
+ system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
+
#elif LL_LINUX
OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
"Please download the latest version from www.secondlife.com.",
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index 1a9f659..64de9cd 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -87,6 +87,7 @@ public:
// Always use this to set gStartupState so changes are logged
static void setStartupState( EStartupState state );
static EStartupState getStartupState() { return gStartupState; };
+ static std::string getStartupStateString() { return startupStateToString(gStartupState); };
static void multimediaInit();
// Initialize LLViewerMedia multimedia engine.
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 7c08c8a..ea38545 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1740,7 +1740,7 @@ class LLViewCommunicate : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
- if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
+ if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
{
LLFloaterMyFriends::toggleInstance();
}
@@ -1748,7 +1748,6 @@ class LLViewCommunicate : public view_listener_t
{
LLFloaterChatterBox::toggleInstance();
}
-
return true;
}
};
@@ -5291,6 +5290,10 @@ class LLFloaterVisible : public view_listener_t
{
new_value = LLFloaterMyFriends::instanceVisible(0);
}
+ else if (floater_name == "communicate")
+ {
+ new_value = LLFloaterChatterBox::instanceVisible();
+ }
else if (floater_name == "toolbar")
{
new_value = LLToolBar::visible(NULL);
@@ -5327,6 +5330,11 @@ class LLFloaterVisible : public view_listener_t
{
new_value = LLFloaterBeacons::instanceVisible(LLSD());
}
+ else if (floater_name == "inventory")
+ {
+ LLInventoryView* iv = LLInventoryView::getActiveInventory();
+ new_value = (NULL != iv && TRUE == iv->getVisible());
+ }
gMenuHolder->findControl(control_name)->setValue(new_value);
return true;
}
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index d9d8636..33effdc 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -349,7 +349,8 @@ class LLFileEnableCloseWindow : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
- bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
+ bool new_value = NULL != LLFloater::getClosableFloaterFromFocus();
+
// horrendously opaque, this code
gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
return true;
@@ -930,6 +931,11 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
LLAssetStorage::LLStoreAssetCallback callback,
void *userdata)
{
+ if(gDisconnected)
+ {
+ return ;
+ }
+
LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
if( LLAssetType::AT_SOUND == asset_type )
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 1dda1ca..7975b5d 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -616,7 +616,10 @@ BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* s
LLView *viewp = *child_iter;
S32 local_x = x - viewp->getRect().mLeft;
S32 local_y = y - viewp->getRect().mBottom;
- if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
+ if( viewp->pointInView(local_x, local_y)
+ && viewp->getVisible()
+ && viewp->getEnabled()
+ && viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
{
return TRUE;
}
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
index 55975ee..bb987c9 100644
--- a/indra/newview/llwatchdog.cpp
+++ b/indra/newview/llwatchdog.cpp
@@ -35,6 +35,15 @@
const U32 WATCHDOG_SLEEP_TIME_USEC = 1000000;
+void default_killer_callback()
+{
+#ifdef LL_WINDOWS
+ RaiseException(0,0,0,0);
+#else
+ raise(SIGQUIT);
+#endif
+}
+
// This class runs the watchdog timing thread.
class LLWatchdogTimerThread : public LLThread
{
@@ -52,7 +61,7 @@ public:
void stop()
{
mStopping = true;
- ms_sleep(1);
+ mSleepMsecs = 1;
}
/* virtual */ void run()
@@ -146,7 +155,8 @@ void LLWatchdogTimeout::ping(const std::string& state)
LLWatchdog::LLWatchdog() :
mSuspectsAccessMutex(NULL),
mTimer(NULL),
- mLastClockCount(0)
+ mLastClockCount(0),
+ mKillerCallback(&default_killer_callback)
{
}
@@ -168,8 +178,9 @@ void LLWatchdog::remove(LLWatchdogEntry* e)
unlockThread();
}
-void LLWatchdog::init()
+void LLWatchdog::init(killer_event_callback func)
{
+ mKillerCallback = func;
if(!mSuspectsAccessMutex && !mTimer)
{
mSuspectsAccessMutex = new LLMutex(NULL);
@@ -238,11 +249,7 @@ void LLWatchdog::run()
}
llinfos << "Watchdog detected error:" << llendl;
-#ifdef LL_WINDOWS
- RaiseException(0,0,0,0);
-#else
- raise(SIGQUIT);
-#endif
+ mKillerCallback();
}
}
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h
index d196486..25bb603 100644
--- a/indra/newview/llwatchdog.h
+++ b/indra/newview/llwatchdog.h
@@ -32,6 +32,8 @@
#ifndef LL_LLTHREADWATCHDOG_H
#define LL_LLTHREADWATCHDOG_H
+#include <boost/function.hpp>
+
#ifndef LL_TIMER_H
#include "lltimer.h"
#endif
@@ -85,7 +87,9 @@ public:
void add(LLWatchdogEntry* e);
void remove(LLWatchdogEntry* e);
- void init();
+ typedef boost::function<void (void)> killer_event_callback;
+
+ void init(killer_event_callback func = NULL);
void run();
void cleanup();
@@ -98,6 +102,8 @@ private:
LLMutex* mSuspectsAccessMutex;
LLWatchdogTimerThread* mTimer;
U64 mLastClockCount;
+
+ killer_event_callback mKillerCallback;
};
#endif // LL_LLTHREADWATCHDOG_H
diff --git a/indra/newview/llwindebug.cpp b/indra/newview/llwindebug.cpp
index 04457eb..b433901 100644
--- a/indra/newview/llwindebug.cpp
+++ b/indra/newview/llwindebug.cpp
@@ -430,7 +430,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
FILETIME Last_Write_Time;
FILETIME Local_File_Time;
SYSTEMTIME T;
-
+
Str = new WCHAR[DUMP_SIZE_MAX];
Str_Len = 0;
if (!Str)
@@ -440,6 +440,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
GetModuleFileName(NULL, Str, MAX_PATH);
info["Process"] = ll_convert_wide_to_string(Str);
+ info["ThreadID"] = (S32)GetCurrentThreadId();
// If exception occurred.
if (pException)
diff --git a/indra/newview/skins/default/xui/de/alerts.xml b/indra/newview/skins/default/xui/de/alerts.xml
index 20e6113..fe984ae 100644
--- a/indra/newview/skins/default/xui/de/alerts.xml
+++ b/indra/newview/skins/default/xui/de/alerts.xml
@@ -58,7 +58,7 @@
Verbindung mit [SECOND_LIFE] nicht möglich.
Möglicherweise handelt es sich um einen Systemausfall.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf 'Hilfe'.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
</message>
<option name="OK">
OK
@@ -287,7 +287,7 @@ Möchten Sie fortfahren?
</alert>
<alert name="AssignDangerousActionWarning">
<message name="message">
- Sie sind im Begriff, der Rolle '[ROLE_NAME]' die Fähigkeit '[ACTION_NAME]' zuzuweisen.
+ Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zuzuweisen.
*ACHTUNG*
Mitglieder in einer Rolle mit dieser Fähigkeit können sich selbst -
@@ -296,7 +296,7 @@ Möchten Sie fortfahren?
Eigentümerrechte erreichen. Überlegen Sie sich, wem Sie diese Fähigkeit
verleihen.
-Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen?
+Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
</message>
<option name="Yes">
Ja
@@ -307,14 +307,14 @@ Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen?
</alert>
<alert name="AssignDangerousAbilityWarning">
<message name="message">
- Sie sind im Begriff, der Rolle '[ROLE_NAME]' die Fähigkeit '[ACTION_NAME]' zuzuweisen.
+ Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zuzuweisen.
*ACHTUNG*
Mitglieder in einer Rolle mit dieser Fähigkeit können sich selbst -
und allen anderen Mitgliedern – alle Fähigkeiten zuweisen und
damit fast Eigentümerrechte erreichen.
-Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen?
+Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
</message>
<option name="Yes">
Ja
@@ -323,9 +323,15 @@ Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen?
Nein
</option>
</alert>
- <alert name="ClickPublishHelpGroup">
- </alert>
+ <alert name="ClickPublishHelpGroup"/>
<alert name="ClickPublishHelpLand">
+ <message name="message">
+ Auswahl von „In Suche veröffentlichen“
+Dieses Kontrollkästchen zeigt Folgendes an:
+- diese Parzelle in den Suchergebnissen
+- die öffentlichen Objekte dieser Parzelle
+- diese Parzelle in der Websuche
+ </message>
</alert>
<alert name="ClickPublishHelpLandDisabled">
<message name="message">
@@ -338,6 +344,11 @@ Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen?
</message>
</alert>
<alert name="ClickPublishHelpAvatar">
+ <message name="message">
+ Auswahl von „In Suche anzeigen“ zeigt Folgendes an:
+- Ihr Profil in den Suchergebnissen
+- einen Link auf Ihr Profil in den öffentlichen Gruppenseiten
+ </message>
</alert>
<alert name="ClickPartnerHelpAvatar">
<message name="message">
@@ -445,7 +456,7 @@ Sie haben nicht genug L$, um dieser Gruppe beizutreten.
</alert>
<alert name="LandBuyPass">
<message name="message">
- Sie können dieses Land ('[PARCEL_NAME]') für [COST] L$
+ Sie können dieses Land („[PARCEL_NAME]“) für [COST] L$
[TIME] Stunden lang betreten. Pass kaufen?
</message>
<option name="OK">
@@ -480,7 +491,7 @@ Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf
</alert>
<alert name="ConfirmLandSaleToAnyoneChange">
<message name="message">
- ACHTUNG: Wenn Sie auf 'An jeden verkaufen' klicken, kann jeder in Second Life Ihr Land kaufen, auch Einwohner in anderen Regionen.
+ ACHTUNG: Wenn Sie auf „An jeden verkaufen“ klicken, kann jeder in Second Life Ihr Land kaufen, auch Einwohner in anderen Regionen.
Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.
Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
@@ -494,7 +505,7 @@ Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf
</alert>
<alert name="ReturnObjectsDeededToGroup">
<message name="message">
- Möchten Sie alle Ihre Objekte auf dieser Parzelle, die der Gruppe '[NAME]' gehören, zurück in das jeweilige Inventar ihrer vorherigen Eigentümer transferieren?
+ Möchten Sie alle Ihre Objekte auf dieser Parzelle, die der Gruppe „[NAME]“ gehören, zurück in das jeweilige Inventar ihrer vorherigen Eigentümer transferieren?
*WARNUNG* Alle nicht transferierbaren Objekte, die der Gruppe übertragen wurden, werden dabei gelöscht!
@@ -509,7 +520,7 @@ Objekte: [N]
</alert>
<alert name="ReturnObjectsOwnedByUser">
<message name="message">
- Möchten Sie alle Objekte auf dieser Parzelle, die dem Einwohner '[NAME]' gehören, in das jeweilige Inventar ihrer Eigentümer transferieren?
+ Möchten Sie alle Objekte auf dieser Parzelle, die dem Einwohner „[NAME]“ gehören, in das jeweilige Inventar ihrer Eigentümer transferieren?
Objekte: [N]
</message>
@@ -690,7 +701,7 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten
</alert>
<alert name="AddClassified">
<message name="message">
- Anzeigen erscheinen für eine Woche unter 'Anzeigen' im Suchverzeichnis. Füllen Sie Ihre Anzeige aus und klicken Sie auf 'Veröffentlichen...', um sie zum Verzeichnis hinzuzufügen. Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf 'Veröffentlichen' klicken. Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht, erscheint Ihre Anzeige weiter oben in der Liste.
+ Anzeigen erscheinen für eine Woche unter „Anzeigen“ im Suchverzeichnis. Füllen Sie Ihre Anzeige aus und klicken Sie auf „Veröffentlichen...“, um sie zum Verzeichnis hinzuzufügen. Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf „Veröffentlichen“ klicken. Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht, erscheint Ihre Anzeige weiter oben in der Liste.
</message>
<option name="OK">
OK
@@ -704,7 +715,7 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten
</alert>
<alert name="DeleteClassified">
<message name="message">
- Anzeige '[NAME]' löschen?
+ Anzeige „[NAME]“ löschen?
Gebühren werden nicht rückerstattet.
</message>
<option name="Delete">
@@ -785,7 +796,7 @@ Die Änderungen übernehmen und das Programm beenden?
</alert>
<alert name="ResetShowNextTimeDialogs">
<message name="message">
- Möchten Sie alle Popups wieder aktivieren, die Sie zuvor auf 'Nicht mehr anzeigen' gesetzt haben?
+ Möchten Sie alle Popups wieder aktivieren, die Sie zuvor auf „Nicht mehr anzeigen“ gesetzt haben?
</message>
<option name="OK">
OK
@@ -1034,7 +1045,7 @@ Second Life funktioniert aller Voraussicht nach normal, möglicherweise müssen
Die Grafikqualität wird auf eine niedrige Stufe zurückgesetzt, um einige typische Treiberfehler zu vermeiden.
Einige Grafikfunktionen werden ausgeschaltet.
Wir empfehlen die Aktualisierung Ihrer Grafikkartentreiber.
-Sie können die Grafikqualität unter 'Einstellungen' > 'Grafik' wieder erhöhen.
+Sie können die Grafikqualität unter „Einstellungen“ > „Grafik“ wieder erhöhen.
</message>
</alert>
<alert name="CannotRequestDomain">
@@ -1047,7 +1058,7 @@ Folgende Domäne konnte nicht aufgelöst werden: [HOST]
<message name="message">
Der Server-Domänenname konnte nicht gefunden werden.
Mögliche Ursachen sind der Verlust der Netzwerkverbindung oder ein Serverproblem.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf 'Hilfe'.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
</message>
<option name="OK">
OK
@@ -1119,7 +1130,7 @@ Wenden Sie sich an www.secondlife.com/support, sollte dieser Fehler wiederholt a
<message name="message">
Unbekanntes Verbindungsproblem.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf 'Hilfe'.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
</message>
<option name="OK">
OK
@@ -1132,7 +1143,7 @@ Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstü
<message name="message">
Verbindung nicht möglich. Keine Anmeldebestätigung von Simulator.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link zur Systemstatus-Webseite auf 'Hilfe'.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link zur Systemstatus-Webseite auf „Hilfe“.
</message>
<option name="OK">
OK
@@ -1314,6 +1325,28 @@ Der Avatar wird außer Gefecht gesetzt und kann sich nicht mehr bewegen, chatten
Abbrechen
</option>
</alert>
+ <alert name="EjectAvatarNoBan">
+ <message name="message">
+ Diesen Avatar aus Ihrem Land werfen?
+ </message>
+ <option name="Eject">
+ Hinauswerfen
+ </option>
+ <option name="Cancel">
+ Abbrechen
+ </option>
+ </alert>
+ <alert name="EjectAvatarFullnameNoBan">
+ <message name="message">
+ [AVATAR_NAME] aus Ihrem Land werfen?
+ </message>
+ <option name="Eject">
+ Hinauswerfen
+ </option>
+ <option name="Cancel">
+ Abbrechen
+ </option>
+ </alert>
<alert name="InvalidUUID">
<message name="message">
Ungültige UUID.
@@ -1384,7 +1417,7 @@ Stellen Sie sicher, dass alle ausgewählten Objekte Ihnen gehören.
</alert>
<alert name="NoFileExtension">
<message name="message">
- Kein Dateityp für Datei: '[FILE]'
+ Kein Dateityp für Datei: „[FILE]“
Vergewissern Sie sich, dass die Datei den richtigen Dateityp hat.
</message>
@@ -1436,7 +1469,7 @@ Erwartet wurde [VALIDS]
</alert>
<alert name="SoundFileInvalidHeader">
<message name="message">
- 'Daten'-Chunk in WAV-Header nicht gefunden:
+ „Daten“-Chunk in WAV-Header nicht gefunden:
[FILE]
</message>
</alert>
@@ -1511,55 +1544,55 @@ Bitte versuchen Sie es erneut.
</alert>
<alert name="CannotRecompileSelectObjectsNoScripts">
<message name="message">
- 'Rekompilieren' nicht möglich.
+ „Rekompilieren“ nicht möglich.
Objekt mit Skript wählen.
</message>
</alert>
<alert name="CannotRecompileSelectObjectsNoPermission">
<message name="message">
- 'Rekompilieren' nicht möglich.
+ „Rekompilieren“ nicht möglich.
Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
</message>
</alert>
<alert name="CannotResetSelectObjectsNoScripts">
<message name="message">
- 'Zurücksetzen' nicht möglich.
+ „Zurücksetzen“ nicht möglich.
Wählen Sie Objekte mit Skripts.
</message>
</alert>
<alert name="CannotResetSelectObjectsNoPermission">
<message name="message">
- 'Zurücksetzen' nicht möglich.
+ „Zurücksetzen“ nicht möglich.
Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
</message>
</alert>
<alert name="CannotSetRunningSelectObjectsNoScripts">
<message name="message">
- 'Ausführen' von Skripts nicht möglich.
+ „Ausführen“ von Skripts nicht möglich.
Wählen Sie Objekte mit Skripts.
</message>
</alert>
<alert name="CannotSetRunningSelectObjectsNoPermission">
<message name="message">
- 'Ausführen' von Skripts nicht möglich.
+ „Ausführen“ von Skripts nicht möglich.
Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
</message>
</alert>
<alert name="CannotSetRunningNotSelectObjectsNoScripts">
<message name="message">
- 'Deaktivieren' von Skripts nicht möglich.
+ „Deaktivieren“ von Skripts nicht möglich.
Wählen Sie Objekte mit Skripts.
</message>
</alert>
<alert name="CannotSetRunningNotSelectObjectsNoPermission">
<message name="message">
- 'Deaktivieren' von Skripts nicht möglich.
+ „Deaktivieren“ von Skripts nicht möglich.
Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
</message>
@@ -1679,7 +1712,7 @@ Kann die Region nicht finden, in der sich dieses Land befindet.
</alert>
<alert name="CannotCloseFloaterBuyLand">
<message name="message">
- Das Fenster 'Land kaufen' kann erst geschlossen werden,
+ Das Fenster „Land kaufen“ kann erst geschlossen werden,
nachdem Second Life den Transaktionspreis geschätzt hat.
</message>
</alert>
@@ -1699,7 +1732,7 @@ Keine Gruppe ausgewählt.
<message name="message">
Land kann nicht übertragen werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-Bitte melden Sie dies über 'Hilfe' -> 'Fehler melden'.
+Bitte melden Sie dies über „Hilfe“ > „Fehler melden“.
</message>
</alert>
<alert name="CannotDeedLandMultipleSelected">
@@ -1721,7 +1754,7 @@ Wählen Sie eine einzelne Parzelle.
Streaming-Medien erfordern eine schnelle Internet-Verbindung.
Streaming-Medien abspielen, wenn verfügbar?
-(Sie können diese Option später unter 'Einstellungen' > 'Audio & Video' ändern.)
+(Sie können diese Option später unter „Einstellungen“ > „Audio & Video“ ändern.)
</message>
<option name="PlayMedia">
Medien wiedergeben
@@ -1772,7 +1805,7 @@ Parzellen, die Ihnen gehören, werden grün dargestellt.
Land kann nicht aufgegeben werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-Bitte melden Sie dies über 'Hilfe' -> 'Fehler melden'.
+Bitte melden Sie dies über „Hilfe“ > „Fehler melden“.
</message>
</alert>
<alert name="CannotReleaseLandNoTransfer">
@@ -1836,7 +1869,7 @@ Land teilen?
Land kann nicht aufgeteilt werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-Bitte melden Sie dies über 'Hilfe' -> 'Fehler melden'.
+Bitte melden Sie dies über „Hilfe“ > „Fehler melden“.
</message>
</alert>
<alert name="CannotJoinLandNoRegion">
@@ -1844,7 +1877,7 @@ Bitte melden Sie dies über 'Hilfe' -> 'Fehler melden'.
Land kann nicht zusammengelegt werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-Bitte melden Sie dies über 'Hilfe' -> 'Fehler melden'.
+Bitte melden Sie dies über „Hilfe“ > „Fehler melden“.
</message>
</alert>
<alert name="CannotJoinLandNothingSelected">
@@ -1934,7 +1967,7 @@ Land zusammenlegen?
</alert>
<alert name="CannotSaveWearableOutOfSpace">
<message name="message">
- '[NAME]' konnte nicht in Kleidungsdatei gespeichert werden. Geben Sie Speicherplatz auf dem Computer frei und speichern Sie das Kleidungsstück erneut.
+ „[NAME]“ konnte nicht in Kleidungsdatei gespeichert werden. Geben Sie Speicherplatz auf dem Computer frei und speichern Sie das Kleidungsstück erneut.
</message>
</alert>
<alert name="CannotSaveToAssetStore">
@@ -1942,7 +1975,7 @@ Land zusammenlegen?
[NAME] kann nicht in Zentral-Asset-Speicher geladen werden.
Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen Minuten noch einmal an und speichern Sie es erneut.
-Tritt dieses Problem wiederholt auf, klicken Sie auf das Pulldown-Menü 'Hilfe | Fehler melden' und geben Sie Details zu Ihrem Netzwerk-Setup an.
+Tritt dieses Problem wiederholt auf, klicken Sie auf das Pulldown-Menü „Hilfe“ > „Fehler melden“ und geben Sie Details zu Ihrem Netzwerk-Setup an.
</message>
</alert>
<alert name="AppEarlyExit">
@@ -1962,7 +1995,7 @@ www.secondlife.com/support.
<message name="message">
Sie wurden von [SECOND_LIFE] abgemeldet:
[MESSAGE]
-Klicken Sie auf 'IM & Chat anzeigen', um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Klicken Sie andernfalls auf 'Beenden', um [SECOND_LIFE] sofort zu beenden.
+Klicken Sie auf „IM & Chat anzeigen“, um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Klicken Sie andernfalls auf „Beenden“, um [SECOND_LIFE] sofort zu beenden.
</message>
<option name="Continue">
IM & Chat anzeigen
@@ -2240,7 +2273,7 @@ Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.
Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt.
Dem Eigentümer wird der Kaufpreis für das Land nicht rückerstattet. Bei Verkauf der übertragenen Parzelle wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
-Der Gruppe '[GROUP_NAME]'
+Der Gruppe „[GROUP_NAME]“
[AREA] m2 Land schenken?
</message>
<option name="Deed">
@@ -2253,10 +2286,10 @@ Der Gruppe '[GROUP_NAME]'
<alert name="DeedLandToGroupWithContribution">
<message name="message">
Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt.
-Die Schenkung beinhaltet eine Landübertragung an die Gruppe von '[FIRST_NAME] [LAST_NAME]'.
+Die Schenkung beinhaltet eine Landübertragung an die Gruppe von „[FIRST_NAME] [LAST_NAME]“.
Dem Eigentümer wird der Kaufpreis für das Land nicht rückerstattet. Bei Verkauf der übertragenen Parzelle wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
-Der Gruppe '[GROUP_NAME]'
+Der Gruppe „[GROUP_NAME]“
[AREA] m2 Land schenken?
</message>
<option name="Deed">
@@ -2287,7 +2320,7 @@ Folgende Domäne konnte nicht aufgelöst werden: [HOST_NAME]
Der Server-Domänenname konnte nicht gefunden werden.
Mögliche Ursachen sind der Verlust der Netzwerkverbindung oder ein Serverproblem.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf 'Hilfe'.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
</message>
<option name="OK">
OK
@@ -2307,7 +2340,7 @@ Verbindung mit [IP_ADDRESS] nicht möglich
Verbindung mit [SECOND_LIFE] nicht möglich.
Möglicherweise handelt es sich um einen Systemausfall.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf 'Hilfe'.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
</message>
<option name="OK">
OK
@@ -2372,7 +2405,7 @@ Bitte überprüfen Sie Ihre Netzwerkverbindung.
<message name="message">
Die Verbindung kann nicht hergestellt werden. Möglicherweise besteht ein Problem mit Ihrer Internetverbindung oder den Second Life-Servern.
-Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann erneut, oder klicken Sie auf 'Hilfe', um zu unserer Supportseite zu gelangen, oder klicken Sie auf 'Teleportieren', um nach Hause zu teleportieren.
+Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann erneut, oder klicken Sie auf „Hilfe“, um zu unserer Supportseite zu gelangen, oder klicken Sie auf „Teleportieren“, um nach Hause zu teleportieren.
</message>
<option name="OK">
OK
@@ -2475,7 +2508,7 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
Die Regionstexturen konnten nicht festgelegt werden:
Die Terraintextur [TEXTURE_NUM] hat eine ungültige Bit-Tiefe [TEXTURE_BIT_DEPTH].
-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und klicken Sie dann erneut auf "Übernehmen".
+Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und klicken Sie dann erneut auf „Übernehmen“.
</message>
</alert>
<alert name="InvalidTerrainSize">
@@ -2483,7 +2516,7 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
Die Regionstexturen konnten nicht festgelegt werden:
Die Terraintextur [TEXTURE_NUM] ist mit [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] zu groß.
-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und klicken Sie dann erneut auf "Übernehmen".
+Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und klicken Sie dann erneut auf „Übernehmen“.
</message>
</alert>
<alert name="RawUploadStarted">
@@ -2493,7 +2526,7 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
</alert>
<alert name="ConfirmBakeTerrain">
<message name="message">
- Möchten Sie das aktuelle Terrain formen, es zum Mittelpunkt der oberen und unteren Terraingrenzen und zum Standard des 'Zurücksetzen'-Tools machen?
+ Möchten Sie das aktuelle Terrain formen, es zum Mittelpunkt der oberen und unteren Terraingrenzen und zum Standard des „Zurücksetzen“-Tools machen?
</message>
<option name="Bake">
OK
@@ -2536,7 +2569,7 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
</alert>
<alert name="OwnerCanNotBeDenied">
<message name="message">
- Der Eigentümer des Grundstücks kann nicht zur Liste der 'Verbannten Einwohner' hinzugefügt werden.
+ Der Eigentümer des Grundstücks kann nicht zur Liste der „Verbannten Einwohner“ hinzugefügt werden.
</message>
</alert>
<alert name="CanNotChangeAppearanceUntilLoaded">
@@ -2551,7 +2584,7 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
</alert>
<alert name="CantSetBuyObject">
<message name="message">
- 'Objekt kaufen' nicht möglich, da das Objekt nicht zum Verkauf freigegeben ist.
+ „Objekt kaufen“ nicht möglich, da das Objekt nicht zum Verkauf freigegeben ist.
Geben Sie das Objekt zum Verkauf frei und versuchen Sie es erneut.
</message>
</alert>
@@ -2881,7 +2914,7 @@ Diese Gruppe verlassen?
</alert>
<alert name="MuteLinden">
<message name="message">
- Linden können nicht stummgeschaltet werden.
+ Lindens können nicht stummgeschaltet werden.
</message>
<option name="OK">
OK
@@ -2960,7 +2993,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages erhalten Ihre Be
</alert>
<alert name="NotecardAttachPermFail">
<message name="message">
- An Notizkarten lassen sich nur Objekte mit uneingeschränkten 'Nächster Eigentümer'-Rechten anfügen.
+ An Notizkarten lassen sich nur Objekte mit uneingeschränkten „Nächster Eigentümer“-Rechten anfügen.
</message>
<option name="OK">
OK
@@ -2969,7 +3002,7 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages erhalten Ihre Be
<alert name="JoinedTooManyGroupsMember">
<message name="message">
Sie sind bereits in zu vielen Gruppen Mitglied und können keiner weiteren beitreten. Bitte verlassen Sie eine Gruppe, bevor Sie dieser beitreten oder lehnen Sie das Angebot ab.
-Die Option zum Austritt aus einer Gruppe finden Sie unter 'Bearbeiten' > 'Gruppen...'.
+Die Option zum Austritt aus einer Gruppe finden Sie unter „Bearbeiten“ > „Gruppen...“.
[NAME] hat Sie eingeladen, einer Gruppe beizutreten.
[INVITE]
</message>
@@ -2983,7 +3016,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter 'Bearbeiten'
<alert name="JoinedTooManyGroupsOfficer">
<message name="message">
Sie sind bereits in zu vielen Gruppen Mitglied und können keiner weiteren beitreten. Bitte verlassen Sie eine Gruppe, bevor Sie dieser beitreten oder lehnen Sie das Angebot ab.
-Die Option zum Austritt aus einer Gruppe finden Sie unter 'Bearbeiten' > 'Gruppen...'.
+Die Option zum Austritt aus einer Gruppe finden Sie unter „Bearbeiten“ > „Gruppen...“.
[NAME] hat Sie eingeladen, einer Gruppe als Officer beizutreten.
[INVITE]
</message>
@@ -3398,7 +3431,7 @@ Anzeige für [AMOUNT] L$ veröffentlichen?
</alert>
<alert name="HelpRegionBlockTerraform" title="Terraformen blockieren">
<message name="message">
- Wenn diese Option aktiviert ist, können Landeigentümer Ihr Land nicht terraformen. Ausgenommen davon ist die parzelleneigene Einstellung 'Terrain bearbeiten'.
+ Wenn diese Option aktiviert ist, können Landeigentümer Ihr Land nicht terraformen. Ausgenommen davon ist die parzelleneigene Einstellung „Terrain bearbeiten“.
Standard: deaktiviert
</message>
@@ -3427,7 +3460,7 @@ Standard: 40
</alert>
<alert name="HelpRegionObjectBonus" title="Objektbonus">
<message name="message">
- Der Objektbonus ist ein Multiplikator für die Anzahl an zulässigen Primitiven auf einer Parzelle. Gültig sind Werte zwischen 1 und 10. '1' erlaubt auf einer 512 qm großen Parzelle 117 Objekte. '2' erlaubt auf einer 512 qm großen Parzelle 234 Objekte, also die doppelte Menge. Die maximale Objektanzahl in einer Region beträgt unabhängig vom Objektbonus 15.000.
+ Der Objektbonus ist ein Multiplikator für die Anzahl an zulässigen Primitiven auf einer Parzelle. Gültig sind Werte zwischen 1 und 10. „1“ erlaubt auf einer 512 qm großen Parzelle 117 Objekte. „2“ erlaubt auf einer 512 qm großen Parzelle 234 Objekte, also die doppelte Menge. Die maximale Objektanzahl in einer Region beträgt unabhängig vom Objektbonus 15.000.
Eine nachträglich Senkung des Objektbonus führt dazu, dass Objekte zurückgegeben oder gelöscht werden.
Standard: 1.0
@@ -3499,9 +3532,9 @@ Standard: 00000000-0000-0000-0000-000000000000 oder leer
</alert>
<alert name="HelpRegionDisableScripts" title="Skripts deaktivieren">
<message name="message">
- Schlechte Sim-Performance ist oftmals auf ein Skript zurückzuführen. Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert für 'Simulator Physics FPS' (Simulator Physik-FPS) an.
-Wenn der Wert unter 45 liegt, öffnen Sie den Bereich 'Time' (Zeit) ganz unten in der Statistikleiste. Wenn der Wert für "Script Time" (Skriptzeit) 25 ms oder höher ist, klicken Sie auf 'Top-Skripts'. Der Name und die Position der Skripts, die für die schlechte Performance verantwortlich sind, werden angezeigt.
-Wenn Sie das Kontrollkästchen 'Skripts deaktivieren' aktivieren und auf 'Übernehmen' klicken, werden alle Skripts in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten 'Top-Skripts' reisen können. Sobald Sie dort angekommen sind, sollten Sie das Skript auf die Ursache des Problems hin untersuchen. Möglicherweise müssen Sie sich an den Skript-Eigentümer wenden oder das Objekt löschen bzw. zurückgeben. Um die Skripte in der Region wieder zu aktivieren, deaktivieren Sie 'Skript deaktivieren' und klicken Sie auf 'Übernehmen'.
+ Schlechte Sim-Performance ist oftmals auf ein Skript zurückzuführen. Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert für „Simulator Physics FPS“ (Simulator Physik-FPS) an.
+Wenn der Wert unter 45 liegt, öffnen Sie den Bereich „Time“ (Zeit) ganz unten in der Statistikleiste. Wenn der Wert für „Script Time“ (Skriptzeit) 25 ms oder höher ist, klicken Sie auf „Top-Skripts“. Der Name und die Position der Skripts, die für die schlechte Performance verantwortlich sind, werden angezeigt.
+Wenn Sie das Kontrollkästchen „Skripts deaktivieren“ aktivieren und auf „Übernehmen“ klicken, werden alle Skripts in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten „Top-Skripts“ reisen können. Sobald Sie dort angekommen sind, sollten Sie das Skript auf die Ursache des Problems hin untersuchen. Möglicherweise müssen Sie sich an den Skript-Eigentümer wenden oder das Objekt löschen bzw. zurückgeben. Um die Skripte in der Region wieder zu aktivieren, deaktivieren Sie „Skript deaktivieren“ und klicken Sie auf „Übernehmen“.
Standard: deaktiviert
</message>
@@ -3509,12 +3542,12 @@ Standard: deaktiviert
<alert name="HelpRegionDisableCollisions" title="Kollisionen deaktivieren">
<message name="message">
Schlechte Sim-Performance ist oftmals auf physische Objekte zurückzuführen.
-Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert 'Simulator Physics FPS' an. Liegt dieser unter 45, öffnen Sie unten in der Statistikleiste den 'Time'-Bereich. Liegt die 'Sim Time (Physics)' bei 20 ms oder darüber, klicken Sie auf 'Top-Kollisionsobjekte'.
+Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert „Simulator Physics FPS“ an. Liegt dieser unter 45, öffnen Sie unten in der Statistikleiste den „Time“-Bereich. Liegt die „Sim Time (Physics)“ bei 20 ms oder darüber, klicken Sie auf „Top-Kollisionsobjekte“.
Der Name und der Standort der physischen Objekte, die das Problem verursachen, werden angezeigt.
-Wenn Sie das Kontrollkästchen 'Kollisionen deaktivieren' aktivieren und auf 'Übernehmen' klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten 'Top-Kollisionsobjekts' reisen können. Überprüfen Sie das Objekt an der angegebenen Position.
+Wenn Sie das Kontrollkästchen „Kollisionen deaktivieren“ aktivieren und auf „Übernehmen“ klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten „Top-Kollisionsobjekts“ reisen können. Überprüfen Sie das Objekt an der angegebenen Position.
Kollidiert es ständig mit anderen Objekten? Wenden Sie sich eventuell an den Eigentümer des Objekts, löschen Sie es oder geben Sie es zurück.
-Deaktivieren Sie die Option 'Kollisionen deaktivieren' und klicken Sie auf 'Übernehmen', um Kollisionen in dieser Region wieder zu aktivieren.
+Deaktivieren Sie die Option „Kollisionen deaktivieren“ und klicken Sie auf „Übernehmen“, um Kollisionen in dieser Region wieder zu aktivieren.
Standard: deaktiviert
</message>
@@ -3532,13 +3565,13 @@ Standard: deaktiviert
</alert>
<alert name="HelpRegionTopColliders" title="Top-Kollisionsobjekte">
<message name="message">
- Zeigt eine Liste der Objekte mit den potenziell meisten Objekt-Objekt-Kollisionen an. Diese Objekte können die Leistung beeinträchtigen. Wählen Sie 'Ansicht' > 'Statistikleiste' aus und sehen Sie unter 'Simulator' > 'Time' > 'Sim Time (Physics)' nach, ob die Physikberechnung länger als 20 ms dauert.
+ Zeigt eine Liste der Objekte mit den potenziell meisten Objekt-Objekt-Kollisionen an. Diese Objekte können die Leistung beeinträchtigen. Wählen Sie „Ansicht“ > „Statistikleiste“ aus und sehen Sie unter „Simulator“ > „Time“ > „Sim Time (Physics)“ nach, ob die Physikberechnung länger als 20 ms dauert.
</message>
</alert>
<alert name="HelpRegionTopScripts" title="Top-Skripts">
<message name="message">
Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen, um LSL-Skripts auszuführen. Diese Objekte können die Leistung beeinträchtigen.
-Wählen Sie 'Ansicht' > 'Statistikleiste' und sehen Sie unter 'Simulator' > 'Time' > 'Script Time' nach, ob mehr als 25 ms für Skripts benötigt werden.
+Wählen Sie „Ansicht“ > „Statistikleiste“ und sehen Sie unter „Simulator“ > „Time“ > „Script Time“ nach, ob mehr als 25 ms für Skripts benötigt werden.
</message>
</alert>
<alert name="HelpRegionRestart" title="Region neu starten">
@@ -3550,21 +3583,21 @@ Der Neustart der Region behebt die meisten Leistungs-probleme, sollte aber nur n
</alert>
<alert name="HelpRegionWaterHeight" title="Wasserhöhe">
<message name="message">
- Die Höhe der Wasserlinie in Metern. Liegt dieser Wert unter 20 und haben Sie Wasser nahe am Rand der Welt oder 'offenes' Wasser definiert, wird eine deutliche Lücke sichtbar.
+ Die Höhe der Wasserlinie in Metern. Liegt dieser Wert unter 20 und haben Sie Wasser nahe am Rand der Welt oder „offenes“ Wasser definiert, wird eine deutliche Lücke sichtbar.
Standard: 20
</message>
</alert>
<alert name="HelpRegionTerrainRaise" title="Obere Terraingrenze">
<message name="message">
- Der maximale Betrag in Metern, um den Parzelleneigentümer ihr Terrain über die Standardhöhe des 'geformten' Terrains erhöhen können.
+ Der maximale Betrag in Metern, um den Parzelleneigentümer ihr Terrain über die Standardhöhe des „geformten“ Terrains erhöhen können.
Standard: 4
</message>
</alert>
<alert name="HelpRegionTerrainLower" title="Untere Terraingrenze">
<message name="message">
- Der maximale Betrag in Metern, um den Parzelleneigentümer ihr Terrain unter die Standardhöhe des 'geformten' Terrains absenken können.
+ Der maximale Betrag in Metern, um den Parzelleneigentümer ihr Terrain unter die Standardhöhe des „geformten“ Terrains absenken können.
Standard: -4
</message>
@@ -3597,7 +3630,7 @@ Standard: deaktiviert
</alert>
<alert name="HelpRegionBakeTerrain" title="Terrain formen">
<message name="message">
- Mit dieser Schaltfläche speichern Sie die aktuelle Terrain-Form als neuen Standard für die Region. Nach der Formung können Sie und andere das Land mit der Option 'Terrain bearbeiten' > 'Zurücksetzen' in den ursprünglichen Zustand zurückversetzen. Das geformte Terrain ist auch das Zentrum für die oberen und unteren Terraingrenzen.
+ Mit dieser Schaltfläche speichern Sie die aktuelle Terrain-Form als neuen Standard für die Region. Nach der Formung können Sie und andere das Land mit der Option „Terrain bearbeiten“ > „Zurücksetzen“ in den ursprünglichen Zustand zurückversetzen. Das geformte Terrain ist auch das Zentrum für die oberen und unteren Terraingrenzen.
</message>
</alert>
<alert name="HelpEstateEstateManager" title="Grundstücksverwalter">
@@ -3609,7 +3642,7 @@ Nur der Eigentümer kann den Grundstücksverwalter bestimmen und entlassen. Der
</alert>
<alert name="HelpEstateUseGlobalTime" title="Globale Zeit verwenden">
<message name="message">
- Aktivieren Sie diese Option, um auf Ihrem Grundstück denselben Sonnenstand wie auf dem Linden-'Mainland' einzustellen.
+ Aktivieren Sie diese Option, um auf Ihrem Grundstück denselben Sonnenstand wie auf dem Linden-„Mainland“ einzustellen.
Standard: aktiviert
</message>
@@ -3635,12 +3668,12 @@ Standard: deaktiviert
</alert>
<alert name="HelpEstateAllowResident" title="Zugang erlauben">
<message name="message">
- Der Zugang zu diesem Grundstück wird auf die hier aufgeführten Einwohner und Gruppen beschränkt. Diese Einstellung ist nur verfügbar, wenn 'Öffentlich' deaktiviert ist.
+ Der Zugang zu diesem Grundstück wird auf die hier aufgeführten Einwohner und Gruppen beschränkt. Diese Einstellung ist nur verfügbar, wenn „Öffentlich“ deaktiviert ist.
</message>
</alert>
<alert name="HelpEstateAllowGroup" title="Gruppenzugang erlauben">
<message name="message">
- Der Zugang zu diesem Grundstück wird auf die hier aufgeführten Einwohner und Gruppen beschränkt. Diese Einstellung ist nur verfügbar, wenn 'Öffentlich' deaktiviert ist.
+ Der Zugang zu diesem Grundstück wird auf die hier aufgeführten Einwohner und Gruppen beschränkt. Diese Einstellung ist nur verfügbar, wenn „Öffentlich“ deaktiviert ist.
</message>
</alert>
<alert name="HelpEstateAbuseEmailAddress" title="E-Mail-Adresse für Missbrauchsmeldungen">
@@ -3668,7 +3701,7 @@ Standard: deaktiviert
</alert>
<alert name="HelpEstateCovenant" title="Grunstücksvertrag">
<message name="message">
- Ein Grundstücksvertrag ermöglicht es Ihnen, Grundstücksparzellen zu verkaufen. Ohne Vertrag können Sie kein Land verkaufen. Wenn Sie keine Regeln festlegen oder Käufern vor dem Kauf keine anderen Informationen über das Land bereitstellen möchten, können Sie die Vertrags-Notizkarte auch leer lassen. Ein Vertrag kann Regeln und Richtlinien, kulturelle Informationen oder einfach nur Ihre eigenen Erwartungen bezüglich der Landnutzung durch den Käufer enthalten. Das kann Zoning, Baubeschränkungen, Zahloptionen und alle möglichen anderen Informationen betreffen, die der neue Eigentümer Ihrer Meinung nach kennen und akzeptieren sollte. Der Käufer muss dem Vertrag durch Auswahl dieses Kontrollkästchens zustimmen, bevor der Kauf abgeschlossen werden kann. Grundstücksverträge sind jederzeit unter 'Land-Info' für jede Parzelle einsehbar, für die ein Vertrag definiert wurde.
+ Ein Grundstücksvertrag ermöglicht es Ihnen, Grundstücksparzellen zu verkaufen. Ohne Vertrag können Sie kein Land verkaufen. Wenn Sie keine Regeln festlegen oder Käufern vor dem Kauf keine anderen Informationen über das Land bereitstellen möchten, können Sie die Vertrags-Notizkarte auch leer lassen. Ein Vertrag kann Regeln und Richtlinien, kulturelle Informationen oder einfach nur Ihre eigenen Erwartungen bezüglich der Landnutzung durch den Käufer enthalten. Das kann Zoning, Baubeschränkungen, Zahloptionen und alle möglichen anderen Informationen betreffen, die der neue Eigentümer Ihrer Meinung nach kennen und akzeptieren sollte. Der Käufer muss dem Vertrag durch Auswahl dieses Kontrollkästchens zustimmen, bevor der Kauf abgeschlossen werden kann. Grundstücksverträge sind jederzeit unter „Land-Info“ für jede Parzelle einsehbar, für die ein Vertrag definiert wurde.
</message>
</alert>
<alert name="BuyObjectOneOnly" title="Objekte können nicht gekauft werden">
@@ -3833,7 +3866,7 @@ Sie haben die Position dieser Auswahl aktualisiert, aber die anderen Daten behal
</alert>
<alert name="MoveInventoryFromObject">
<message name="message">
- Sie haben 'nicht kopierfähige' Inventarobjekte ausgewählt.
+ Sie haben „nicht kopierfähige“ Inventarobjekte ausgewählt.
Diese Objekte werden nicht kopiert, sondern in Ihr Inventar verschoben.
Inventarobjekt(e) verschieben?
@@ -3850,7 +3883,7 @@ Inventarobjekt(e) verschieben?
</alert>
<alert name="MoveInventoryFromScriptedObject">
<message name="message">
- Sie haben 'nicht kopierfähige' Inventarobjekte ausgewählt. Diese Objekte werden nicht kopiert, sondern in Ihr Inventar verschoben.
+ Sie haben „nicht kopierfähige“ Inventarobjekte ausgewählt. Diese Objekte werden nicht kopiert, sondern in Ihr Inventar verschoben.
Da es sich um ein geskriptetes Objekt handelt, geht die Skriptfunktion beim Verschieben in das Inventar möglicherweise verloren.
Inventarobjekt(e) verschieben?
@@ -3867,10 +3900,10 @@ Inventarobjekt(e) verschieben?
</alert>
<alert name="ClickActionNotPayable">
<message name="message">
- Achtung: Die Klick-Aktion 'Objekt bezahlen' wurde definiert, sie funktioniert aber nur, wenn ein Skript mit einem money() Ereignis hinzugefügt wird.
+ Achtung: Die Klick-Aktion „Objekt bezahlen“ wurde definiert, sie funktioniert aber nur, wenn ein Skript mit einem money() Ereignis hinzugefügt wird.
</message>
<ignore name="ignore">
- Beim Einrichten von Events mit 'Objektbezahlung' ohne Geld
+ Beim Einrichten von Events mit „Objektbezahlung“ ohne Geld
</ignore>
</alert>
<alert name="OpenObjectCannotCopy">
@@ -3950,7 +3983,7 @@ http://secondlife.com/support/incidentreport.php
<message name="message">
WICHTIG: Diese Meldung wird an den Eigentümer der Region gesendet, in der Sie sich gerade befinden, nicht an Linden Lab.
-
-Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer dieser Region die Bearbeitung aller anfallenden Meldungen. Von diesem Standort aus eingereichte Meldungen werden nicht von Linden Lab bearbeitet. Der Eigentümer der Region bearbeitet Meldungen auf Grundlage der Richtlinien, die im für diese Region geltenden Grundstücksvertrag festgelegt sind. (Den Vertrag können Sie unter 'Welt' > 'Land-Info' einsehen.)
+Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer dieser Region die Bearbeitung aller anfallenden Meldungen. Von diesem Standort aus eingereichte Meldungen werden nicht von Linden Lab bearbeitet. Der Eigentümer der Region bearbeitet Meldungen auf Grundlage der Richtlinien, die im für diese Region geltenden Grundstücksvertrag festgelegt sind. (Den Vertrag können Sie unter „Welt“ > „Land-Info“ einsehen.)
-
Das Resultat, das sich aus dieser Meldung ergibt, betrifft nur diese Region; der Einwohnerzugang zu anderen Bereichen von Second Life ist davon nicht betroffen. Nur Linden Lab kann den Zugang zu Second Life beschränken.
</message>
@@ -4142,7 +4175,7 @@ Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort
</alert>
<alert name="GraphicsPreferencesHelp">
<message name="message">
- Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung im Client. Im Fenster 'Einstellungen' > 'Grafik' stehen vier Grafikeinstellungen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Die Grafikeinstellungen lassen sich auch individuell anpassen; aktivieren Sie das Kontrollkästchen 'Benutzerdefiniert', um die folgenden Einstellungen zu bearbeiten:
+ Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung im Client. Im Fenster „Einstellungen“ > „Grafik“ stehen vier Grafikeinstellungen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Die Grafikeinstellungen lassen sich auch individuell anpassen; aktivieren Sie das Kontrollkästchen „Benutzerdefiniert“, um die folgenden Einstellungen zu bearbeiten:
Shader: Aktivieren oder deaktivieren Sie die verschiedenen Pixel-Shader.
@@ -4220,34 +4253,34 @@ Terraindetails: Legt den Detailgrad bei der Berechnung der Terraintextur fest.
<message name="message">
Diese Einstellungen haben Auswirkung auf die lokale Darstellung der Umwelt auf Ihrem Computer. Zugriff auf alle Einstellungen haben Sie nur, wenn Ihre Grafikkarte Atmosphären-Shader unterstützt.
-Mit dem Regler "Tageszeit" stellen Sie die lokal in Ihrem Viewer dargestellte Tageszeit ein.
+Mit dem Regler „Tageszeit“ stellen Sie die lokal in Ihrem Viewer dargestellte Tageszeit ein.
-Mit dem Regler "Wolkendecke" steuern Sie die Wolkendichte am Himmel.
+Mit dem Regler „Wolkendecke“ steuern Sie die Wolkendichte am Himmel.
-Unter "Wasserfarbe" können Sie eine Farbe für die Wasserdarstellung auswählen.
+Unter „Wasserfarbe“ können Sie eine Farbe für die Wasserdarstellung auswählen.
-Mit dem Regler "Wassertrübung" steuern Sie die Sichtweite unter Wasser.
+Mit dem Regler „Wassertrübung“ steuern Sie die Sichtweite unter Wasser.
-Klicken Sie auf "Grundstückszeit verw.", um die aktuelle Zeit in der Region fest als Tageszeit einzustellen.
+Klicken Sie auf „Grundstückszeit verw.“, um die aktuelle Zeit in der Region fest als Tageszeit einzustellen.
-Klicken Sie auf "Himmel (erweitert)", um einen Editor mit erweiterten Einstellungen für die Himmeldarstellung anzuzeigen.
+Klicken Sie auf „Himmel (erweitert)“, um einen Editor mit erweiterten Einstellungen für die Himmeldarstellung anzuzeigen.
-Klicken Sie auf "Wasser (erweitert)", um einen Editor mit erweiterten Einstellungen für die Wasserdarstellung anzuzeigen.
+Klicken Sie auf „Wasser (erweitert)“, um einen Editor mit erweiterten Einstellungen für die Wasserdarstellung anzuzeigen.
</message>
</alert>
<alert name="HelpDayCycle">
<message name="message">
Im Tageszyklus-Editor steuern Sie den Tag-/Nachtzyklus am Second Life Himmel. Dabei handelt es sich um den Zyklus, der mit dem Tageszeit-Regler im Umwelt-Basiseditor gesteuert wird.
-Der Tageszyklus-Editor verwendet sogenannte Keyframes zur Steuerung des Tag-/Nachtablaufs. Dabei handelt es sich um "Schlüsselbilder" (die grauen Kreise auf der Zeitskala), für die bestimmte Himmelseinstellungen definiert wurden. Bei voranschreitender Tageszeit interpoliert WindLight den Übergang zwischen diesen Keyframes und erzeugt eine entsprechende Himmelsanimation.
+Der Tageszyklus-Editor verwendet sogenannte Keyframes zur Steuerung des Tag-/Nachtablaufs. Dabei handelt es sich um „Schlüsselbilder“ (die grauen Kreise auf der Zeitskala), für die bestimmte Himmelseinstellungen definiert wurden. Bei voranschreitender Tageszeit interpoliert WindLight den Übergang zwischen diesen Keyframes und erzeugt eine entsprechende Himmelsanimation.
-Der gelbe Pfeil über der Zeitskala repräsentiert die aktuelle Tageszeit-Darstellung. Ziehen Sie den Pfeil, um die Tagesanimation anzuzeigen. Mit "Key hinzu" und "Key löschen" rechts neben der Zeitskala können Sie neue Keys einfügen und vorhandene löschen.
+Der gelbe Pfeil über der Zeitskala repräsentiert die aktuelle Tageszeit-Darstellung. Ziehen Sie den Pfeil, um die Tagesanimation anzuzeigen. Mit „Key hinzu“ und „Key löschen“ rechts neben der Zeitskala können Sie neue Keys einfügen und vorhandene löschen.
-Keyframes lassen sich einfach entlang der Zeitskala verschieben, oder Sie geben die Werte manuell unter "Keyframe-Einstellungen" ein. Hier wählen Sie auch eine WindLight-Voreinstellung für den Keyframe aus.
+Keyframes lassen sich einfach entlang der Zeitskala verschieben, oder Sie geben die Werte manuell unter „Keyframe-Einstellungen“ ein. Hier wählen Sie auch eine WindLight-Voreinstellung für den Keyframe aus.
-"Zykluslänge" bestimmt die Gesamtlänge eines "Tages". Ein niedriger Wert (z.B. 2 Minuten) führt dazu, dass ein ganzer 24-Stunden-Tag innerhalb von zwei Minuten Echtzeit abgespult wird! Wenn Sie alle Einstellungen auf der Zeitskala und für die einzelnen Keyframes vorgenommen haben, können Sie mit "Start" und "Stopp" die Animation anzeigen. Das funktioniert natürlich genauso interaktiv, indem Sie den gelben Pfeil über der Zeitskala verschieben. Mit der Schaltfläche "Grundstückszeit verw." synchronisieren Sie die Tageszeit und -länge mit den auf dem Grundstück geltenden Einstellungen.
+„Zykluslänge“ bestimmt die Gesamtlänge eines „Tages“. Ein niedriger Wert (z.B. 2 Minuten) führt dazu, dass ein ganzer 24-Stunden-Tag innerhalb von zwei Minuten Echtzeit abgespult wird! Wenn Sie alle Einstellungen auf der Zeitskala und für die einzelnen Keyframes vorgenommen haben, können Sie mit „Start“ und „Stopp“ die Animation anzeigen. Das funktioniert natürlich genauso interaktiv, indem Sie den gelben Pfeil über der Zeitskala verschieben. Mit der Schaltfläche „Grundstückszeit verw.“ synchronisieren Sie die Tageszeit und -länge mit den auf dem Grundstück geltenden Einstellungen.
-Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen "Testtag speichern" und "Testtag laden" speichern bzw. laden. Bis dato kann nur ein Tageszyklus gleichzeitig in Verwendung sein.
+Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen „Testtag speichern“ und „Testtag laden“ speichern bzw. laden. Bis dato kann nur ein Tageszyklus gleichzeitig in Verwendung sein.
</message>
</alert>
<alert name="HelpBlueHorizon">
@@ -4282,7 +4315,7 @@ Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen "Testtag
</alert>
<alert name="HelpMaxAltitude">
<message name="message">
- Max. Höhe steuert die Höhenberechnungen von WindLight bei der Berechnung der atmosphärischen Beleuchtung. Zu späteren Tageszeiten lässt sich damit zum Beispiel die "Intensität" des Sonnenuntergangs beeinflussen.
+ Max. Höhe steuert die Höhenberechnungen von WindLight bei der Berechnung der atmosphärischen Beleuchtung. Zu späteren Tageszeiten lässt sich damit zum Beispiel die „Intensität“ des Sonnenuntergangs beeinflussen.
</message>
</alert>
<alert name="HelpSunlightColor">
@@ -4297,8 +4330,8 @@ Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen "Testtag
</alert>
<alert name="HelpSunGlow">
<message name="message">
- Der Regler "Größe" steuert die Größe der Sonne.
-Der Regler "Fokus" steuert, wie unscharf die Sonne am Himmel erscheint.
+ Der Regler „Größe“ steuert die Größe der Sonne.
+Der Regler „Fokus“ steuert, wie unscharf die Sonne am Himmel erscheint.
</message>
</alert>
<alert name="HelpSceneGamma">
@@ -4504,9 +4537,6 @@ Entspricht dem Azimut.
</message>
</alert>
<alert name="DebitPermissionDetails" title="Info zur Abfrage der Abbucherlaubnis">
- <message name="message">
- Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object's owner must delete the object or reset the scripts in the object.
- </message>
<option name="OK">
OK
</option>
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 a29ad04..ecb7875 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -104,7 +104,7 @@
</string>
<string name="no_selection_text">
Keine Parzelle ausgewählt.
-Öffnen Sie "Welt" > "Land-Info" oder wählen Sie eine andere Parzelle aus, um Informationen darüber anzuzeigen.
+Öffnen Sie „Welt“ > „Land-Info“ oder wählen Sie eine andere Parzelle aus, um Informationen darüber anzuzeigen.
</string>
</panel>
<panel label="Vertrag" name="land_covenant_panel">
@@ -222,6 +222,7 @@
<column label="Typ" name="type"/>
<column label="Name" name="name"/>
<column label="Zählen" name="count"/>
+ <column label="Aktuellster" name="mostrecent"/>
</name_list>
</panel>
<panel label="Optionen" name="land_options_panel">
@@ -310,7 +311,7 @@
<text name="Teleport Routing: ">
Teleport-Route:
</text>
- <combo_box name="landing type" >
+ <combo_box name="landing type" tool_tip="Teleport-Route -- festlegen, wie Teleports auf Ihrem Land gehandhabt werden sollen." >
<combo_item name="Blocked">
Blockiert
</combo_item>
@@ -401,7 +402,7 @@ Optionen:
<string name="estate_override">
Eine oder mehrere dieser Optionen gelten auf Grundstücksebene
</string>
- <check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register 'Allgemein' festlegen."/>
+ <check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
<combo_box name="pass_combo">
<combo_item name="Anyone">
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index c8a67a8..299b6a7 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -1,42 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Animation Preview" title="">
<text name="name_label">
Name:
</text>
- <line_editor name="name_form" />
+ <line_editor name="name_form"/>
<text name="description_label">
Beschreibung:
</text>
- <spinner label="Priorität" name="priority"
- tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können." />
- <text name="preview_label" width="97">
- Vorschau während:
- </text>
- <combo_box label="" left_delta="107" name="preview_base_anim"
- tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
- <combo_item name="Standing">
- Stehend
- </combo_item>
- <combo_item name="Walking">
- Geht
- </combo_item>
- <combo_item name="Sitting">
- Sitzt
- </combo_item>
- <combo_item name="Flying">
- Fliegend
- </combo_item>
- </combo_box>
- <check_box label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife." bottom_delta="-18" />
- <spinner label="In (%)" name="loop_in_point"
- tool_tip="Anfang einer Animationsschleife festlegen." />
- <spinner label="Aus (%)" name="loop_out_point"
- tool_tip="Ende einer Animationsschleife festlegen." />
+ <spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können."/>
+ <check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife."/>
+ <spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen."/>
+ <spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen."/>
<text name="hand_label">
Handhaltung
</text>
- <combo_box label="" name="hand_pose_combo"
- tool_tip="Controls what hands do during animation.">
+ <combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
<combo_item name="Spread">
Dehnen
</combo_item>
@@ -80,8 +58,10 @@
<text name="emote_label">
Ausdruck
</text>
- <combo_box label="" name="emote_combo"
- tool_tip="Controls what face does during animation.">
+ <combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation.">
+ <combo_item name="[None]">
+ [Keine]
+ </combo_item>
<combo_item name="Aaaaah">
Aaaaah
</combo_item>
@@ -115,6 +95,9 @@
<combo_item name="Laugh">
Lachen
</combo_item>
+ <combo_item name="Plllppt">
+ Bäääh
+ </combo_item>
<combo_item name="Repulsed">
Zurückgestoßen
</combo_item>
@@ -137,31 +120,46 @@
Sorgenvoll
</combo_item>
</combo_box>
- <spinner label="Eingang glätten (s)" name="ease_in_time"
- tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." label_width="105" width="175" />
- <spinner label="Ausgang glätten (s)" name="ease_out_time"
- tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." left="10" bottom_delta="-20" label_width="105" width="175" />
- <button label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben." bottom_delta="-32" />
- <button label="" name="stop_btn" tool_tip="Animation anhalten" />
- <slider label="" name="playback_slider" />
+ <text name="preview_label" width="97">
+ Vorschau während:
+ </text>
+ <combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
+ <combo_item name="Standing">
+ Stehend
+ </combo_item>
+ <combo_item name="Walking">
+ Geht
+ </combo_item>
+ <combo_item name="Sitting">
+ Sitzt
+ </combo_item>
+ <combo_item name="Flying">
+ Fliegend
+ </combo_item>
+ </combo_box>
+ <spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+ <spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+ <button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben."/>
+ <button label="" name="stop_btn" tool_tip="Animation anhalten"/>
+ <slider label="" name="playback_slider"/>
<text name="bad_animation_text">
Animationsdatei konnte nicht gelesen werden.
Wir empfehlen exportierte BVH-Dateien aus Poser 4.
</text>
- <button label="Abbrechen" name="cancel_btn" />
- <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" />
- <text name="failed_to_initialize">
+ <button label="Abbrechen" name="cancel_btn"/>
+ <button label="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
+ <string name="failed_to_initialize">
Bewegung konnte nicht initialisiert werden
- </text>
- <text name="anim_too_long">
+ </string>
+ <string name="anim_too_long">
Animationsdatei ist [LENGTH] Sekunden lang.
Maximal erlaubt sind [MAX_LENGTH] Sekunden.
- </text>
- <text name="failed_file_read">
+ </string>
+ <string name="failed_file_read">
Animationsdatei konnte nicht gelesen werden.
[STATUS]
- </text>
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index f02ffd2..b6b8792 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
@@ -12,6 +12,6 @@ Einwohners ein:
<button label="Auswählen" label_selected="Auswählen" name="Select" />
<button label="Schließen" label_selected="Schließen" name="Close" />
<text name="NotFound">
- '[TEXT]' nicht gefunden
+ „[TEXT]“ nicht gefunden
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index edf80f1..13c4156 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="avatar_texture_debug" title="Avatar-Texturen">
- <text name="">
- Geformte Texturen not sure about this one ... missing context
- </text>
- <text name="">
- Zusammengesetzte Texturen
- </text>
- <text name="baked_label">
+ <text name="baked_label" width="128">
Gebackene Texturen
</text>
- <text name="composite_label">
+ <text name="composite_label" width="150">
Zusammengesetzte Texturen
</text>
<texture_picker label="Kopf" name="baked_head" />
- <texture_picker label="Make-Uup" name="head_bodypaint" />
+ <texture_picker label="Make-Up" name="head_bodypaint" />
<texture_picker label="Haar" name="hair" />
<button label="Abladen" label_selected="Abladen" name="Dump" />
<texture_picker label="Augen" name="baked_eyes" />
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
index c540ad3..f53a113 100644
--- a/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml
@@ -13,10 +13,10 @@
Farbton:
</text>
<text name="s_val_text">
- Sat.:
+ Sätt.:
</text>
<text name="l_val_text">
- Lum:
+ Hell.:
</text>
<check_box label="Sofort übernehmen" name="apply_immediate" />
<button label="" label_selected="" name="color_pipette" />
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index 65f4fa7..7ceb7bd 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -108,7 +108,7 @@ und diese anziehen.
<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="Gesichts" label_selected="Gesichts" name="Facial" />
+ <button label="Gesichtshaar" label_selected="Gesichtshaar" name="Facial" />
<text type="string" length="1" name="title">
[DESC]
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_directory.xml b/indra/newview/skins/default/xui/de/floater_directory.xml
index c149fb4..8c4a989 100644
--- a/indra/newview/skins/default/xui/de/floater_directory.xml
+++ b/indra/newview/skins/default/xui/de/floater_directory.xml
@@ -291,11 +291,11 @@ Zeit gemessen, die Benutzer dort verbringen.
<button label="Suchen" label_selected="Suchen" name="Search" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" follows="left|top"
- font="SansSerifSmall" h_pad="0" halign="left" height="32" left="354"
+ font="SansSerifSmall" h_pad="0" halign="left" height="32" left="374"
mouse_opaque="true" name="land" v_pad="0" width="430">
Land kann direkt für Linden Dollar (L$) oder bei einer Auktion für L$
-oder US$ erworben werden. Um direkt zu kaufen, klicken Sie auf dem betreffenden
-Land in der Titelleiste auf den Namen.
+oder US$ erworben werden. Um direkt zu kaufen, klicken sie auf den
+Namen des Landes in der Titelleiste
</text>
<scroll_list name="results">
<column label="" name="icon" />
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index ac51786..dcb6982 100644
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -15,7 +15,7 @@
<check_box label="Startbereich Einleitung" name="check prelude"
tool_tip="Diese Region zu einem Startbereich machen." />
<check_box label="Sonne fest" name="check fixed sun"
- tool_tip="Fixiert den Sonnenstand (wie in 'Region/Grundstück' > 'Terrain'." />
+ tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ > „Terrain“." />
<check_box label="Zuhause auf Teleport zurücksetzen" name="check reset home"
tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." height="32" />
<check_box label="Sichtbar" name="check visible"
diff --git a/indra/newview/skins/default/xui/de/floater_group_info.xml b/indra/newview/skins/default/xui/de/floater_group_info.xml
index 9d1dde8..7d07c9f 100644
--- a/indra/newview/skins/default/xui/de/floater_group_info.xml
+++ b/indra/newview/skins/default/xui/de/floater_group_info.xml
@@ -84,7 +84,7 @@
Gruppenwahl
</text>
<text name="instructions">
- Klicken Sie auf 'Wahl starten', um eine neue Wahl zu starten.
+ Klicken Sie auf „Wahl starten“, um eine neue Wahl zu starten.
Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
</text>
<text name="lbl">
@@ -134,7 +134,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
Gruppenanfragen
</text>
<text name="instructions">
- Keine aktiven Anfragen. Klicken Sie auf 'Neue Anfrage',
+ Keine aktiven Anfragen. Klicken Sie auf „Neue Anfrage“,
um eine neue Anfrage zu erstellen.
</text>
<text name="proposal_lbl">
@@ -191,7 +191,7 @@ um eine neue Anfrage zu erstellen.
Sie können die Abstimmergebisse anzeigen, indem Sie die Abstimmung auswählen und auf
</text>
<text name="instructions2">
- 'Objekt anzeigen' klicken.
+ „Objekt anzeigen“ klicken.
</text>
<text name="history_list_lbl">
Alte Abstimmungen:
@@ -212,7 +212,7 @@ um eine neue Anfrage zu erstellen.
Einladungen werden als Instant Message gesendet.
</text>
<text name="txt3">
- Klicken Sie auf 'Hinzufügen', um Benutzer zur Liste hinzuzufügen.
+ Klicken Sie auf „Hinzufügen“, um Benutzer zur Liste hinzuzufügen.
</text>
<text name="lbl">
Officers:
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
index e0f43df..afe7bec 100644
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="Objekt prüfen" min_width="440" >
+<floater name="inspect" title="Objekt prüfen" min_width="450" >
<scroll_list name="object_list"
tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
<column label="Objektname" name="object_name" />
diff --git a/indra/newview/skins/default/xui/de/floater_instant_message.xml b/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 8984abb..cb0f7fa 100644
--- a/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -7,7 +7,7 @@
Wird verbunden...
</string>
<string name="connected">
- Verbunden. Klicken Sie auf 'Anruf beenden', um die Verbindung zu trennen
+ Verbunden. Klicken Sie auf „Anruf beenden“, um die Verbindung zu trennen
</string>
<string name="hang_up">
Anruf beendet
diff --git a/indra/newview/skins/default/xui/de/floater_instant_message_group.xml b/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index 10c63f2..a1493aa 100644
--- a/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
@@ -44,7 +44,7 @@
Voice-Chat wird beigetreten...
</string>
<string name="connected">
- Verbunden. Klicken Sie auf 'Anruf beenden', um die Verbindung zu trennen
+ Verbunden. Klicken Sie auf „Anruf beenden“, um die Verbindung zu trennen
</string>
<string name="hang_up">
Voice-Chat verlassen
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index dffbf9e..91ae544 100644
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -99,7 +99,7 @@
Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
</text>
<text name="network_packet_loss_cause_msg">
- Möglicherweise schlechte Verbindung oder zu hoher Wert für 'Bandbreite'.
+ Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
</text>
<text name="network_ping_cause_msg">
Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index 3f4a623..f45983b 100644
--- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
@@ -3,5 +3,5 @@
<check_box label="Cursor folgen" name="lock_check" />
<combo_box label="Sperren" name="history_combo" />
<button label="Zurück" name="back_btn" />
- <button label="Weiterleiten" name="fwd_btn" width="82" />
+ <button label="Weiter" name="fwd_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_mute.xml b/indra/newview/skins/default/xui/de/floater_mute.xml
index cc9919a..5dbb9fc 100644
--- a/indra/newview/skins/default/xui/de/floater_mute.xml
+++ b/indra/newview/skins/default/xui/de/floater_mute.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Stummgeschaltete Einwohner und Objekte">
+<floater name="mute floater" title="Stummgeschaltete Einwohner und Objekte" short_title="Stummschalten-Liste">
<scroll_list name="mutes" tool_tip="List of currently muted residents" />
<button label="Einwohner stummschalten..." label_selected="Einwohner stummschalten..."
name="Mute resident..."
diff --git a/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
index 861ecaf..73c6760 100644
--- a/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
@@ -62,7 +62,7 @@
Outfits sind Ordner, die Kleider und Körperteile enthalten.
Ziehen Sie einen Outfit-Ordner auf Ihren Avatar, um ihn anzuziehen.
-"Neues Outfit" erstellt einen neuen Ordner und speichert darin Kopien der
+„Neues Outfit“ erstellt einen neuen Ordner und speichert darin Kopien der
Objekte, die Sie gerade tragen.
</text>
<text type="string" length="1" name="Folder name:">
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 7b6a693..da385b7 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -15,10 +15,10 @@
<text name="trigger_label">
Auslöser:
</text>
- <text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser 'hallo' durch 'wie geht's' ersetzen, erscheint im Chat anstelle von 'Ich wollte nur hallo sagen' der Text 'Ich wollte nur wie geht's sagen' und die zugehörige Geste wird abgespielt.">
+ <text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht's“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht's sagen“ und die zugehörige Geste wird abgespielt.">
Ersetzen mit:
</text>
- <line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser 'hallo' durch 'wie geht's' ersetzen, erscheint im Chat anstelle von 'Ich wollte nur hallo sagen' der Text 'Ich wollte nur wie geht's sagen' und die zugehörige Geste wird abgespielt."/>
+ <line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht's“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht's sagen“ und die zugehörige Geste wird abgespielt."/>
<text name="key_label">
Tastenkürzel:
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 6e366e5..ddcd2a8 100644
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -37,7 +37,7 @@ dann auf das Objekt:
<text name="owner_name">
Hendrerit Vulputate
</text>
- <combo_box name="category_combo" >
+ <combo_box name="category_combo" tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
<combo_item name="Select_category">
Kategorie auswählen
</combo_item>
@@ -126,7 +126,7 @@ dann auf das Objekt:
Unanständigkeit > Anstößiger Avatarname
</combo_item>
<combo_item name="Indecency__Mature_content_in_PG_region">
- Unanständigkeit > Nicht jugendfreier Inhalt in "Jugendfrei"-Region
+ Unanständigkeit > Nicht jugendfreier Inhalt in „Jugendfrei“-Region
</combo_item>
<combo_item name="Intellectual_property_infringement_Content_Removal">
Urheberrechtsverletzung > Entfernen von Inhalten
diff --git a/indra/newview/skins/default/xui/de/floater_report_bug.xml b/indra/newview/skins/default/xui/de/floater_report_bug.xml
index 1e8cae5..2c8734e 100644
--- a/indra/newview/skins/default/xui/de/floater_report_bug.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_bug.xml
@@ -103,7 +103,7 @@ Erwartete Ergebnisse:
Hinweis: Unvollständige Meldungen werden nicht bearbeitet.
Sollte Ihnen dieser Fehler unerlaubte Aktionen ermöglichen,
die sich eventuell nachteilig auf Leistung oder Sicherheit auswirken,
-wählen Sie die Kategorie 'Exploit'. Vielen Dank!
+wählen Sie die Kategorie „Exploit“. Vielen Dank!
</text>
<button label="Fehler melden" label_selected="Fehler melden" name="send_btn" />
<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
index 053c471..264411c 100644
--- a/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/de/floater_telehub.xml
@@ -7,11 +7,11 @@
Kein Telehub verbunden.
</text>
<text name="help_text_connected">
- Klicken Sie zum Entfernen auf 'Trennen'.
+ Klicken Sie zum Entfernen auf „Trennen“.
</text>
<text name="help_text_not_connected" height="38" bottom_delta="-18" >
Wählen Sie ein Objekt und klicken Sie auf
-'Mit Telehub verbinden'.
+„Mit Telehub verbinden“.
</text>
<button label="Mit Telehub verbinden" name="connect_btn" width="122" />
<button label="Trennen" name="disconnect_btn" left="142" width="98" />
@@ -22,7 +22,7 @@
<button label="Spawn entfernen" name="remove_spawn_point_btn" />
<text name="spawn_point_help">
Wählen Sie ein Objekt und klicken zur
-Positionsangabe auf 'Hinzufügen'. Anschließend
+Positionsangabe auf „Hinzufügen“. Anschließend
können sie das Objekt verschieben oder löschen.
Positionsangaben sind relativ zum
Telehub-Mittelpunkt.
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 0f30d6e..b428585 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -376,29 +376,30 @@
</text>
<spinner label="X" left="115" name="Shear X" />
<spinner label="Y" left="115" name="Shear Y" />
- <text name="advanced_cut">
+ <text name="advanced_cut" left="115" width="153">
Profilschnitt-Beginn und Ende
</text>
- <text name="advanced_dimple">
+ <text name="advanced_dimple" left="115">
Vertiefung-Beginn und Ende
</text>
- <spinner label="B" name="Path Limit Begin" />
+ <spinner label="B" name="Path Limit Begin" left="115"/>
<spinner label="E" name="Path Limit End" />
- <text name="text taper2">
+ <text name="text taper2" left="115">
Verjüngung
</text>
- <spinner label="X" name="Taper X" />
+ <spinner label="X" name="Taper X" left="115"/>
<spinner label="Y" name="Taper Y" />
- <text name="text radius delta">
+ <text name="text radius delta" left="115">
Radius
</text>
- <text name="text revolutions">
+ <text name="text revolutions" width="74">
Umdrehungen
</text>
- <texture_picker label="Textur für gestaltetes Primitiv" name="sculpt texture control"
+ <spinner left="115" name="Radius Offset" />
+ <texture_picker label="Textur für gestaltetes Primitiv" name="sculpt texture control"
tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
<check_box label="Spiegeln" name="sculpt mirror control"
- tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln." />
+ tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln." bottom_delta="-34" />
<check_box label="Wenden" name="sculpt invert control"
tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen." />
<text name="label sculpt type">
@@ -561,7 +562,7 @@
Kacheln pro Meter
</text>
<text name="string repeats per face">
- Wiederholungen pro Gesicht
+ Wiederholungen pro Fläche
</text>
<text name="rpt">
Kacheln pro Meter
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
index 3e9dda9..f9e7bec 100644
--- a/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -1,68 +1,58 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="top_objects" title="wird geladen...">
<text name="title_text">
Wird geladen...
</text>
<scroll_list name="objects_list">
- <column label="Wertung" name="score" width="65" />
- <column label="Name" name="name" width="135" />
- <column label="Eigentümer" name="owner" />
- <column label="Position" name="location" width="125" />
- <column label="Uhrzeit" name="time" />
+ <column label="Wertung" name="score" width="65"/>
+ <column label="Name" name="name" width="135"/>
+ <column label="Eigentümer" name="owner"/>
+ <column label="Position" name="location" width="125"/>
+ <column label="Uhrzeit" name="time"/>
+ <column label="Mono-Uhrzeit:" name="mono_time"/>
</scroll_list>
- <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
- follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
- name="id_editor" text_readonly_color="white" width="244" />
<text name="id_text">
Objekt-ID:
</text>
- <button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen"
- name="show_beacon_btn" right="-10" width="110" />
- <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
- follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
- name="object_name_editor" text_readonly_color="white" width="244" />
+ <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="id_editor" text_readonly_color="white" width="244"/>
+ <button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen" name="show_beacon_btn" right="-10" width="110"/>
<text name="obj_name_text">
Objektname:
</text>
- <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
- name="filter_object_btn" right="-10" width="110" />
- <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
- follows="left|bottom|right" font="SansSerifSmall" height="20" left="106"
- name="owner_name_editor" text_readonly_color="white" width="218" />
+ <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="object_name_editor" text_readonly_color="white" width="244"/>
+ <button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_object_btn" right="-10" width="110"/>
<text name="owner_name_text">
Eigentümername:
</text>
- <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
- name="filter_owner_btn" right="-10" width="110" />
- <button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben"
- left="10" name="return_selected_btn" width="134" />
- <button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben"
- left="150" name="return_all_btn" width="134" />
- <button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren"
- left="10" name="disable_selected_btn" width="134" />
- <button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren"
- left="150" name="disable_all_btn" width="134" />
- <button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren"
- name="refresh_btn" right="-10" width="110" />
- <text name="top_scripts_title">
+ <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true" follows="left|bottom|right" font="SansSerifSmall" height="20" left="106" name="owner_name_editor" text_readonly_color="white" width="218"/>
+ <button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_owner_btn" right="-10" width="110"/>
+ <button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben" left="10" name="return_selected_btn" width="134"/>
+ <button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/>
+ <button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren" left="10" name="disable_selected_btn" width="134"/>
+ <button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren" left="150" name="disable_all_btn" width="134"/>
+ <button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren" name="refresh_btn" right="-10" width="110"/>
+ <string name="top_scripts_title">
Top-Skripts
- </text>
- <text name="top_scripts_text">
+ </string>
+ <string name="top_scripts_text">
[COUNT] Skripts benötigen insgesamt [TIME] ms
- </text>
- <text name="scripts_score_label">
+ </string>
+ <string name="scripts_score_label">
Zeit
- </text>
- <text name="top_colliders_title">
+ </string>
+ <string name="scripts_mono_time_label">
+ Mono-Uhrzeit:
+ </string>
+ <string name="top_colliders_title">
Top-Kollisionsobjekte
- </text>
- <text name="top_colliders_text">
+ </string>
+ <string name="top_colliders_text">
Top [COUNT] Objekte mit vielen potenziellen Kollisionen
- </text>
- <text name="colliders_score_label">
+ </string>
+ <string name="colliders_score_label">
Wertung
- </text>
- <text name="none_descriptor">
+ </string>
+ <string name="none_descriptor">
Nicht gefunden.
- </text>
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index c3d203d..aba6fe5 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="worldmap" title="Weltkarte">
<tab_container name="maptab">
- <panel label="Objekte" name="objects_mapview" />
- <panel label="Terrain" name="terrain_mapview" />
+ <panel label="Objekte" name="objects_mapview"/>
+ <panel label="Terrain" name="terrain_mapview"/>
</tab_container>
<text font="SansSerifSmall" name="land_for_sale_label">
Land erhaeltlich
@@ -16,77 +16,60 @@
<text name="home_label">
Zuhause
</text>
- <button label="Nach Hause" label_selected="Nach Hause" name="Go Home"
- tool_tip="Nach Hause teleportieren" />
- <text name="classifieds_label">
- Anzeigen
- </text>
- <check_box label=" " name="class_chk" />
+ <button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/>
<text name="person_label">
Person
</text>
- <check_box label=" " name="people_chk" />
+ <check_box label=" " name="people_chk"/>
<text name="infohub_label">
Infohub
</text>
- <check_box label=" " name="infohub_chk" />
+ <check_box label=" " name="infohub_chk"/>
<text name="telehub_label">
Telehub
</text>
- <check_box label=" " name="telehubchk" />
- <text name="popular_label">
- Beliebt
- </text>
- <check_box label=" " name="popular_chk" />
+ <check_box label=" " name="telehubchk"/>
<text font="SansSerifSmall" name="land_for_sale_label2">
Land erhaeltlich
</text>
- <check_box label=" " name="land_for_sale_chk" />
+ <check_box label=" " name="land_for_sale_chk"/>
<text name="events_label">
Events
</text>
- <check_box label=" " name="event_chk" />
+ <check_box label=" " name="event_chk"/>
<text name="events_mature_label">
Events (18+)
</text>
- <check_box label=" " name="event_mature_chk" />
- <combo_box label="Online-Freunde" name="friend combo" tool_tip="Friend to Show on Map">
+ <check_box label=" " name="event_mature_chk"/>
+ <combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
<combo_item name="none_selected">
Online-Freunde
</combo_item>
</combo_box>
- <combo_box label="Landmarken" name="landmark combo" tool_tip="Landmark to Show on Map">
+ <combo_box label="Landmarken" name="landmark combo" tool_tip="Landmarke, die auf Karte angezeigt werden soll">
<combo_item name="none_selected">
Landmarken
</combo_item>
</combo_box>
- <line_editor label="Nach Regionsname suchen" name="location"
- tool_tip="Geben Sie den Namen einer Region ein" />
- <button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen" />
+ <line_editor label="Nach Regionsname suchen" name="location" tool_tip="Geben Sie den Namen einer Region ein"/>
+ <button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/>
<text name="search_label">
Suchergebnisse:
</text>
<scroll_list name="search_results">
- <column label="" name="icon" />
- <column label="" name="sim_name" />
+ <column label="" name="icon"/>
+ <column label="" name="sim_name"/>
</scroll_list>
<text name="location_label">
Standort:
</text>
- <spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte" />
- <spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte" />
- <spinner name="spin z" tool_tip="Z-Koordinate der Position auf der Karte" />
- <button label="Teleportieren" label_selected="Teleportieren" name="Teleport"
- tool_tip="Zu ausgewählter Position teleportieren" />
- <button label="Gesuchte Position" label_selected="Ziel anzeigen"
- name="Show Destination"
- tool_tip="Karte auf ausgewählte Position zentrieren" />
- <button label="Löschen" label_selected="Löschen" name="Clear"
- tool_tip="Verfolgung abschalten" />
- <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location"
- tool_tip="Karte auf Position Ihres Avatars zentrieren" />
- <button font="SansSerifSmall" label="SLURL in die Zwischenablage kopieren"
- name="copy_slurl"
- tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Web." />
- <slider label="Zoom" name="zoom slider" />
+ <spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte"/>
+ <spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte"/>
+ <spinner name="spin z" tool_tip="Z-Koordinate der Position auf der Karte"/>
+ <button label="Teleportieren" label_selected="Teleportieren" name="Teleport" tool_tip="Zu ausgewählter Position teleportieren"/>
+ <button label="Gesuchte Position" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/>
+ <button label="Löschen" label_selected="Löschen" name="Clear" tool_tip="Verfolgung abschalten"/>
+ <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position Ihres Avatars zentrieren"/>
+ <button font="SansSerifSmall" label="SLURL in die Zwischenablage kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Web."/>
+ <slider label="Zoom" name="zoom slider"/>
</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 971c662..9305d07 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -114,8 +114,12 @@
<menu_item_call label="Alle Animationen stoppen" name="Stop All Animations"/>
<menu_item_call label="Tasten freigeben" name="Release Keys"/>
<menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Kontostatistik..." name="Account History..."/>
- <menu_item_call label="Mein Konto verwalten..." name="Manage My Account..."/>
+ <menu_item_call label="Kontostatistik..." name="Account History...">
+ <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=de" />
+ </menu_item_call>
+ <menu_item_call label="Mein Konto verwalten..." name="Manage My Account...">
+ <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de" />
+ </menu_item_call>
<menu_item_call label="L$ kaufen..." name="Buy and Sell L$..."/>
<menu_item_separator label="-----------" name="separator5"/>
<menu_item_call label="Mein Land..." name="My Land..."/>
@@ -190,8 +194,13 @@
<menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..."/>
<menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..." name="Publc Issue Tracker Help..."/>
<menu_item_separator label="-----------" name="separator7"/>
- <menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101..."/>
- <menu_item_call label="Sicherheitsfragen..." name="Security Issues..."/>
+ <menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101...">
+ <on_click function="PromptShowURL" name="BugReporting101_url"
+ userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+ </menu_item_call>
+ <menu_item_call label="Sicherheitsfragen..." name="Security Issues...">
+ <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/de" />
+ </menu_item_call>
<menu_item_call label="QA-Wiki..." name="QA Wiki..."/>
<menu_item_separator label="-----------" name="separator9"/>
<menu_item_call label="Fehler melden..." name="Report Bug..."/>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index 57b074e..5384559 100644
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<mimetypes name="default">
<widgetset name="web">
<label name="web_label">
@@ -16,7 +16,7 @@
Video
</label>
<tooltip name="movie_tooltip">
- Kein Video gefunden
+ Ein Video wurde gefunden.
</tooltip>
<playtip name="movie_playtip">
Video wiedergeben
diff --git a/indra/newview/skins/default/xui/de/notify.xml b/indra/newview/skins/default/xui/de/notify.xml
index 0b50afe..3d41aee 100644
--- a/indra/newview/skins/default/xui/de/notify.xml
+++ b/indra/newview/skins/default/xui/de/notify.xml
@@ -235,14 +235,14 @@ Wählen Sie ein einzelnes Objekt aus.
</notify>
<notify name="TeleportToLandmark">
<message name="message">
- Jetzt, nachdem Sie das Mainland erreicht haben, können Sie sich an Positionen wie '[NAME]' teleportieren, indem Sie unten rechts im Fenster auf 'Inventar' klicken und den Ordner 'Landmarken' auswählen.
-Klicken Sie eine Landmarke doppelt an und wählen Sie 'Teleportieren', um an diesen Ort zu gelangen.
+ Jetzt, nachdem Sie das Mainland erreicht haben, können Sie sich an Positionen wie „[NAME]“ teleportieren, indem Sie unten rechts im Fenster auf „Inventar“ klicken und den Ordner „Landmarken“ auswählen.
+Klicken Sie eine Landmarke doppelt an und wählen Sie „Teleportieren“, um an diesen Ort zu gelangen.
</message>
</notify>
<notify name="TeleportToPerson">
<message name="message">
- Jetzt, nachdem Sie das Mainland erreicht haben, können Sie mit Einwohnern wie '[NAME]' Kontakt aufnehmen, indem Sie unten rechts im Fenster auf 'Inventar' klicken und den Ordner 'Visitenkarten' auswählen.
-Klicken Sie die Karte doppelt an, wählen Sie 'Instant Message' und geben Sie eine Nachricht ein.
+ Jetzt, nachdem Sie das Mainland erreicht haben, können Sie mit Einwohnern wie „[NAME]“ Kontakt aufnehmen, indem Sie unten rechts im Fenster auf „Inventar“ klicken und den Ordner „Visitenkarten“ auswählen.
+Klicken Sie die Karte doppelt an, wählen Sie „Instant Message“ und geben Sie eine Nachricht ein.
</message>
</notify>
<notify name="CantSelectLandFromMultipleRegions">
@@ -342,7 +342,7 @@ Laden Sie QuickTime von der QuickTime-Webseite (http://www.apple.com/de/quicktim
<notify name="OtherObjectsReturned2">
<message name="message">
Die Objekte von [FIRST] [LAST] auf dieser
-Parzelle von '[NAME]' wurden an ihren Eigentümer zurückgegeben.
+Parzelle von „[NAME]“ wurden an ihren Eigentümer zurückgegeben.
</message>
</notify>
<notify name="GroupObjectsReturned">
@@ -359,13 +359,13 @@ Nicht transferierbare an die Gruppe übertragene Objekte wurden gelöscht.
</notify>
<notify name="NotSafe">
<message name="message">
- Auf diesem Land ist Schaden aktiviert ('Unsicher').
+ Auf diesem Land ist Schaden aktiviert („Unsicher“).
Verletzungen sind möglich. Wenn Sie sterben, werden Sie zu Ihrem Heimatstandort teleportiert.
</message>
</notify>
<notify name="NoFly">
<message name="message">
- Auf diesem Land ist Fliegen deaktiviert ('Fliegen aus').
+ Auf diesem Land ist Fliegen deaktiviert („Fliegen aus“).
Fliegen ist hier nicht möglich.
</message>
</notify>
@@ -387,7 +387,7 @@ Sie können keine anderen Personen stoßen, außer Ihnen gehört das Land.
</notify>
<notify name="NoBuild">
<message name="message">
- Auf diesem Land ist Bauen deaktiviert ('Bauen aus').
+ Auf diesem Land ist Bauen deaktiviert („Bauen aus“).
Sie können hier keine Objekte erstellen.
</message>
</notify>
@@ -404,7 +404,7 @@ Sie können hier keine Objekte erstellen.
<notify name="NoOutsideScripts">
<message name="message">
Auf diesem Land sind externe Skripts deaktiviert
-('Externe Skripts aus').
+(„Externe Skripts aus“).
Nur Skripts, die dem Landeigentümer gehören, funktionieren.
</message>
</notify>
@@ -455,7 +455,7 @@ Nur Skripts, die dem Landeigentümer gehören, funktionieren.
</notify>
<notify name="UserGiveItem">
<message name="message">
- [NAME] hat Ihnen ein [OBJECTTYPE] namens '[OBJECTNAME]' gegeben.
+ [NAME] hat Ihnen ein [OBJECTTYPE] namens „[OBJECTNAME]“ gegeben.
</message>
<option name="Keep">
Behalten
@@ -726,7 +726,7 @@ Versuchen Sie es in einer Minute erneut, dann wird es schon klappen.
</notify>
<notify name="ScriptQuestion">
<message name="message">
- Das Objekt '[OBJECTNAME]', Eigentum von '[NAME]', möchte:
+ Das Objekt „[OBJECTNAME]“, Eigentum von „[NAME]“, möchte:
[QUESTIONS]
Ist das OK?
@@ -743,12 +743,12 @@ Ist das OK?
</notify>
<notify name="ScriptQuestionCautionChatGranted">
<message name="message">
- Dem Objekt '[OBJECTNAME]', Eigentum von '[OWNERNAME]', in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis gewährt: [PERMISSIONS].
+ Dem Objekt „[OBJECTNAME]“, Eigentum von „[OWNERNAME]“, in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis gewährt: [PERMISSIONS].
</message>
</notify>
<notify name="ScriptQuestionCautionChatDenied">
<message name="message">
- Dem Objekt '[OBJECTNAME]', Eigentum von '[OWNERNAME]', in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis verweigert: [PERMISSIONS].
+ Dem Objekt „[OBJECTNAME]“, Eigentum von „[OWNERNAME]“, in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis verweigert: [PERMISSIONS].
</message>
</notify>
<notify name="ScriptQuestionCautionWarn">
@@ -758,10 +758,10 @@ Ist das OK?
</notify>
<notify name="ScriptQuestionCaution">
<message name="message">
- Das Objekt '[OBJECTNAME]', Eigentum von '[NAME]', möchte:
+ Das Objekt „[OBJECTNAME]“, Eigentum von „[NAME]“, möchte:
[QUESTIONS]
-Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen. Klicken Sie für weitere Informationen auf 'Details'.
+Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen. Klicken Sie für weitere Informationen auf „Details“.
Anfrage gestatten?
</message>
@@ -777,7 +777,7 @@ Anfrage gestatten?
</notify>
<notify name="ScriptDialog">
<message name="message">
- [FIRST] [LAST]s '[TITLE]'
+ [FIRST] [LAST]s „[TITLE]“
[MESSAGE]
</message>
<option name="Ignore">
@@ -786,7 +786,7 @@ Anfrage gestatten?
</notify>
<notify name="ScriptDialogGroup">
<message name="message">
- [GROUPNAME]s '[TITLE]'
+ [GROUPNAME]s „[TITLE]“
[MESSAGE]
</message>
<option name="Ignore">
@@ -809,8 +809,8 @@ Ihren Kontostand sehen Sie in der oberen rechten Ecke des Bildschirms.
<notify name="FirstSit">
<message name="message">
Sie sitzen.
-Benutzen Sie die Pfeiltasten (oder AWSD), um die Ansicht zu ändern.
-Klicken Sie auf 'Aufstehen', um aufzustehen.
+Benutzen Sie die Pfeil- oder WASD-Tasten, um die Ansicht zu ändern.
+Klicken Sie auf „Aufstehen“, um aufzustehen.
</message>
</notify>
<notify name="FirstMap">
@@ -845,16 +845,16 @@ Ihr Ziel ist mit einem großen roten Strahl markiert. Folgen Sie dem roten Pfeil
<notify name="FirstOverrideKeys">
<message name="message">
Ihre Bewegungstasten werden jetzt von einem Objekt gesteuert.
-Probieren Sie die Pfeiltasten oder AWSD aus.
+Probieren Sie die Pfeil- oder WASD-Tasten aus.
Manche Objekte (wie Waffen) müssen per Mouselook gesteuert werden.
-Drücken Sie dazu 'M'.
+Drücken Sie dazu „M“.
</message>
</notify>
<notify name="FirstAppearance">
<message name="message">
Sie bearbeiten gerade Ihr Aussehen.
Benutzen Sie die Pfeiltasten zum Drehen und Zoomen.
-Klicken Sie auf 'Alles speichern', wenn Sie fertig sind, um Ihr Aussehen zu speichern.
+Klicken Sie auf „Alles speichern“, wenn Sie fertig sind, um Ihr Aussehen zu speichern.
Sie können Ihr Aussehen jederzeit verändern.
</message>
</notify>
@@ -877,12 +877,12 @@ Sandkastenregionen kommen selten vor und sind entsprechend gekennzeichnet.
<notify name="FirstFlexible">
<message name="message">
Dieses Objekt ist flexibel.
-Ein flexibles Objekt ist ein Phantom und nicht physisch, bis die Option 'Flexibel' deaktiviert wurde.
+Ein flexibles Objekt ist ein Phantom und nicht physisch, bis die Option „Flexibel“ deaktiviert wurde.
</message>
</notify>
<notify name="FirstDebugMenus">
<message name="message">
- Sie haben das Erweitert-Menü aktiviert.
+ Sie haben das Advanced-Menü aktiviert.
Dieses Menü enthält nützliche Funktionen zum Debuggen von Second Life.
Drücken Sie in Windows Strg-Alt-D (Mac: Befehl-Opt-Umschalt-D) zum Ein- und Ausschalten dieses Menüs.
</message>
@@ -896,7 +896,7 @@ Beispiele für Formtexturen finden Sie in der Inventarbibliothek.
</notify>
<notify name="FirstMedia">
<message name="message">
- Sie haben die Medienwiedergabe gestartet. Unter 'Audio und Video' im Fenster 'Einstellungen' können Sie festlegen, dass Medien automatisch wiedergegeben werden. Beachten Sie, dass dies bei nicht vertrauenswürdigen Medienseiten ein Sicherheitsrisiko darstellen kann.
+ Sie haben die Medienwiedergabe gestartet. Unter „Audio und Video“ im Fenster „Einstellungen“ können Sie festlegen, dass Medien automatisch wiedergegeben werden. Beachten Sie, dass dies bei nicht vertrauenswürdigen Medienseiten ein Sicherheitsrisiko darstellen kann.
</message>
</notify>
<notify name="MaxListSelectMessage">
@@ -908,7 +908,7 @@ von der Liste auswählen.
<notify name="VoiceInviteP2P">
<message name="message">
[NAME] lädt Sie zu einem Voice-Chat ein.
-Klicken Sie auf 'Akzeptieren', um dem Gespräch beizutreten, oder auf 'Ablehnen', um die Einladung auszuschlagen. Klicken Sie auf 'Stummschalten', um diesen Anrufer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Anrufer stumm zu schalten.
</message>
<option name="Accept">
Akzeptieren
@@ -938,7 +938,7 @@ Klicken Sie auf 'Akzeptieren', um dem Gespräch beizutreten, oder auf
<notify name="VoiceInviteGroup">
<message name="message">
[NAME] ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten.
-Klicken Sie auf 'Akzeptieren', um dem Gespräch beizutreten, oder auf 'Ablehnen', um die Einladung auszuschlagen. Klicken Sie auf 'Stummschalten', um diesen Anrufer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Anrufer stumm zu schalten.
</message>
<option name="Accept">
Akzeptieren
@@ -953,7 +953,7 @@ Klicken Sie auf 'Akzeptieren', um dem Gespräch beizutreten, oder auf
<notify name="VoiceInviteAdHoc">
<message name="message">
[NAME] ist einem Voice-Konferenz-Chat beigetreten.
-Klicken Sie auf 'Akzeptieren', um dem Gespräch beizutreten, oder auf 'Ablehnen', um die Einladung auszuschlagen. Klicken Sie auf 'Stummschalten', um diesen Benutzer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Benutzer stumm zu schalten.
</message>
<option name="Accept">
Akzeptieren
@@ -968,7 +968,7 @@ Klicken Sie auf 'Akzeptieren', um dem Gespräch beizutreten, oder auf
<notify name="InviteAdHoc">
<message name="message">
[NAME] lädt Sie zu einem Konferenz-Chat ein.
-Klicken Sie auf 'Akzeptieren', um dem Chat beizutreten, oder auf 'Ablehnen', um die Einladung auszuschlagen. Klicken Sie auf 'Stummschalten', um diesen Benutzer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Benutzer stumm zu schalten.
</message>
<option name="Accept">
Akzeptieren
diff --git a/indra/newview/skins/default/xui/de/panel_friends.xml b/indra/newview/skins/default/xui/de/panel_friends.xml
index e82aa07..17c0734 100644
--- a/indra/newview/skins/default/xui/de/panel_friends.xml
+++ b/indra/newview/skins/default/xui/de/panel_friends.xml
@@ -4,7 +4,7 @@
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.">
+ 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" />
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index 0b75f1a..1ecb304 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Allgemein" name="general_tab">
<string name="help_text">
- Die Registerkarte 'Allgemein' enthält Informationen über
+ Die Registerkarte „Allgemein“ enthält Informationen über
diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder,
allgemeine Gruppeneinstellungen und Mitgliederoptionen.
@@ -37,9 +37,9 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
(Eigentümer werden fettgedruckt angezeigt)
</text>
<name_list name="visible_members">
- <column label="Mitgliedsname" name="name"/>
- <column label="Titel" name="title"/>
- <column label="Letzte Anmeldung" name="online"/>
+ <column label="Mitgliedsname" name="name" relwidth="0.40"/>
+ <column label="Titel" name="title" relwidth="0.25"/>
+ <column label="Letzte Anmeldung" name="online" relwidth="0.35"/>
</name_list>
<text name="text_group_preferences">
Gruppeneinstellungen
@@ -48,7 +48,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
<check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
<check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
<check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen." width="125"/>
- <spinner name="spin_enrollment_fee" tool_tip="Wenn 'Beitrittsgebühr' aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
+ <spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
<combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind.">
<combo_item name="select_mature">
- Jugendfreigabe wählen -
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 0ad1aeb..96af8e3 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -3,7 +3,7 @@
<text name="help_text">
Sie können mehrere Einwohner zu Ihrer
Gruppe einladen. Klicken Sie auf
-'Personenauswahl öffnen'.
+„Personenauswahl öffnen“.
</text>
<button label="Personenauswahl öffnen" name="add_button" tool_tip="" />
<name_list name="invitee_list"
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index 77a9816..f942819 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Land und L$" name="land_money_tab">
<text name="help_text">
- Es werden Parzellen in Gruppenbesitz und Beitragsdetails angezeigt. Solange der Wert für 'Insgesamt verwendetes Land' unter oder gleich dem Wert für 'Gesamtbeitrag' ist, wird eine Warnung angezeigt. Die Registerkarten 'Planung', 'Details' und 'Verkäufe' enthalten Informationen über die Gruppenfinanzen.
+ Es werden Parzellen in Gruppenbesitz und Beitragsdetails angezeigt. Solange der Wert für „Insgesamt verwendetes Land“ unter oder gleich dem Wert für „Gesamtbeitrag“ ist, wird eine Warnung angezeigt. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen.
</text>
<button label="?" name="help_button" />
<text name="cant_view_group_land_text">
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 53f5813..5189eea 100644
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -6,7 +6,7 @@ Mitglieder auf dem Laufenden zu halten und
Objekte im Anhang zu versenden. Mitteilungen werden
nur an Mitglieder mit einer entsprechenden Rolle
gesendet. Mitteilungen können unter
-'Allgemein' ausgeschaltet werden.
+„Allgemein“ ausgeschaltet werden.
</text>
<text name="no_notices_text">
Keine älteren Mitteilungen.
@@ -17,7 +17,7 @@ gesendet. Mitteilungen können unter
</text>
<text name="lbl2">
Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung,
-um sie anzuzeigen. Klicken Sie auf 'Aktualisieren', um neue Mitteilungen zu suchen.
+um sie anzuzeigen. Klicken Sie auf „Aktualisieren“, um neue Mitteilungen zu suchen.
Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
</text>
<scroll_list name="notice_list">
@@ -63,7 +63,7 @@ und transferierbar sein. Ordner können nicht gesendet werden.
Archivierte Mitteilung
</text>
<text name="lbl2">
- Klicken Sie zum Senden einer Mitteilung auf 'Neue Mitteilung'.
+ Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
</text>
<text name="lbl3">
Betreff:
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index 1304671..f5671fc 100644
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -63,9 +63,9 @@ um mehrere Mitglieder auszuwählen.
<button label="Suchen" name="search_button"/>
<button label="Alle anzeigen" name="show_all_button"/>
<scroll_list name="role_list">
- <column label="Rolle" name="name"/>
- <column label="Titel" name="title"/>
- <column label="Mitglieder" name="members"/>
+ <column label="Rolle" name="name" width="126"/>
+ <column label="Titel" name="title" width="180"/>
+ <column label="Mitglieder" name="members" width="82"/>
</scroll_list>
<button label="Neue Rolle erstellen..." name="role_create"/>
<button label="Rolle löschen" name="role_delete"/>
@@ -73,10 +73,10 @@ um mehrere Mitglieder auszuwählen.
Rollen haben einen Titel und umfassen bestimmte
Fähigkeiten. Mitglieder können mehrere
Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen
-definieren, darunter 'Jeder' und 'Eigentümer'.
+definieren, darunter „Jeder“ und „Eigentümer“.
</string>
<string name="cant_delete_role">
- Die Rollen 'Jeder' und 'Eigentümer' können nicht gelöscht werden.
+ Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden.
</string>
</panel>
<panel label="Fähigkeiten" name="actions_sub_tab">
@@ -103,7 +103,7 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
<column label="" name="checkbox"/>
<column label="" name="role"/>
</scroll_list>
- <scroll_list name="member_allowed_actions" >
+ <scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
<column label="" name="icon"/>
<column label="" name="action"/>
</scroll_list>
@@ -133,8 +133,8 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
<text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
Zulässige Fähigkeiten
</text>
- <check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte 'Allgemein' für Personen außerhalb der Gruppe sichtbar sind."/>
- <scroll_list name="role_allowed_actions" >
+ <check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/>
+ <scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
<column label="" name="icon"/>
<column label="" name="checkbox"/>
<column label="" name="action"/>
@@ -145,7 +145,7 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
Beschreibung
</text>
<text_editor name="action_description">
- Diese Fähigkeit heißt 'Mitglieder aus dieser Gruppe werfen'. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
+ Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
</text_editor>
<text name="static2">
Rollen mit Fähigkeit
diff --git a/indra/newview/skins/default/xui/de/panel_group_voting.xml b/indra/newview/skins/default/xui/de/panel_group_voting.xml
index 1f4480d..e49e7ed 100644
--- a/indra/newview/skins/default/xui/de/panel_group_voting.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_voting.xml
@@ -19,7 +19,7 @@ erstellen, darüber abstimmen und alte Anfragen anzeigen.
</text>
<text name="proposals_header_view_inst">
Doppelklicken Sie auf die Anfrage, für die Sie abstimmen möchten,
-oder klicken Sie auf 'Neue Anfrage', um eine neue zu erstellen.
+oder klicken Sie auf „Neue Anfrage“, um eine neue zu erstellen.
</text>
<text name="proposals_header_create_txt">
Neue Anfrage
@@ -32,7 +32,7 @@ Quorum, die Dauer und die erforderliche Mehrheit angeben.
Abstimmung
</text>
<text name="proposals_header_vote_inst">
- Klicken Sie zum Abstimmen auf 'Ja' oder 'Nein' oder
+ Klicken Sie zum Abstimmen auf „Ja“ oder „Nein“ oder
enthalten Sie sich der Stimme.
</text>
<text name="proposals_header_voted_inst">
@@ -42,7 +42,7 @@ enthalten Sie sich der Stimme.
Das Angebot, das Sie erstellen möchten, enthält keine Angaben. Füllen Sie das Angebot aus, bevor Sie es erstellen.
</text>
<text name="proposal_instructions">
- Doppelklicken Sie zum Abstimmen auf eine Anfrage oder klicken Sie auf 'Neue Anfrage', um eine neue zu erstellen.
+ Doppelklicken Sie zum Abstimmen auf eine Anfrage oder klicken Sie auf „Neue Anfrage“, um eine neue zu erstellen.
</text>
<text name="proposal_lbl">
Beschreibung der Anfrage
@@ -89,7 +89,7 @@ enthalten Sie sich der Stimme.
</text>
<text name="instructions">
Doppelklicken Sie auf eine alte Abstimmung oder wählen Sie eine aus und
-klicken Sie für das Ergebnis auf 'Objekt anzeigen'.
+klicken Sie für das Ergebnis auf „Objekt anzeigen“.
</text>
<text name="history_list_lbl">
Alte Abstimmung Ende der Abstimmung
@@ -102,10 +102,10 @@ klicken Sie für das Ergebnis auf 'Objekt anzeigen'.
<button label="Liste anzeigen" label_selected="Liste anzeigen"
name="btn_view_history_list" />
<text name="proposals_submit_yes_txt">
- Mit 'Ja' abgestimmt...
+ Mit „Ja“ abgestimmt...
</text>
<text name="proposals_submit_no_txt">
- Mit 'Nein' abgestimmt...
+ Mit „Nein“ abgestimmt...
</text>
<text name="proposals_submit_abstain_txt">
Enthaltung...
diff --git a/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
index 0e047a5..338f39b 100644
--- a/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
@@ -17,10 +17,10 @@
(URL von Parzelleneigentümer versteckt)
</string>
<string name="media_icon_tooltip_web">
- An diesem Ort werden Inhalte aus dem World Wide Web wiedergegeben. Klicken Sie auf 'Wiedergeben', um Webinhalte wiederzugeben.
+ An diesem Ort werden Inhalte aus dem World Wide Web wiedergegeben. Klicken Sie auf „Wiedergeben“, um Webinhalte wiederzugeben.
</string>
<string name="media_icon_tooltip_movie">
- An diesem Ort werden Videoinhalte wiedergegeben. Klicken Sie auf 'Wiedergeben', um das Video abzuspielen.
+ An diesem Ort werden Videoinhalte wiedergegeben. Klicken Sie auf „Wiedergeben“, um das Video abzuspielen.
</string>
<string name="media_play_tooltip">
Webinhalt an diesem Ort anzeigen.
diff --git a/indra/newview/skins/default/xui/de/panel_overlaybar.xml b/indra/newview/skins/default/xui/de/panel_overlaybar.xml
index 41f6ea0..eff19eb 100644
--- a/indra/newview/skins/default/xui/de/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/de/panel_overlaybar.xml
@@ -6,8 +6,8 @@
<layout_panel name="state_buttons">
<button label="IM erhalten" label_selected="IM erhalten" name="IM Received"
tool_tip="Sie haben eine unbeantwortete Instant Message. Klicken Sie, um IMs anzuzeigen." />
- <button label="Als nicht beschäftigt anzeigen"
- label_selected="Als nicht beschäftigt anzeigen" name="Set Not Busy" font="SansSerifSmall"
+ <button label="Beschäftigt aus"
+ label_selected="Beschäftigt aus" name="Set Not Busy" font="SansSerifSmall"
tool_tip="Chat und IM sind ausgeblendet. Klicken Sie hier, um den Beschäftigt-Modus zu verlassen." />
<button label="Tasten freigeben" label_selected="Tasten freigeben" name="Release Keys" font="SansSerifSmall"
tool_tip="Ein Skript hat die Steuerung übernommen. Klicken Sie hier, um die Steuerung wieder freizugeben." />
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index b142e2e..0fad717 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -79,26 +79,35 @@
<combo_item name="English">
English (Englisch)
</combo_item>
- <combo_item name="Chinese">
- 汉语/漢語 (Chinesisch) - Beta
+ <combo_item name="Danish">
+ Danks (Dänisch) - Beta
</combo_item>
<combo_item name="Deutsch(German)">
Deutsch - Beta
</combo_item>
+ <combo_item name="Spanish">
+ Español (Spanisch) - Beta
+ </combo_item>
<combo_item name="French">
Français (Französisch) - Beta
</combo_item>
- <combo_item name="(Japanese)">
- 日本語 (Japanisch) - Beta
+ <combo_item name="Hungarian">
+ Magyar (Ungarisch) - Beta
</combo_item>
- <combo_item name="(Korean)">
- 한국어 (Koreanisch) - Beta
+ <combo_item name="Polish">
+ Polski (Polnisch) - Beta
</combo_item>
<combo_item name="Portugese">
Português (Portugiesisch) - Beta
</combo_item>
- <combo_item name="Spanish">
- Español (Spanisch) - Beta
+ <combo_item name="Chinese">
+ 汉语/漢語 (Chinesisch) - Beta
+ </combo_item>
+ <combo_item name="(Japanese)">
+ 日本語 (Japanisch) - Beta
+ </combo_item>
+ <combo_item name="(Korean)">
+ 한국어 (Koreanisch) - Beta
</combo_item>
</combo_box>
<check_box label="Objekten Sprache mitteilen" name="language_is_public" tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt."/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_popups.xml b/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
index a9c7edb..eca6fe9 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
@@ -18,7 +18,7 @@
</text>
<check_box label="Automatisch annehmen" name="accept_new_inventory"/>
<check_box label="Nach Annahme automatisch anzeigen" name="show_new_inventory"/>
- <button width="200" label="Alle Popups aktivieren..." name="reset_dialogs_btn" tool_tip="Alle optionalen Popups und 'Das erste Mal'-Meldungen aktivieren."/>
- <button width="200" label="Alle diese Popups deaktivieren..." name="skip_dialogs_btn" tool_tip="Alle optionalen Popups und 'Das erste Mal'-Meldungen deaktivieren."/>
+ <button width="200" label="Alle Popups aktivieren..." name="reset_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen aktivieren."/>
+ <button width="200" label="Alle diese Popups deaktivieren..." name="skip_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen deaktivieren."/>
<check_box label="Neue Objekte im Inventar automatisch anzeigen" name="show_in_inventory"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_voice.xml b/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
index 634eba0..583a62f 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
@@ -15,10 +15,13 @@
<text name="push_to_talk_heading">
Zum Sprechen drücken
</text>
- <check_box label="Viewer im 'Zum-Sprechen-drücken'-Modus starten" name="push_to_talk_check"/>
- <check_box label="'Zum-Sprechen-drücken' im Umschaltmodus verwenden" name="push_to_talk_toggle_check"/>
+ <text_editor name="voice_chat_description" width="465" height="81" bottom_delta="-76">
+ Der Modus „Zum Sprechen drücken“ ermöglicht es Ihnen, zu kontrollieren, wann Ihre Stimme übertragen wird. Wenn Sie im Umschaltmodus sind, drücken Sie die Auslöse-Taste und lassen Sie sie wieder los, um Ihr Mikrofon an und aus zu stellen. Wenn Sie sich nicht im Umschaltmodus befinden, ist das Mikro nur aktiv, während Sie die Auslösetaste gedrückt halten.
+ </text_editor>
+ <check_box label="Viewer im „Zum-Sprechen-drücken“-Modus starten" name="push_to_talk_check"/>
+ <check_box label="„Zum-Sprechen-drücken“ im Umschaltmodus verwenden" name="push_to_talk_toggle_check"/>
<text name="push_to_talk_label">
- Auslöser für 'Zum-Sprechen-drücken':
+ Auslöser für „Zum-Sprechen-drücken“:
</text>
<button label="Taste festlegen" name="set_voice_hotkey_button"/>
<button label="Mittlere Maustaste" name="set_voice_middlemouse_button"/>
diff --git a/indra/newview/skins/default/xui/de/panel_voice_enable.xml b/indra/newview/skins/default/xui/de/panel_voice_enable.xml
index ab10218..8cc29a6 100644
--- a/indra/newview/skins/default/xui/de/panel_voice_enable.xml
+++ b/indra/newview/skins/default/xui/de/panel_voice_enable.xml
@@ -15,9 +15,9 @@
</radio_item>
</radio_group>
<text_editor name="voice_intro_text3">
- Sie können den Voice-Chat jederzeit in den Einstellungen auf der Registerkarte 'Voice-Chat' aktivieren.
+ Sie können den Voice-Chat jederzeit in den Einstellungen auf der Registerkarte „Voice-Chat“ aktivieren.
</text_editor>
<text_editor name="voice_intro_text4">
- Klicken Sie auf 'Weiter', um den Voice-Chat jetzt zu konfigurieren oder klicken Sie auf 'Fertig stellen', um zu Second Life zu wechseln.
+ Klicken Sie auf „Weiter“, um den Voice-Chat jetzt zu konfigurieren oder klicken Sie auf „Fertig stellen“, um zu Second Life zu wechseln.
</text_editor>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_voice_options.xml b/indra/newview/skins/default/xui/de/panel_voice_options.xml
index f9cfba7..2e41e53 100644
--- a/indra/newview/skins/default/xui/de/panel_voice_options.xml
+++ b/indra/newview/skins/default/xui/de/panel_voice_options.xml
@@ -12,12 +12,12 @@
</radio_item>
</radio_group>
<check_box label="Voice-Anrufe nur meinen Freunden erlauben" name="friends_only_check" />
- <check_box label="Viewer im 'Zum-Sprechen-drücken'-Modus starten"
+ <check_box label="Viewer im „Zum-Sprechen-drücken“-Modus starten"
name="push_to_talk_check" />
- <check_box label="'Zum-Sprechen-drücken' im Umschaltmodus verwenden"
+ <check_box label="„Zum-Sprechen-drücken“ im Umschaltmodus verwenden"
name="push_to_talk_toggle_check" />
<text name="push_to_talk_label">
- Auslöser für 'Zum-Sprechen-drücken':
+ Auslöser für „Zum-Sprechen-drücken“:
</text>
<button label="Taste festlegen" name="set_voice_hotkey_button" />
<button label="Mittlere Maustaste" name="set_voice_middlemouse_button" />
diff --git a/indra/newview/skins/default/xui/en-us/alerts.xml b/indra/newview/skins/default/xui/en-us/alerts.xml
index ab323e7..88fad82 100644
--- a/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1402,7 +1402,29 @@ chat, or interact with the world.
Cancel
</option>
</alert>
- <alert modal="true" name="InvalidUUID">
+ <alert modal="true" name="EjectAvatarNoBan">
+ <message name="message">
+ Eject this avatar from your land?
+ </message>
+ <option name="Eject">
+ Eject
+ </option>
+ <option name="Cancel">
+ Cancel
+ </option>
+ </alert>
+ <alert modal="true" name="EjectAvatarFullnameNoBan">
+ <message name="message">
+ Eject [AVATAR_NAME] from your land?
+ </message>
+ <option name="Eject">
+ Eject
+ </option>
+ <option name="Cancel">
+ Cancel
+ </option>
+ </alert>
+ <alert modal="true" name="InvalidUUID">
<message name="message">
Not a valid UUID.
</message>
diff --git a/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index f925abd..4038f4f 100644
--- a/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -182,8 +182,8 @@
name="playback_slider" right="290" show_text="false" />
<text bottom="250" follows="top|left" left="10" name="bad_animation_text">
Unable to read animation file.
-
- We recommend BVH files exported from Poser 4.
+
+We recommend BVH files exported from Poser 4.
</text>
<button bottom="10" follows="bottom|right" height="20" label="Cancel" name="cancel_btn"
right="290" width="123" />
diff --git a/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 7b2c6b6..205d199 100644
--- a/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
@@ -57,7 +57,7 @@
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-120" drop_shadow_visible="true" follows="left|top"
- font="SansSerif" h_pad="0" halign="left" height="16" left="85"
+ font="SansSerif" h_pad="0" halign="left" height="16" left="110"
mouse_opaque="true" name="server_text" right="-10" v_pad="0">
Normal
</text>
diff --git a/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 96f48eb..1b60510 100644
--- a/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -14,7 +14,8 @@
<column label="Owner" name="owner" width="105" />
<column label="Location" name="location" width="130" />
<column label="Time" name="time" width="100" />
- </scroll_list>
+ <column label="Mono Time" name="mono_time" width="55" />
+ </scroll_list>
<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
left="10" name="id_text" width="100">
Object ID:
@@ -61,7 +62,10 @@
<string name="scripts_score_label">
Time
</string>
- <string name="top_colliders_title">
+ <string name="scripts_mono_time_label">
+ Mono Time
+ </string>
+ <string name="top_colliders_title">
Top Colliders
</string>
<string name="top_colliders_text">
@@ -70,7 +74,7 @@
<string name="colliders_score_label">
Score
</string>
- <string name="none_descriptor">
+ <string name="none_descriptor">
None found.
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 2728962..d2c4923 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -262,16 +262,19 @@
</menu_item_check>
<menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
- <on_click function="View.Communicate"/>
- </menu_item_check>
+ <on_click function="ShowFloater" userdata="chat history"/>
+ <on_check function="FloaterVisible" userdata="chat history" />
+ </menu_item_check>
<menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
<on_click function="View.Communicate"/>
- </menu_item_check>
- <menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
+ <on_check function="FloaterVisible" userdata="communicate" />
+ </menu_item_check>
+ <menu_item_check bottom="-170" enabled="true" height="19" label="Inventory" left="0"
mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
<on_click function="ShowFloater" userdata="inventory" />
- </menu_item_call>
+ <on_check function="FloaterVisible" userdata="inventory" />
+ </menu_item_check>
<menu_item_check bottom="-189" enabled="true" height="19" label="Active Speakers" left="0"
mouse_opaque="true" name="Active Speakers" width="211">
<on_click function="ShowFloater" userdata="active speakers" />
@@ -457,12 +460,12 @@
mouse_opaque="true" name="separator4" width="185" />
<menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
mouse_opaque="true" name="Account History..." width="185">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="AccountHistory_url"
userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
</menu_item_call>
<menu_item_call bottom="-267" enabled="true" height="19" label="Manage My Account..." left="0"
mouse_opaque="true" name="Manage My Account..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="ManageMyAccount_url"
userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
</menu_item_call>
<menu_item_call bottom="-286" enabled="true" height="19" label="Buy L$..." left="0"
@@ -717,14 +720,14 @@
mouse_opaque="true" name="separator" width="166" />
<menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
left="0" mouse_opaque="true" name="Official Linden Blog..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="OfficialLindenBlog_url"
userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
</menu_item_call>
<menu_item_separator bottom="-102" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator2" width="166" />
<menu_item_call bottom="-140" enabled="true" height="19" label="Scripting Portal..." left="0"
mouse_opaque="true" name="Scripting Portal..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="ScriptingPortal_url"
userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
</menu_item_call>
<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
@@ -748,36 +751,36 @@
name="Bug Reporting" opaque="true" tear_off="true" width="118">
<menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="PublicIssueTracker_url"
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
<menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="PublicIssueTrackerHelp_url"
userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
</menu_item_call>
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator7" width="250" />
<menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
mouse_opaque="true" name="Bug Reporing 101..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="BugReporting101_url"
userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
</menu_item_call>
<menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
mouse_opaque="true" name="Security Issues..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="SecurityIssues_url"
userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
</menu_item_call>
<menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
mouse_opaque="true" name="QA Wiki..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="QAWiki_url"
userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
</menu_item_call>
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator9" width="250" />
<menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
mouse_opaque="true" name="Report Bug..." width="166">
- <on_click function="PromptShowURL"
+ <on_click function="PromptShowURL" name="ReportBug_url"
userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
</menu_item_call>
</menu>
diff --git a/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index f6b8838..c504d24 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -114,6 +114,7 @@ provide information about the group's finances.
</text>
<tab_container border="false" bottom_delta="-189" height="180" left="6" mouse_opaque="false"
name="group_money_tab_container" tab_position="top" width="406">
+ <!-- Comment out for [DEV-11287]
<panel border="true" bottom_delta="-260" follows="left|top|right|bottom" height="255"
label="Planning" left="1" mouse_opaque="true"
name="group_money_planning_tab" width="398">
@@ -125,6 +126,7 @@ provide information about the group's finances.
Computing...
</text_editor>
</panel>
+ -->
<panel border="true" bottom_delta="-250" follows="left|top|right|bottom" height="250"
label="Details" left="1" mouse_opaque="true" name="group_money_details_tab"
width="398">
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index f784999..3e21b66 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -161,29 +161,38 @@
<combo_item type="string" length="1" enabled="true" name="English" value="en-us">
English
</combo_item>
- <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
- 汉语/漢語 (Chinese) - Beta
+
+ <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+
+ <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+ Dansk (Danish) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
Deutsch (German) - Beta
</combo_item>
+ <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+ Español (Spanish) - Beta
+ </combo_item>
<combo_item type="string" length="1" enabled="true" name="French" value="fr">
Français (French) - Beta
</combo_item>
- <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
- 日本語 (Japanese) - Beta
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
- 한국어 (Korean) - Beta
+ <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+ Magyar (Hungarian) - Beta
</combo_item>
- <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
- Dansk (Danish) - Beta
+ <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+ Polski (Polish) - Beta
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
Portugués (Portuguese) - Beta
</combo_item>
- <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
- Español (Spanish) - Beta
+ <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+ 汉语/漢語 (Chinese) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+ 日本語 (Japanese) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+ 한국어 (Korean) - Beta
</combo_item>
</combo_box>
<check_box bottom="-400" enabled="true"
diff --git a/indra/newview/skins/default/xui/en-us/panel_region_debug.xml b/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index 462728a..91a81df 100644
--- a/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -58,9 +58,9 @@
left="10" name="top_colliders_btn"
tool_tip="List of objects experiencing the most potential collisions"
width="150" />
- <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+ <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="170" name="top_colliders_help" width="18" />
- <button bottom_delta="-20" follows="left|top" height="20" label="Get Top Scripts..."
+ <button bottom_delta="-23" follows="left|top" height="20" label="Get Top Scripts..."
left="10" name="top_scripts_btn"
tool_tip="List of objects spending the most time running scripts"
width="150" />
@@ -69,9 +69,9 @@
<button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
left="10" name="restart_btn"
tool_tip="Give 2 minute countdown and restart region" width="130" />
- <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+ <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="150" name="restart_help" width="18" />
- <button bottom_delta="-20" follows="left|top" height="20" label="Delay Restart"
+ <button bottom_delta="-23" follows="left|top" height="20" label="Delay Restart"
left="10" name="cancel_restart_btn"
tool_tip="Delay region restart by one hour" width="130" />
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_mute.xml b/indra/newview/skins/default/xui/es/floater_mute.xml
index b85345b..e0810f0 100644
--- a/indra/newview/skins/default/xui/es/floater_mute.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Residentes sin sonido & Objetos">
- <scroll_list name="mutes" tool_tip="List of currently muted residents" />
+<floater name="mute floater" title="Residentes & Objetos sin sonido" short_title="Residentes & Objetos sin sonido">
+ <scroll_list name="mutes" />
<button label="Desactivar sonido de residente..."
label_selected="Desactivar sonido de residente..." name="Mute resident..."
tool_tip="Dejar un residente sin sonido" />
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index bb67d7c..d688337 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -76,7 +76,7 @@
<menu_item_check label="Historial del chat" name="Chat History" />
<menu_item_check label="Mensaje instantáneo" name="Instant Message" />
<menu_item_call label="Inventario" name="Inventory" />
- <menu_item_check label="Dejar sin sonido por la lista" name="Mute List" />
+ <menu_item_check label="Residentes & Objetos sin sonido" name="Mute List" />
<menu_item_separator label="-----------" name="separator2" />
<menu_item_check label="Controles de cámara" name="Camera Controls" />
<menu_item_check label="Controles de movimiento" name="Movement Controls" />
diff --git a/indra/newview/skins/default/xui/fr/alerts.xml b/indra/newview/skins/default/xui/fr/alerts.xml
index 7423a43..18557bb 100644
--- a/indra/newview/skins/default/xui/fr/alerts.xml
+++ b/indra/newview/skins/default/xui/fr/alerts.xml
@@ -376,8 +376,8 @@ Aller sur le site de Second Life pour avoir plus d'informations sur les par
<message name="message">
Si ce résident a défini une URL de profil web, vous pouvez :
* Cliquer sur Charger pour afficher la page dans cet onglet ;
- * Cliquer sur Charger &gt; Dans un navigateur externe, pour afficher la page dans votre navigateur par défaut ;
- * Cliquer sur Charger &gt; URL du domicile, pour retourner au profil web du résident.
+ * Cliquer sur Charger > Dans un navigateur externe, pour afficher la page dans votre navigateur par défaut ;
+ * Cliquer sur Charger > URL du domicile, pour retourner au profil web du résident.
Lorsque vous êtes dans votre propre profil, vous pouvez définir n'importe quelle URL comme profil web. Pour cela, saisissez l'URL et cliquez sur OK.
Les autres résidents peuvent visiter l'URL que vous avez définie en regardant votre profil.
@@ -1009,9 +1009,6 @@ Voulez-vous visiter [_URL] pour plus d'informations ?
<option name="No">
Non
</option>
- <url>
- http://www.secondlife.com/corporate/sysreqs.php
- </url>
</alert>
<alert name="UnsupportedGPU">
<message name="message">
@@ -1170,7 +1167,7 @@ pour des conseils et un lien vers la page web d'état du service.
</alert>
<alert name="CannotConnectNoReplyFromLogin">
<message name="message">
- Connexion impossible. Pas de réponse du sim.
+ Connexion impossible. Pas de réponse de la région.
Veuillez réessayer d'ici quelques minutes, ou cliquez sur Aide
pour des conseils et un lien vers la page web d'état du service.
@@ -1359,6 +1356,28 @@ Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le M
Annuler
</option>
</alert>
+ <alert name="EjectAvatarNoBan">
+ <message name="message">
+ Expulser cet avatar de votre terrain ?
+ </message>
+ <option name="Eject">
+ Expulser
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
+ <alert name="EjectAvatarFullnameNoBan">
+ <message name="message">
+ Expulser [AVATAR_NAME] de votre terrain ?
+ </message>
+ <option name="Eject">
+ Expulser
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
<alert name="InvalidUUID">
<message name="message">
UUID invalide
@@ -1673,12 +1692,12 @@ aucune parcelle sélectionnée.
</alert>
<alert name="CannotSetLandOwnerMultipleRegions">
<message name="message">
- Impossible d'imposer la propriété car la sélection couvre plusieurs régions. Veuillez sélectionner une zone plus petite et réessayer.
+ Impossible de définir un propriétaire car la sélection couvre plusieurs régions. Veuillez sélectionner une zone plus petite et réessayer.
</message>
</alert>
<alert name="ForceOwnerAuctionWarning">
<message name="message">
- Cette parcelle est mise aux enchères. Imposer la propriété annulerait les enchères, ce qui pourrait être gênant pour certains résidents si ces dernières ont commencé. Imposer la propriété ?
+ Cette parcelle est mise aux enchères. Définir un propriétaire annulerait les enchères, ce qui pourrait être gênant pour certains résidents si ces dernières ont commencé. Souhaitez-vous définir un propriétaire ?
</message>
<option name="Force">
OK
@@ -1859,8 +1878,8 @@ aucune parcelle sélectionnée.
<message name="message">
Division du terrain impossible :
-vous devez sélectionner toute la parcelle.
-Essayez de sélectionner une partie de la parcelle.
+Toute la parcelle est sélectionnée.
+Sélectionnez une partie de la parcelle uniquement.
</message>
</alert>
<alert name="LandDivideWarning">
@@ -2027,9 +2046,6 @@ Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
Proposer à [NAME] de devenir votre ami(e) ?
</message>
- <editline name="editline">
- Voulez-vous être mon ami(e) ?
- </editline>
<option name="Offer">
OK
</option>
@@ -2077,7 +2093,7 @@ Proposer à [NAME] de devenir votre ami(e) ?
</alert>
<alert name="GodDeleteAllScriptedPublicObjectsByUser">
<message name="message">
- Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains des autres résidents dans ce sim ?
+ Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains des autres résidents dans cette région ?
</message>
<option name="DELETE!!">
OK
@@ -2088,7 +2104,7 @@ Proposer à [NAME] de devenir votre ami(e) ?
</alert>
<alert name="GodDeleteAllScriptedObjectsByUser">
<message name="message">
- Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains de ce sim ?
+ Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
</message>
<option name="!!DELETEALL!!">
OK
@@ -2099,7 +2115,7 @@ Proposer à [NAME] de devenir votre ami(e) ?
</alert>
<alert name="GodDeleteAllObjectsByUser">
<message name="message">
- Êtes-vous certain de vouloir supprimer tous les objets (scriptés ou pas) appartenant à ** [AVATAR_NAME] ** sur tous les terrains de ce sim ?
+ Êtes-vous certain de vouloir supprimer tous les objets (scriptés ou pas) appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
</message>
<option name="!!DELETEALL!!">
OK
@@ -2363,6 +2379,11 @@ pour des conseils et un lien vers la page web d'état du service.
Aide
</option>
</alert>
+ <alert name="ErrorMessage">
+ <message name="message">
+ [ERROR_MESSAGE]
+ </message>
+ </alert>
<alert name="AvatarMoved">
<message name="message">
L'emplacement [TYPE] n'est pas disponible actuellement. [HELP]
@@ -2712,6 +2733,9 @@ Télécharger vers le dossier Applications ?
<message name="message">
Aller sur www.secondlife.com pour gérer votre compte ?
</message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour gérer votre compte
+ </ignore>
<option name="OK">
OK
</option>
@@ -2719,10 +2743,83 @@ Télécharger vers le dossier Applications ?
Annuler
</option>
</alert>
+ <alert name="WebLaunchBugReport101">
+ <message name="message">
+ Pour apprendre à signaler correctement des bugs, consultez le Wiki de [SECOND_LIFE].
+ </message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter le Wiki et apprendre à signaler des bugs
+ </ignore>
+ <option name="Gotopage">
+ OK
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
+ <alert name="WebLaunchSecurityIssues">
+ <message name="message">
+ Pour apprendre à signaler un problème de sécurité, consultez le Wiki de [SECOND_LIFE].
+ </message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter la page Wiki sur les problèmes de sécurité.
+ </ignore>
+ <option name="Gotopage">
+ OK
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
+ <alert name="WebLaunchQAWiki">
+ <message name="message">
+ Consultez le Wiki sur l'Assurance Qualité de [SECOND_LIFE].
+ </message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter la page Wiki sur l'Assurance Qualité.
+ </ignore>
+ <option name="Gotopage">
+ OK
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
+ <alert name="WebLaunchPublicIssue">
+ <message name="message">
+ Pour signaler des bugs et autres problèmes, utilisez le JIRA de [SECOND_LIFE].
+ </message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter le JIRA
+ </ignore>
+ <option name="Gotopage">
+ Aller sur cette page
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
+ <alert name="WebLaunchPublicIssueHelp">
+ <message name="message">
+ Pour apprendre à utiliser JIRA, consultez le Wiki de [SECOND_LIFE].
+ </message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter la page Wiki sur le JIRA
+ </ignore>
+ <option name="Gotopage">
+ Aller sur cette page
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
<alert name="WebLaunchForums">
<message name="message">
Consultez la base de connaissances de [SECOND_LIFE] pour les derniers trucs & astuces.
</message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter la Base de connaissances
+ </ignore>
<option name="Gotopage">
Aller à la page
</option>
@@ -2730,10 +2827,27 @@ Télécharger vers le dossier Applications ?
Annuler
</option>
</alert>
+ <alert name="WebLaunchSupport">
+ <message name="message">
+ Contactez le Service clientèle de [SECOND_LIFE].
+ </message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour contacter le Service clientèle
+ </ignore>
+ <option name="Gotopage">
+ OK
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
<alert name="WebLaunchSupportWiki">
<message name="message">
Visitez le blog officiel des Lindens pour les dernières nouvelles et informations.
</message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter le blog
+ </ignore>
<option name="Gotopage">
Aller à la page
</option>
@@ -2759,6 +2873,9 @@ Télécharger vers le dossier Applications ?
<message name="message">
Consulter le Wiki LSL pour de l'aide sur les scripts ?
</message>
+ <ignore name="ignore">
+ Lors de l'ouverture du navigateur web pour consulter le Guide sur l'écriture de scripts
+ </ignore>
<option name="Gotopage">
Aller à la page
</option>
@@ -3844,6 +3961,20 @@ Déplacer les objets de l'inventaire ?
Vous n'êtes autorisé à copier aucun élément dans cet objet.
</message>
</alert>
+ <alert name="WebLaunchAccountHistory">
+ <message name="message">
+ Aller sur le site de Second Life pour consulter l'historique de votre compte ?
+ </message>
+ <ignore name="ignore">
+ Lors du chargement de la page web contenant l'historique de votre compte
+ </ignore>
+ <option name="Gotopage">
+ Aller sur cette page
+ </option>
+ <option name="Cancel">
+ Annuler
+ </option>
+ </alert>
<alert name="ClickOpenF1Help">
<message name="message">
Visiter les pages d'aide de Second Life ?
@@ -3874,7 +4005,7 @@ Déplacer les objets de l'inventaire ?
</alert>
<alert name="ConfirmQuit">
<message name="message">
- Êtes-vous certain de vouloir continuer ?
+ Êtes-vous certain de vouloir quitter ?
</message>
<ignore name="ignore">
Lorsque vous quittez Second Life
@@ -4513,9 +4644,6 @@ Voulez-vous aller sur le site de Second Life pour vérifier votre âge ?
<option name="No">
Non
</option>
- <url>
- https://secondlife.com/account/verification.php
- </url>
</alert>
<alert name="Cannot enter parcel: no payment info on file">
<message name="message">
@@ -4533,9 +4661,6 @@ Voulez-vous aller sur le site de Second Life pour enregistrer ces informations
<option name="No">
Non
</option>
- <url>
- https://secondlife.com/account/
- </url>
</alert>
<alert name="MissingString">
<message name="message">
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 6c364a6..c922562 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -29,7 +29,7 @@
À vendre :
</text>
<text length="1" name="Not for sale." type="string">
- Pas à vendre.
+ Pas à vendre
</text>
<text length="1" name="For Sale: Price L$[PRICE]." type="string">
Prix : [PRICE] L$.
@@ -47,26 +47,26 @@
</text>
<button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale"/>
<text length="1" name="Claimed:" type="string">
- Acquis le :
+ Acquis :
</text>
<text length="1" name="DateClaimText" type="string">
Tue Aug 15 13:47:25 2006
</text>
<text length="1" name="PriceLabel" type="string">
- Surface :
+ Surface :
</text>
<text length="1" name="PriceText" type="string">
4048 m²
</text>
<text length="1" name="Traffic:" type="string">
- Trafic :
+ Trafic :
</text>
<text length="1" name="DwellText" type="string">
0
</text>
- <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="Buy Land..."/>
+ <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="Buy Land..." width="125" left="130"/>
<button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
- <button label="Acheter un pass..." label_selected="Acheter un pass..." name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain."/>
+ <button label="Acheter un pass..." label_selected="Acheter un pass..." name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125" left="130"/>
<button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="Abandon Land..."/>
<button label="Redemander le terrain..." label_selected="Redemander le terrain…" name="Reclaim Land..."/>
<button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d'un résident, avoir un contenu défini et ne pas être aux enchères."/>
@@ -162,7 +162,7 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa
<text length="1" name="Simulator primitive usage:" type="string">
Prims utilisés sur la parcelle :
</text>
- <text name="objects_available">
+ <text name="objects_available" left="214" width="230">
[COUNT] sur [MAX] ([AVAILABLE] disponibles)
</text>
<string name="objects_available_text">
@@ -171,62 +171,63 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa
<string name="objects_deleted_text">
[COUNT] sur [MAX] ([DELETED] seront supprimés)
</string>
- <text length="1" name="Primitives parcel supports:" type="string">
+ <text length="1" name="Primitives parcel supports:" type="string" width="200">
Prims max. sur la parcelle :
</text>
- <text length="1" name="object_contrib_text" type="string">
+ <text length="1" name="object_contrib_text" type="string" left="214" width="152">
[COUNT]
</text>
<text length="1" name="Primitives on parcel:" type="string">
Prims sur la parcelle :
</text>
- <text length="1" name="total_objects_text" type="string">
+ <text length="1" name="total_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <text length="1" name="Owned by parcel owner:" type="string">
+ <text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
Appartenant au propriétaire :
</text>
- <text length="1" name="owner_objects_text" type="string">
+ <text length="1" name="owner_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <button label="Afficher" label_selected="Afficher" name="ShowOwner"/>
- <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires."/>
- <text length="1" name="Set to group:" type="string">
+ <button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
+ <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+ <text length="1" name="Set to group:" type="string" left="14" width="180">
Donnés au groupe :
</text>
- <text length="1" name="group_objects_text" type="string">
+ <text length="1" name="group_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <button label="Afficher" label_selected="Afficher" name="ShowGroup"/>
- <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires."/>
- <text length="1" name="Owned by others:" type="string">
+ <button label="Afficher" label_selected="Afficher" name="ShowGroup" width="60" right="-135"/>
+ <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+ <text length="1" name="Owned by others:" type="string" left="14" width="128">
Appartenant à d'autres :
</text>
- <text length="1" name="other_objects_text" type="string">
+ <text length="1" name="other_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <button label="Afficher" label_selected="Afficher" name="ShowOther"/>
- <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires."/>
- <text length="1" name="Selected / sat upon:" type="string">
+ <button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
+ <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+ <text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
Sélectionnés/où quelqu'un est assis :
</text>
- <text length="1" name="selected_objects_text" type="string">
+ <text length="1" name="selected_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <text name="Autoreturn">
+ <text name="Autoreturn" width="412" left="4">
Renvoi automatique des objets d'autres résidents (minutes, 0 pour désactiver) :
</text>
- <line_editor name="clean other time"/>
+ <line_editor name="clean other time" right="-6" width="36" />
<text length="1" name="Object Owners:" type="string">
Propriétaires :
</text>
- <button label="Rafraîchir la liste" label_selected="Rafraîchir la liste" name="Refresh List"/>
+ <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh List"/>
<button label="Renvoyer les objets..." label_selected="Renvoyer les objets..." name="Return objects..."/>
<name_list label="Plus récents" name="owner list">
<column label="Type" name="type"/>
<column name="online_status"/>
<column label="Nom" name="name"/>
<column label="Nombre" name="count"/>
+ <column label="Plus récents" name="mostrecent"/>
</name_list>
</panel>
<panel label="Options" name="land_options_panel">
@@ -236,36 +237,37 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa
<check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n'importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/>
<check_box label="Créer des repères" name="check landmark"/>
<check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n'est pas cochée, ils ne pourront voler que lorsqu'ils arrivent et passent au dessus de votre terrain."/>
- <text name="allow_label2">
+ <text name="allow_label2" left="152">
Créer des objets :
</text>
- <check_box label="Tous les résidents" name="edit objects check"/>
- <check_box label="Groupe" name="edit group objects check"/>
- <text name="allow_label3">
+ <check_box label="Tous les résidents" name="edit objects check" left="285"/>
+ <check_box label="Groupe" name="edit group objects check" left="395"/>
+ <text name="allow_label3" left="152" width="134">
Laisser entrer des objets :
</text>
- <check_box label="Tous les résidents" name="all object entry check"/>
- <check_box label="Groupe" name="group object entry check"/>
- <text name="allow_label4">
+ <check_box label="Tous les résidents" name="all object entry check" left="285"/>
+ <check_box label="Groupe" name="group object entry check" left="395"/>
+ <text name="allow_label4" left="152">
Exécuter des scripts :
</text>
- <check_box label="Tous les résidents" name="check other scripts"/>
- <check_box label="Groupe" name="check group scripts"/>
+ <check_box label="Tous les résidents" name="check other scripts" left="285"/>
+ <check_box label="Groupe" name="check group scripts" left="395"/>
<text length="1" name="land_options_label" type="string">
Options du terrain :
</text>
<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
- <check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
- <check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
- <combo_box name="land category">
+ <check_box label="Pas de bousculades" left="14" bottom="-140"
+ name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
+ <check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche" bottom="-160"/>
+ <combo_box name="land category" left="286" width="146" bottom="-160">
<combo_item name="AnyCategory">
- Toute catégorie
+ Toutes catégories
</combo_item>
<combo_item name="LindenLocation">
- Lindens
+ Appartenant aux Lindens
</combo_item>
<combo_item name="Adult">
- Adultes
+ Adulte
</combo_item>
<combo_item name="Arts&Culture">
Art et Culture
@@ -280,7 +282,7 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa
Jeux
</combo_item>
<combo_item name="Hangout">
- Endroit favori
+ Favoris
</combo_item>
<combo_item name="NewcomerFriendly">
Accueil pour les nouveaux
@@ -298,24 +300,24 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa
Autre
</combo_item>
</combo_box>
- <button label="?" label_selected="?" name="?"/>
- <check_box label="Contenu pour adultes" name="MatureCheck" tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte."/>
- <text length="1" name="Snapshot:" type="string">
+ <button label="?" label_selected="?" name="?" left="436" bottom="-160"/>
+ <check_box label="Contenu pour adultes" name="MatureCheck" tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." bottom="-180"/>
+ <text length="1" name="Snapshot:" type="string" bottom="-200">
Photo :
</text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
- <text name="landing_point">
+ <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" bottom="-319"/>
+ <text name="landing_point" bottom="-323">
Lieu d'arrivée : [LANDING]
</text>
<string name="landing_point_none">
(aucun)
</string>
- <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain."/>
- <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Libérer le lieu d'arrivée."/>
- <text length="1" name="Teleport Routing: " type="string">
+ <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain." bottom="-323"/>
+ <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Libérer le lieu d'arrivée." bottom="-323"/>
+ <text length="1" name="Teleport Routing: " type="string" bottom="-343">
Règles de téléportation :
</text>
- <combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain.">
+ <combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." left="140" width="140" bottom="-343">
<combo_item length="1" name="Blocked" type="string">
Bloquée
</combo_item>
@@ -334,65 +336,66 @@ Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre pa
</string>
</panel>
<panel label="Médias" name="land_media_panel">
- <text name="with media:">
+ <text name="with media:" width="85">
Type de média :
</text>
- <combo_box name="media type" tool_tip="Indiquez s'il s'agit de l'URL d'un film, d'une page web ou autre"/>
+ <combo_box name="media type" tool_tip="Indiquez s'il s'agit de l'URL d'un film, d'une page web ou autre" left="97"/>
<text name="mime_type"/>
- <text name="at URL:">
+ <text name="at URL:" width="85">
URL du média :
</text>
- <line_editor name="media_url"/>
+ <line_editor name="media_url" left="97"/>
<button label="Définir..." label_selected="Définir..." name="set_media_url"/>
<text name="Description:">
Description :
</text>
- <line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger"/>
+ <line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger" left="97"/>
<text length="1" name="Media texture:" type="string">
Remplacer
la texture :
</text>
- <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image"/>
+ <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" left="97"/>
<text name="replace_texture_help">
(Les objets avec cette texture affichent le film ou
-la page web quand vous cliquez sur la flèche Jouer).
+la page web quand vous cliquez sur la flèche Jouer.)
</text>
<text name="Options:">
Options
média :
</text>
- <check_box label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais vous n'aurez à faire aucune autre mise à l'échelle ou alignement."/>
+ <check_box left="97" label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais vous n'aurez à faire aucune autre mise à l'échelle ou alignement."/>
<check_box label="Média en boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
- <check_box label="Masquer l'URL du média" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL du média. Cette option n'est pas disponible pour les fichiers HTML."/>
+ <check_box left="97" label="Masquer l'URL du média" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL du média. Cette option n'est pas disponible pour les fichiers HTML."/>
<check_box label="Masquer l'URL de la musique" name="hide_music_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL de la musique."/>
- <text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut.">
+ <text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105" left="102">
Taille du média :
</text>
- <spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
+ <spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." left_delta="89"/>
<spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
<text name="pixels">
pixels
</text>
- <text name="MusicURL:">
- URL de la musique :
+ <text name="MusicURL:" bottom_delta="-28">
+ URL de la
+musique :
</text>
- <line_editor name="music_url"/>
+ <line_editor name="music_url" left="97" bottom_delta="-12"/>
<text name="Sound:">
Son :
</text>
- <check_box label="Limiter le son spatial à cette parcelle" name="check sound local"/>
+ <check_box label="Limiter le son ambiant à cette parcelle" name="check sound local" left="97" />
<text name="Voice settings:">
Voix :
</text>
- <radio_group name="parcel_voice_channel">
+ <radio_group name="parcel_voice_channel" left="97" width="310">
<radio_item name="Estate">
- Utiliser le canal spatial du domaine
+ Utiliser le canal du domaine
</radio_item>
<radio_item name="Private">
- Utiliser un canal spatial privé
+ Utiliser un canal privé
</radio_item>
<radio_item name="Disabled">
- Désactiver les canaux spatiaux audios
+ Désactiver les canaux audios
</radio_item>
</radio_group>
</panel>
@@ -420,7 +423,7 @@ média :
</combo_item>
</combo_box>
<spinner label="Prix en L$ :" name="PriceSpin"/>
- <spinner label="Heures d'accès :" name="HoursSpin"/>
+ <spinner label="Durée en heures :" name="HoursSpin"/>
<text label="Toujours autoriser" name="AllowedText">
Résidents autorisés
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index a38fd12..ceda06b 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -7,10 +7,10 @@
Description :
</text>
<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
- <text name="preview_label">
+ <text name="preview_label" width="110">
Prévisualiser pendant
</text>
- <combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
+ <combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." left_delta="116" width="124">
<combo_item name="Standing">
Debout
</combo_item>
@@ -24,13 +24,13 @@
En train de voler
</combo_item>
</combo_box>
- <check_box label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
- <spinner label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l'animation où la boucle repart."/>
- <spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l'animation où la boucle finit."/>
- <text name="hand_label">
+ <check_box left="6" label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
+ <spinner left="76" label_width="55" width="105" label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l'animation où la boucle repart."/>
+ <spinner left="195" label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l'animation où la boucle finit."/>
+ <text name="hand_label" width="110">
Mouvement de main
</text>
- <combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l'animation">
+ <combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l'animation" left_delta="116" width="124">
<combo_item name="Spread">
Doigts écartés
</combo_item>
@@ -74,7 +74,7 @@
<text name="emote_label">
Expression
</text>
- <combo_box label="" name="emote_combo" tool_tip="Contrôle l'expression du visage au cours de l'animation.">
+ <combo_box label="" name="emote_combo" tool_tip="Contrôle l'expression du visage au cours de l'animation." left_delta="116" width="124">
<combo_item name="[None]">
[None]
</combo_item>
@@ -136,15 +136,16 @@
Soucis
</combo_item>
</combo_box>
- <spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l'animation s'intègre au mouvement."/>
- <spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l'animation disparaît du mouvement."/>
- <button label="" name="play_btn" tool_tip="Jouer/Pauser votre animation."/>
+ <spinner label_width="65" label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l'animation s'intègre au mouvement."/>
+ <spinner label_width="65" left="160" width="125" label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l'animation disparaît du mouvement."/>
+ <button label="" name="play_btn" tool_tip="Jouer/Pauser votre animation." bottom_delta="-48"/>
<button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
<slider label="" name="playback_slider"/>
<text name="bad_animation_text">
Impossible de lire le fichier d'animation.
-Nous recommandons les fichiers BVH extraits de Poser 4.
+Nous recommandons les fichiers BVH extraits de
+Poser 4.
</text>
<button label="Annuler" name="cancel_btn"/>
<button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index bbede9d..f449ae5 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -52,7 +52,7 @@
<text name="info_price">
1500 L$, objets inclus
</text>
- <text name="info_action">
+ <text name="info_action" width="275">
Si vous achetez ce terrain :
</text>
<text name="error_message">
@@ -76,7 +76,7 @@
6,00 US$/mois, facturation annuelle
</combo_item>
</combo_box>
- <text name="land_use_action">
+ <text name="land_use_action" width="210" right="430">
Augmentez vos frais d'occupation de terrain à 40 US$/mois.
</text>
<text name="land_use_reason">
@@ -205,7 +205,8 @@ peut-être chercher une parcelle Premier Terrain moins chère.
Ce terrain est en solde et les frais associés sont de [AMOUNT]/m².
</text>
<text name="meters_supports_object">
- [AMOUNT] m² peuvent contenir [AMOUNT2] prims
+ [AMOUNT] m²
+peuvent contenir [AMOUNT2] prims
</text>
<text name="sold_with_objects">
vendu avec objets
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index 9985a17..ddbcbbd 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="Apparence" width="511">
- <tab_container name="customize tab container" tab_min_width="113" width="509">
+<floater name="floater customize" title="Apparence" width="513">
+ <tab_container name="customize tab container" tab_min_width="115" width="511">
<panel label="Parties du corps"/>
<panel label="Parties du corps" name="body_parts_placeholder"/>
<panel label="Silhouette" left="119" name="Shape" width="389">
@@ -380,7 +380,7 @@ Vous pouvez aussi en créer un nouveau et le porter.
<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
</panel>
<panel label="Sous-vêtements" name="Underpants">
- <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New"/>
+ <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
@@ -401,8 +401,8 @@ Vous pouvez aussi en créer un nouveau et le porter.
Emplacement : [PATH]
</text>
<text length="1" name="not worn instructions" type="string">
- Pour changer de sous-vêtement, faites-en glisser une paire à partir de votre
-inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
+ Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
</text>
<text length="1" name="no modify instructions" type="string">
Vous n'avez pas la permission de modifier cet objet.
@@ -442,7 +442,7 @@ Vous pouvez aussi en créer une nouvelle et la porter.
<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
</panel>
</tab_container>
- <scroll_container left="214" name="panel_container"/>
+ <scroll_container left="216" name="panel_container"/>
<button label="Créer un ensemble" label_selected="Créer un ensemble" name="Make Outfit" right="-252" width="115"/>
<button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All" right="-131" width="115"/>
<button label="Fermer" label_selected="Fermer" name="Close" width="115"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_directory.xml b/indra/newview/skins/default/xui/fr/floater_directory.xml
index 3b23d28..329d555 100644
--- a/indra/newview/skins/default/xui/fr/floater_directory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_directory.xml
@@ -179,8 +179,7 @@
</combo_item>
</combo_box>
<line_editor left="370" name="event_search_text" width="175"/>
- <check_box label="Inclure le contenu
-pour adultes" left="551" name="incmature"/>
+ <check_box label="Inclure le contenu pour adultes" left="551" name="incmature"/>
<button label="Rechercher" label_selected="Rechercher" left_delta="129" name="Search" tool_tip="Rechercher"/>
<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index b509ceb..3d46559 100644
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
@@ -20,8 +20,8 @@ l'eau
Brouillard
dans l'eau
</text>
- <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton"/>
- <button label="Ciel avancé" name="EnvAdvancedSkyButton"/>
- <button label="Eau avancée" name="EnvAdvancedWaterButton"/>
+ <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
+ <button label="Ciel avancé" name="EnvAdvancedSkyButton" width="145" left="162" />
+ <button label="Eau avancée" name="EnvAdvancedWaterButton" width="145" left="316"/>
<button label="?" name="EnvSettingsHelpButton"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index 2625b00..1700b8d 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -2,24 +2,25 @@
<floater name="godtools floater" title="Outils divins">
<tab_container name="GodTools Tabs">
<panel label="Grille" name="grid">
- <button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users"/>
- <button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region's Map Visibility Caches"/>
+ <button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users" width="175" />
+ <button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region's Map Visibility Caches" width="285"/>
</panel>
<panel label="Région" name="region">
- <text name="Sim Name:">
+ <text name="Sim Name:" width="70">
Nom du sim :
</text>
+ <line_editor left="85" name="region name" width="198" />
<check_box label="Initiation" name="check prelude" tool_tip="Définir cette région comme zone d'initiation."/>
<check_box label="Soleil fixe" name="check fixed sun" tool_tip="Définir la position du soleil (comme dans Région et Domaine > Terrain.)"/>
- <check_box label="Réinitialiser le domicile à la téléportation" name="check reset home" tool_tip="Lorsqu'un résident se téléporte à l'extérieur, réinitialise son domicile à la position de sa destination."/>
- <check_box label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins."/>
+ <check_box label="Réinitialiser le domicile à la téléportation" name="check reset home" tool_tip="Lorsqu'un résident se téléporte à l'extérieur, réinitialise son domicile à la position de sa destination." height="32"/>
+ <check_box label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins." bottom_delta="-32"/>
<check_box label="Dégâts" name="check damage" tool_tip="Cochez pour activer les dégâts dans cette région."/>
<check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Cochez pour que la région ne comptabilise pas le trafic."/>
<check_box label="Bloquer le terraformage" name="block terraform" tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain"/>
<check_box label="Bac à sable" name="is sandbox" tool_tip="Basculer cette région en bac à sable."/>
- <button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistrer le terrain actuel comme terrain par défaut."/>
- <button label="Rétablir le terrain" label_selected="Rétablir le terrain" name="Revert Terrain" tool_tip="Remplacer le terrain actuel avec le terrain par défaut."/>
- <button label="Échanger le terrain" label_selected="Échanger le terrain" name="Swap Terrain" tool_tip="Échangez le terrain actuel avec le terrain par défaut."/>
+ <button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistrer le terrain actuel comme terrain par défaut." width="118" />
+ <button label="Rétablir le terrain" label_selected="Rétablir le terrain" name="Revert Terrain" tool_tip="Remplacer le terrain actuel avec le terrain par défaut." width="118" />
+ <button label="Échanger le terrain" label_selected="Échanger le terrain" name="Swap Terrain" tool_tip="Échangez le terrain actuel avec le terrain par défaut." width="118" />
<text name="estate id">
ID du domaine :
</text>
@@ -30,33 +31,37 @@
<text name="Grid Pos: ">
Position sur la grille :
</text>
- <line_editor name="gridposx" tool_tip="Position x de cette région sur la grille"/>
- <line_editor name="gridposy" tool_tip="Position y de cette région sur la grille"/>
+ <line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" left_delta="120" width="35"/>
+ <line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" left_delta="40" width="35" />
<text name="Redirect to Grid: ">
Rediriger vers la grille :
</text>
- <text name="billable factor text">
+ <line_editor left_delta="120" name="redirectx" width="35" />
+ <line_editor left_delta="40" name="redirecty" width="35" />
+ <spinner left="320" name="billable factor" width="70" />
+ <text name="billable factor text" font="SansSerifSmall" left_delta="-120" width="120">
Facteur de facturation :
</text>
- <text name="land cost text">
+ <spinner left="320" name="land cost" width="70" />
+ <text name="land cost text" left_delta="-120">
L$ par m² :
</text>
<button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh" tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus."/>
<button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
- <button label="Sélectionner une région" label_selected="Sélectionner une région" name="Select Region" tool_tip="Sélectionnez une région entière à l'aide de l'outil Terrain."/>
- <button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip."/>
+ <button label="Sélectionner une région" label_selected="Sélectionner une région" name="Select Region" tool_tip="Sélectionnez une région entière à l'aide de l'outil Terrain." width="140" left="136"/>
+ <button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="140" left="136"/>
</panel>
<panel label="Objets" name="objects">
- <text name="Sim Name:">
+ <text name="Sim Name:" width="70">
Nom du sim :
</text>
- <text name="region name">
- Gallois
+ <text name="region name" left_delta="75">
+ Welsh
</text>
- <check_box label="Désactiver les scripts" name="disable scripts" tool_tip="Cochez pour désactiver tous les scripts dans cette région"/>
- <check_box label="Désactiver les collisions" name="disable collisions" tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région"/>
- <check_box label="Désactiver les propriétés physiques" name="disable physics" tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région"/>
- <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
+ <check_box label="Désactiver les scripts" name="disable scripts" tool_tip="Cochez pour désactiver tous les scripts dans cette région"/>
+ <check_box label="Désactiver les collisions" name="disable collisions" tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région"/>
+ <check_box label="Désactiver les propriétés physiques" name="disable physics" tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région"/>
+ <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." bottom="-85"/>
<button label="Définir la cible" label_selected="Définir la cible" name="Set Target" tool_tip="Définir l'avatar cible pour la suppression de l'objet."/>
<text name="target_avatar_name">
(aucune cible)
@@ -64,9 +69,9 @@
<button label="Supprimer tous les objets scriptés de la cible sur les terrains des autres" label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres" name="Delete Target's Scripted Objects On Others Land" tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés."/>
<button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
<button label="Supprimer *tous* les objets de la cible" label_selected="Supprimer *tous* les objets de la cible" name="Delete *ALL* Of Target's Objects" tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
- <button label="Afficher les objets souvent responsables de collision" label_selected="Afficher les objets souvent responsables de collision" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
- <button label="Afficher les scripts fréquemment utilisés" label_selected="Afficher les scripts fréquemment utilisés" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts."/>
- <button label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences."/>
+ <button width="300" label="Afficher les objets souvent responsables de collision" label_selected="Afficher les objets souvent responsables de collision" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
+ <button width="300" label="Afficher les scripts fréquemment utilisés" label_selected="Afficher les scripts fréquemment utilisés" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts."/>
+ <button width="300" label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences."/>
</panel>
<panel label="Requête" name="request">
<text name="Destination:">
@@ -100,7 +105,7 @@
<text name="Parameter:">
Paramètre :
</text>
- <button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request"/>
+ <button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index e0ec113..2477fb6 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -9,7 +9,7 @@
<text name="preview_label">
Prévisualiser comme :
</text>
- <combo_box label="Habits" name="clothing_type_combo">
+ <combo_box label="Habits" name="clothing_type_combo" left="126" >
<combo_item name="Image">
Image
</combo_item>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 09934ad..823546e 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -49,7 +49,7 @@
</text>
<check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
<check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
- <text name="NextOwnerLabel">
+ <text name="NextOwnerLabel" width="192">
Le prochain propriétaire pourra :
</text>
<check_box label="Modifier" name="CheckNextOwnerModify"/>
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 08c3e2a..99bc0a2 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
@@ -11,10 +11,10 @@
<check_box label="Sons" name="check_sound"/>
<check_box label="Textures" name="check_texture"/>
<check_box label="Photos" name="check_snapshot"/>
- <button label="Tout" label_selected="Tout" name="All"/>
- <button label="Aucun" label_selected="Aucun" name="None"/>
- <check_box label="Toujours montrer les dossiers" name="check_show_empty"/>
- <check_box label="Depuis la déconnexion" name="check_since_logoff"/>
+ <button label="Tout" label_selected="Tout" name="All" width="70"/>
+ <button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
+ <check_box label="Toujours montrer les dossiers" name="check_show_empty" bottom="-284"/>
+ <check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
<text length="1" name="- OR -" type="string">
Ou il y a...
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index 4581051..ea39098 100644
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="script ed float" title="Wiki LSL">
<check_box label="Suivre le curseur" name="lock_check" />
- <combo_box label="Verrouiller" name="history_combo" />
- <button label="Précédente" name="back_btn" />
+ <combo_box label="Verrouiller" name="history_combo" left_delta="120" width="70"/>
+ <button label="Précédente" name="back_btn" left_delta="75"/>
<button label="Suivante" name="fwd_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 505620e..f27ba60 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -12,8 +12,8 @@
<button label="Envoyer l'URL sur la parcelle" name="assign"/>
</layout_panel>
<layout_panel name="external_controls">
- <button label="Ouvrir dans mon navigateur web" name="open_browser" width="190"/>
- <check_box label="Toujours ouvrir dans mon navigateur web" left_delta="195" name="open_always"/>
+ <button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
+ <check_box label="Toujours ouvrir dans mon navigateur web" left_delta="201" name="open_always"/>
<button label="Fermer" name="close"/>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/fr/floater_mute.xml b/indra/newview/skins/default/xui/fr/floater_mute.xml
index 2117569..7a58da1 100644
--- a/indra/newview/skins/default/xui/fr/floater_mute.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Résidents et objets ignorés">
+<floater name="mute floater" title="Résidents et objets ignorés" short_title="Liste des ignorés">
<scroll_list name="mutes" tool_tip="Liste des résidents ignorés actuellement" />
<button label="Ignorer le résident..." label_selected="Ignorer le résident..."
name="Mute resident..."
diff --git a/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
index 3b2d497..ff82e39 100644
--- a/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
@@ -6,8 +6,7 @@
<check_box label="Peau" name="checkbox_Skin"/>
<check_box label="Cheveux" name="checkbox_Hair"/>
<check_box label="Yeux" name="checkbox_Eyes"/>
- <check_box label="Donner le nom du
-dossier à l'ensemble" name="rename"/>
+ <check_box label="Donner le nom du dossier à l'ensemble" name="rename"/>
<check_box label="Chemise" name="checkbox_Shirt"/>
<check_box label="Pantalon" name="checkbox_Pants"/>
<check_box label="Chaussures" name="checkbox_Shoes"/>
@@ -62,7 +61,8 @@ dossier à l'ensemble" name="rename"/>
Les ensembles sont des dossiers qui contiennent des habits et des parties du corps.
Faites glisser le dossier contenant un ensemble vers votre avatar pour lui faire porter.
-Le bouton Créer un ensemble vous permet de créer un dossier et d'y sauvegarder les copies des articles que vous portez maintenant.
+Le bouton Créer un ensemble vous permet de créer un dossier et d'y sauvegarder les copies
+des articles que vous portez maintenant.
</text>
<text length="1" name="Folder name:" type="string">
Nom du dossier :
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 0e59866..5d8f0be 100644
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -3,9 +3,6 @@
<text type="string" length="1" name="object_name">
[DESC]:
</text>
- <button label="Copier vers l'inventaire"
- label_selected="Copier vers l'inventaire"
- name="copy_to_inventory_button" />
- <button label="Copier et porter" label_selected="Copier et porter"
- name="copy_and_wear_button" />
+ <button label="Copier vers l'inventaire" label_selected="Copier vers l'inventaire" name="copy_to_inventory_button" width="132" />
+ <button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 7933a26..a0db92a 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -6,7 +6,7 @@
<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
<button label="Payer" label_selected="Payer" name="pay btn"/>
<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
- <text length="1" name="payee_label" type="string">
+ <text length="1" name="payee_label" type="string" left="5">
Payer :
</text>
<text length="1" name="payee_name" type="string">
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index ce2c4bb..5359955 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,30 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Give Money" title="">
- <text length="1" name="payee_group" type="string">
+ <text length="1" name="payee_group" type="string" width="95">
Payer le groupe :
</text>
- <text length="1" name="payee_resident" type="string">
+ <text length="1" name="payee_resident" type="string" width="100" halign="left" >
Payer le résident :
</text>
- <text length="1" name="payee_name" type="string">
+ <text length="1" name="payee_name" type="string" left="105">
[FIRST] [LAST]
</text>
- <text length="1" name="object_name_label" type="string">
+ <text length="1" name="object_name_label" type="string" left="25">
Via un objet :
</text>
- <text length="1" name="object_name_text" type="string">
+ <text length="1" name="object_name_text" type="string" left="105">
...
</text>
- <text length="1" name="fastpay text" type="string">
+ <text length="1" name="fastpay text" type="string" width="95">
Paiement rapide :
</text>
- <text length="1" name="amount text" type="string">
+ <text length="1" name="amount text" type="string" left="5" halign="left">
Montant :
</text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+ <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
+ <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
+ <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
+ <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
<button label="Payer" label_selected="Payer" name="pay btn"/>
<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ <line_editor left="65" name="amount" width="50" />
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index 45e7623..cb1e245 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Préférences">
+<floater name="Preferences" title="Préférences" min_width="330" width="626">
<button label="À propos" label_selected="À propos" name="About..." />
<button label="OK" label_selected="OK" name="OK" />
<button label="Annuler" label_selected="Annuler" name="Cancel" />
<button label="Appliquer" label_selected="Appliquer" name="Apply" />
<button label="Aide" label_selected="Aide" name="Help" />
+ <tab_container name="pref core" tab_width="126" width="626" />
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index 751ffa6..bdb1e9e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -4,7 +4,7 @@
Description :
</text>
<button label="Jouer dans le Monde" label_selected="Stop" name="Anim play btn"
- tool_tip="Jouer cette animation et partagez-la avec d'autres." width="125" left="20"/>
+ tool_tip="Jouer cette animation et partagez-la avec d'autres." width="131" left="20"/>
<button label="Jouer localement" label_selected="Stop" name="Anim audition btn"
- tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="160"/>
+ tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="162"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index 0371469..3f7d097 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -62,6 +62,6 @@ ajoutez des pauses.
<check_box label="temps en secondes" name="wait_time_check" />
<check_box label="Actifs" name="active_check"
tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis." />
- <button label="Prévisualiser" name="preview_btn" />
- <button label="Enregistrer" name="save_btn" />
+ <button label="Prévisualiser" name="preview_btn" width="86" />
+ <button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index 8dc63ae..030ef79 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
@@ -5,7 +5,7 @@
</text>
<button label="Jouer dans le Monde" label_selected="Jouer dans le Monde"
name="Sound play btn"
- tool_tip="Jouer ce son et partagez-le avec d'autres." width="125" left_delta="-136"/>
+ tool_tip="Jouer ce son et partagez-le avec d'autres." width="131" left_delta="-142"/>
<button label="Jouer localement" label_selected="Jouer localement"
name="Sound audition btn"
tool_tip="Jouer ce son et soyez le seul à l'entendre." width="125" left="162"/>
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
index 0efec83..6734cc9 100644
--- a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="price_for_listing" title="Publier la petite annonce">
<text name="explanation_text">
- Votre petite annonce restera en ligne pendant une semaine à compter de sa date de publication.
-
-La position de votre annonce dans les listes dépend du montant que vous décidez de payer.
-Les annonces les plus chères paraissent en tête de liste et sont plus visibles dans les résultats de recherche.
+ Votre petite annonce restera en ligne pendant une
+semaine à compter de sa date de publication.
+
+La position de votre annonce dans les listes
+dépend du montant que vous décidez de payer.
+Les annonces les plus chères paraissent en tête de
+liste et sont plus visibles dans les résultats de
+recherche.
</text>
- <text name="price_text">
+ <text name="price_text" width="133">
Coût de l'annonce (L$) :
</text>
+ <line_editor left="155" name="price_edit" />
<button label="Fixer le prix" 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 7b90982..f14a5e4 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="sell land" title="Vendre terrain">
- <text name="info_parcel_label">
+ <text name="info_parcel_label" width="48">
Parcelle :
</text>
- <text name="info_parcel">
- Nom de la parcelle
+ <text name="info_parcel" left="66">
+ PARCEL NAME
</text>
<text name="info_size_label">
Taille :
</text>
- <text name="info_size">
+ <text name="info_size" left="66">
[AREA] m²
</text>
- <text name="info_action">
- Pour vendre cette parcelle :
+ <text name="info_action" bottom_delta="-60">
+ Pour vendre cette
+parcelle :
</text>
+ <icon bottom_delta="-86" name="step_price" />
<text name="price_label">
Votre prix de vente :
</text>
@@ -31,9 +33,10 @@
Vos acheteurs :
</text>
<text name="sell_to_text">
- Vendez votre terrain à n'importe qui ou uniquement à un acheteur spécifique.
+ Vendez votre terrain à n'importe qui ou uniquement à un acheteur
+spécifique.
</text>
- <combo_box name="sell_to">
+ <combo_box name="sell_to" bottom_delta="-32">
<combo_item name="--selectone--">
-- Sélectionnez --
</combo_item>
@@ -44,14 +47,15 @@
Acheteur spécifique :
</combo_item>
</combo_box>
- <button label="Sélectionner..." name="sell_to_select_agent"/>
+ <button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
<text name="sell_objects_label">
Vendez-vous des objets avec ce terrain ?
</text>
<text name="sell_objects_text">
- Les objets transférables se trouvant sur la parcelle changeront de propriétaire.
+ Les objets transférables se trouvant sur la parcelle changeront
+de propriétaire.
</text>
- <radio_group name="sell_objects">
+ <radio_group name="sell_objects" right="430" bottom_delta="-54">
<radio_item name="no">
Non, rester le propriétaire des objets
</radio_item>
@@ -59,10 +63,10 @@
Oui, vendre les objets avec le terrain
</radio_item>
</radio_group>
- <button label="Afficher les objets" name="show_objects"/>
- <text name="nag_message_label">
- Rappel : toute vente est définitive.
+ <button label="Afficher les objets" name="show_objects" right="420" width="120"/>
+ <text name="nag_message_label" bottom_delta="-30">
+ Rappel : Toute vente est définitive.
</text>
- <button label="Mettre le terrain en vente" name="sell_btn"/>
+ <button label="Mettre le terrain en vente" name="sell_btn" width="165"/>
<button label="Annuler" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index f98046e..8d6249b 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -8,7 +8,7 @@
FALSE
</combo_item>
</combo_box>
- <color_swatch label="Couleur" name="color_swatch" />
+ <color_swatch label="Couleur" name="color_swatch" width="43" />
<spinner label="x" name="val_spinner_1" />
<spinner label="x" name="val_spinner_2" />
<spinner label="x" name="val_spinner_3" />
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index aa2cfdd..0fadd44 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater height="536" name="Snapshot" title="Prévisualiser la photo" width="245">
+<floater name="Snapshot" title="Prévisualiser la photo" width="247">
<text name="type_label">
Destination de la photo
</text>
@@ -113,17 +113,16 @@
<text name="file_size_label">
Taille du fichier : [SIZE] Ko
</text>
- <check_box bottom_delta="-20" label="Voir l'interface sur la photo" name="ui_check"/>
- <check_box bottom_delta="-18" label="Voir les éléments HUD sur la photo" name="hud_check"/>
- <check_box bottom_delta="-18" label="Garder ouvert après enregistrement" name="keep_open_check"/>
+ <check_box label="Voir l'interface sur la photo" name="ui_check"/>
+ <check_box label="Voir les éléments HUD sur la photo" name="hud_check"/>
+ <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
<check_box label="Imposer les proportions" name="keep_aspect_check"/>
- <check_box bottom_delta="-18" label="Prévisualisation plein écran
-(geler l'écran)" name="freeze_frame_check"/>
- <button bottom_delta="-18" label="Rafraîchir" name="new_snapshot_btn"/>
- <check_box bottom_delta="-30" label="Rafraîchissement automatique" name="auto_snapshot_check"/>
- <button label="Enregistrer (10 L$)" name="upload_btn"/>
- <button label="Envoyer" name="send_btn"/>
- <flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l'image dans un fichier">
+ <check_box label="Prévisualisation plein écran (geler l'écran)" name="freeze_frame_check"/>
+ <button label="Rafraîchir" name="new_snapshot_btn"/>
+ <check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
+ <button label="Enregistrer (10 L$)" name="upload_btn" width="118"/>
+ <button label="Envoyer" name="send_btn" width="118"/>
+ <flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l'image dans un fichier" width="118">
<flyout_button_item name="save_item">
Enregistrer
</flyout_button_item>
@@ -131,7 +130,7 @@
Enregistrer sous...
</flyout_button_item>
</flyout_button>
- <button label="Annuler" name="discard_btn"/>
+ <button label="Annuler" name="discard_btn" left="133" width="72" />
<string name="unknown">
inconnu
</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index bbc6a82..59d41fd 100644
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Téléhub">
+<floater name="telehub" title="Téléhub" min_height="310" height="310" >
<text name="status_text_connected">
Téléhub connecté à l'objet [OBJECT]
</text>
@@ -9,20 +9,23 @@
<text name="help_text_connected">
Pour supprimer, cliquez sur Déconnecter.
</text>
- <text name="help_text_not_connected">
- Sélectionner l'objet et cliquez sur Connecter le téléhub.
+ <text name="help_text_not_connected" height="38" bottom_delta="-18">
+ Sélectionner l'objet et cliquez sur Connecter
+le téléhub.
</text>
- <button label="Connecter le téléhub" name="connect_btn" />
- <button label="Déconnecter" name="disconnect_btn" />
- <text name="spawn_points_text">
+ <button label="Connecter le téléhub" name="connect_btn" width="122"/>
+ <button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
+ <text name="spawn_points_text" width="230">
Points d'apparition (positions, pas objets) :
</text>
<button label="Ajouter point" name="add_spawn_point_btn" />
<button label="Supprimer point" name="remove_spawn_point_btn" />
<text name="spawn_point_help">
- Sélectionnez l'objet et cliquez sur Ajouter pour indiquer la position.
-Vous pourrez ensuite déplacer ou supprimer l'objet.
+ Sélectionnez l'objet et cliquez sur Ajouter pour
+indiquer la position. Vous pourrez ensuite
+déplacer ou supprimer l'objet.
Les positions sont relatives au centre du téléhub.
-Sélectionnez l'élément dans la liste pour afficher sa position dans le Monde.
+Sélectionnez l'élément dans la liste pour afficher
+sa position dans le Monde.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 07b18e4..1a8e57e 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -9,13 +9,13 @@
<text length="1" name="unknown" type="string">
Dimensions : [DIMENSIONS]
</text>
- <button label="Défaut" label_selected="Défaut" name="Default"/>
- <button label="Aucune" label_selected="Aucune" name="None"/>
- <button label="Vierge" label_selected="Vierge" name="Blank"/>
+ <button label="Défaut" label_selected="Défaut" name="Default" width="60" />
+ <button label="Aucune" label_selected="Aucune" name="None" width="60" left="68" />
+ <button label="Vierge" label_selected="Vierge" name="Blank" width="60" />
<check_box label="Afficher les dossiers" name="show_folders_check"/>
<search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
- <check_box label="Appliquer immédiatement" name="apply_immediate_check"/>
- <button label="" label_selected="" name="Pipette"/>
+ <check_box label="Appliquer immédiatement" name="apply_immediate_check" />
+ <button label="" label_selected="" name="Pipette" bottom="-240" />
<button label="Annuler" label_selected="Annuler" name="Cancel"/>
<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
<string name="pick title">
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index a9b8c9b..2914dab 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -168,12 +168,12 @@
Le prochain propriétaire pourra :
</text>
<check_box label="Modifier" name="checkbox next owner can modify"/>
- <check_box label="Copier" name="checkbox next owner can copy"/>
+ <check_box label="Copier" name="checkbox next owner can copy" left_delta="66" />
<check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
<text name="label click action">
Action du clic-gauche :
</text>
- <combo_box name="clickaction">
+ <combo_box name="clickaction" width="178">
<combo_item name="Touch/grab(default)">
Toucher/attraper (défaut)
</combo_item>
@@ -550,16 +550,18 @@
<text name="tex rotate">
Rotation (degrés)
</text>
- <text name="string repeats per meter">
+ <spinner left="122" name="TexRot" width="58" />
+ <string name="string repeats per meter">
Répétitions au mètre
- </text>
- <text name="string repeats per face">
+ </string>
+ <string name="string repeats per face">
Répétitions par face
- </text>
- <text name="rpt">
+ </string>
+ <text name="rpt" width="160">
Répétitions au mètre
</text>
- <button label="Appliquer" label_selected="Appliquer" name="button apply"/>
+ <spinner left="122" name="rptctrl" width="58" />
+ <button label="Appliquer" label_selected="Appliquer" name="button apply" left_delta="68" width="75"/>
<text name="tex offset">
Décalage
</text>
@@ -569,7 +571,7 @@
Ajuster la texture du média
(chargement préalable)
</text>
- <button label="Ajuster" label_selected="Ajuster" name="button align"/>
+ <button left="150" label="Ajuster" label_selected="Ajuster" name="button align"/>
</panel>
<panel label="Contenu" name="Contents">
<button label="Nouveau script..." label_selected="Nouveau script..." name="button new script"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index eaf1dab..0aa21d3 100644
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -9,6 +9,7 @@
<column label="Propriétaire" name="owner"/>
<column label="Lieu" name="location"/>
<column label="Heure" name="time"/>
+ <column label="Heure Mono" name="mono_time"/>
</scroll_list>
<text name="id_text">
ID de l'objet :
@@ -27,25 +28,28 @@
<button label="Désactiver" name="disable_selected_btn"/>
<button label="Désactiver tous" name="disable_all_btn"/>
<button label="Rafraîchir" name="refresh_btn"/>
- <text name="top_scripts_title">
+ <string name="top_scripts_title">
Scripts principaux
- </text>
- <text name="top_scripts_text">
+ </string>
+ <string name="top_scripts_text">
[COUNT] scripts prenant un total de [TIME] ms
- </text>
- <text name="scripts_score_label">
+ </string>
+ <string name="scripts_score_label">
Heure
- </text>
- <text name="top_colliders_title">
+ </string>
+ <string name="scripts_mono_time_label">
+ Heure Mono
+ </string>
+ <string name="top_colliders_title">
Objets souvent responsables de collision
- </text>
- <text name="top_colliders_text">
+ </string>
+ <string name="top_colliders_text">
[COUNT] objets souvent responsables de collisions
- </text>
- <text name="colliders_score_label">
+ </string>
+ <string name="colliders_score_label">
Score
- </text>
- <text name="none_descriptor">
+ </string>
+ <string name="none_descriptor">
Aucun résultat.
- </text>
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index 1e100aa..fce1f48 100644
--- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
@@ -3,6 +3,7 @@
<text name="media_label">
URL du média :
</text>
+ <combo_box left="100" name="media_entry" width="360" />
<button label="OK" name="ok_btn" />
<button label="Annuler" name="cancel_btn" />
<button label="Effacer" name="clear_btn" />
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index 57c3dfd..1aa6cd5 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="Éditeur de ciel avancé">
+<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
<text name="KeyFramePresetsText">
Préréglages ciel :
</text>
@@ -8,7 +8,7 @@
<button label="Supprimer" label_selected="Supprimer" name="WLDeletePreset" left_delta="80"/>
<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour"
name="WLDayCycleMenuButton" width="150" left_delta="95" />
- <tab_container name="WindLight Tabs">
+ <tab_container name="WindLight Tabs" width="706">
<panel label="Atmosphère" name="Atmosphere">
<text name="BHText">
Bleu de l'horizon
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 92365ca..4893f26 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -114,8 +114,12 @@
<menu_item_call label="Arrêter mes animations" name="Stop All Animations"/>
<menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
<menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Historique de mon compte..." name="Account History..."/>
- <menu_item_call label="Gérer mon compte..." name="Manage My Account..."/>
+ <menu_item_call label="Historique de mon compte..." name="Account History...">
+ <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr" />
+ </menu_item_call>
+ <menu_item_call label="Gérer mon compte..." name="Manage My Account...">
+ <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr" />
+ </menu_item_call>
<menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
<menu_item_separator label="-----------" name="separator5"/>
<menu_item_call label="Mes terrains..." name="My Land..."/>
@@ -149,8 +153,8 @@
<menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
<menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
<menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Fixer sur la grille" name="Snap to Grid"/>
- <menu_item_call label="Fixer sur les axes XY de la grille" name="Snap Object XY to Grid"/>
+ <menu_item_check label="Aligner sur la grille" name="Snap to Grid"/>
+ <menu_item_call label="Aligner sur les axes XY de la grille" name="Snap Object XY to Grid"/>
<menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
<menu_item_call label="Options de la grille..." name="Grid Options..."/>
<menu_item_separator label="-----------" name="separator3"/>
@@ -191,7 +195,9 @@
<menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help..."/>
<menu_item_separator label="-----------" name="separator7"/>
<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..."/>
- <menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues..."/>
+ <menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
+ <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+ </menu_item_call>
<menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
<menu_item_separator label="-----------" name="separator9"/>
<menu_item_call label="Signaler un bug..." name="Report Bug..."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar.xml b/indra/newview/skins/default/xui/fr/panel_avatar.xml
index 329521e..664b02d 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar.xml
@@ -66,9 +66,9 @@
<text name="(500 chars)">
(500 car.)
</text>
- <text name="Give item:">
- Donner des objets :
- </text>
+ <text name="Give item:" height="20" bottom="-397">
+ Donner des
+objets :</text>
<text name="Give inventory" tool_tip="Mettez les objets de l'inventaire ici pour les donner à cette personne.">
Mettez les objets à transférer ici.
</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_classified.xml b/indra/newview/skins/default/xui/fr/panel_classified.xml
index 1797015..3c49ced 100644
--- a/indra/newview/skins/default/xui/fr/panel_classified.xml
+++ b/indra/newview/skins/default/xui/fr/panel_classified.xml
@@ -6,7 +6,7 @@
<button label="Téléporter" name="classified_teleport_btn"/>
<button label="Voir sur la carte" name="classified_map_btn" width="115"/>
<button label="Profil" left="245" name="classified_profile_btn"/>
- <check_box label="Adulte" name="classified_mature_check">
+ <check_box label="Adulte" name="classified_mature_check" width="190">
<combo_item name="select_mature">
- Sélectionner Pour adultes -
</combo_item>
@@ -18,7 +18,7 @@
</combo_item>
</check_box>
<combo_box label="" name="classified_category_combo"/>
- <button label="Mise à jour" name="classified_update_btn"/>
+ <button label="Mise à jour" name="classified_update_btn" width="80" />
<string name="ad_placed_paid">
Annonce passée le : [DATE]. Prix : [AMT] L$.
</string>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index 0dd40ff..b1ace45 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -16,7 +16,7 @@
</text>
<text name="prepend_founded_by">
Fondé par </text>
-<text name="founder_name">
+ <text name="founder_name" left_delta="54">
(en attente)
</text>
<text name="group_charter_label">
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 17ed4f5..d89c431 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -36,18 +36,18 @@ inventaire vers cette fenêtre. Les pièces-jointes doivent être
copiables et transférables. Il n'est pas possible d'envoyer de
dossiers.
</text>
- <text bottom_delta="-79" name="lbl3">
+ <text bottom_delta="-79" name="lbl3" left="20">
Sujet :
</text>
- <line_editor name="create_subject" width="346"/>
- <text name="lbl4">
+ <line_editor name="create_subject" width="331" left_delta="61"/>
+ <text name="lbl4" left="20">
Message :
</text>
- <text_editor bottom_delta="-90" height="104" name="create_message"/>
- <text name="lbl5">
+ <text_editor name="create_message" bottom_delta="-90" height="104" left_delta="61" width="330"/>
+ <text name="lbl5" width="68">
Pièce-jointe :
</text>
- <line_editor name="create_inventory_name" width="206"/>
+ <line_editor name="create_inventory_name" width="190" left_delta="74"/>
<button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
<button label="Envoyer la notice" label_selected="Envoyer la notice" left="274" name="send_notice" width="140"/>
<panel name="drop_target2" tool_tip="Pour joindre un objet de l'inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l'objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
@@ -55,7 +55,7 @@ dossiers.
</panel>
<panel label="Voir ancienne notice" name="panel_view_past_notice">
<text name="lbl">
- Anciennes notices
+ Détails
</text>
<text name="lbl2">
Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
diff --git a/indra/newview/skins/default/xui/fr/panel_group_voting.xml b/indra/newview/skins/default/xui/fr/panel_group_voting.xml
index edf22f5..3362f49 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_voting.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_voting.xml
@@ -5,13 +5,13 @@
</text>
<button label="?" name="help_button"/>
<text name="proposal_header">
- Propositions du groupe actives
+ Propositions du groupe en cours
</text>
<text name="proposal_voting_lbl">
Proposition Fin du vote Votée ?
</text>
<text name="proposals_header_view_txt">
- Propositions du groupe actives
+ Propositions en cours
</text>
<string name="proposals_header_view_inst">
Double-cliquez sur la proposition pour laquelle vous aimeriez voter
@@ -38,7 +38,8 @@ ou abstenez-vous en cliquant sur M'abstenir.
La proposition que vous essayez de créer est vide. Veuillez saisir une description avant de créer la proposition.
</text>
<text name="proposal_instructions">
- Double-cliquez sur la proposition sur laquelle vous voulez voter ou cliquez sur Créer une nouvelle proposition pour en créer une nouvelle.
+ Double-cliquez sur la proposition sur laquelle vous voulez voter ou cliquez
+sur Créer une nouvelle proposition pour en créer une nouvelle.
</text>
<text name="proposal_lbl">
Description de la proposition
@@ -73,11 +74,11 @@ ou abstenez-vous en cliquant sur M'abstenir.
</text>
<button label="Soumettre" label_selected="Soumettre" left="170" name="btn_submit" width="100"/>
<button label="Annuler" label_selected="Annuler" left_delta="158" name="btn_cancel"/>
- <button font="SansSerifSmall" label="Oui" label_selected="Oui" left="183" name="btn_yes" width="70"/>
- <button font="SansSerifSmall" label="Non" label_selected="Non" left_delta="77" name="btn_no" width="70"/>
- <button font="SansSerifSmall" label="M'abstenir" label_selected="M'abstenir" left_delta="77" name="btn_abstain" width="70"/>
+ <button font="SansSerifSmall" label="Oui" label_selected="Oui" left="205" name="btn_yes" width="60"/>
+ <button font="SansSerifSmall" label="Non" label_selected="Non" left_delta="66" name="btn_no" width="60"/>
+ <button font="SansSerifSmall" label="M'abstenir" label_selected="M'abstenir" left_delta="66" name="btn_abstain" width="70"/>
<text left="7" name="txt">
- Historique des votes du groupe
+ Historique des votes
</text>
<text left="7" name="instructions" width="405">
Double-cliquez sur un ancien vote ou sélectionnez-en un pour voir les résultats.
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml b/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
index de84e8d..09c51ce 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
@@ -13,9 +13,9 @@
</text>
<panel label="Volume" name="Volume Panel"/>
<check_box label="Couper le son lorsque la fenêtre est minimisée" left="159" name="mute_when_minimized"/>
- <check_box bottom="-200" height="32" label="Jouer la musique disponible
+ <check_box bottom="-200" height="32" label="Jouer la musique disponible
(consommateur en bande passante)" left="159" name="streaming_music"/>
- <check_box bottom_delta="-32" height="32" label="Jouer le média disponible
+ <check_box bottom_delta="-32" height="32" label="Jouer le média disponible
(consommateur en bande passante)" left="159" name="streaming_video"/>
<check_box bottom_delta="-32" label="Lire automatiquement le média" left="179" name="auto_streaming_video"/>
<slider label="Effet Doppler" label_width="115" left="165" name="Doppler Effect"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index f9ead80..7c1986a 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -44,7 +44,7 @@
<text length="1" name="show_names_textbox" type="string">
Afficher les noms :
</text>
- <text length="1" name="effects_color_textbox" type="string" bottom="-174">
+ <text bottom="-174" length="1" name="effects_color_textbox" type="string">
Couleur du faisceau de sélection :
</text>
<text length="1" name="seconds_textbox" type="string">
@@ -80,26 +80,35 @@
<combo_item length="1" name="English" type="string">
English (Anglais)
</combo_item>
- <combo_item length="1" name="Chinese" type="string">
- 汉语/漢語 (Chinois) - Bêta
+ <combo_item length="1" name="Danish" type="string">
+ Dansk (Danois) - Bêta
</combo_item>
<combo_item length="1" name="Deutsch(German)" type="string">
Deutsch (Allemand) - Bêta
</combo_item>
+ <combo_item name="Spanish">
+ Español (Espagnol) - Bêta
+ </combo_item>
<combo_item name="French">
Français - Bêta
</combo_item>
- <combo_item length="1" name="(Japanese)" type="string">
- 日本語 (Japonais) - Bêta
+ <combo_item name="Hungarian">
+ Magyar (Hongrois) - Bêta
</combo_item>
- <combo_item length="1" name="(Korean)" type="string">
- 한국어 (Coréen) - Bêta
+ <combo_item name="Polish">
+ Polski (Polonais) - Bêta
</combo_item>
<combo_item name="Portugese">
Portugués (Portugais) - Bêta
</combo_item>
- <combo_item name="Spanish">
- Español (Espagnol) - Bêta
+ <combo_item length="1" name="Chinese" type="string">
+ 汉语/漢語 (Chinois) - Bêta
+ </combo_item>
+ <combo_item length="1" name="(Japanese)" type="string">
+ 日本語 (Japonais) - Bêta
+ </combo_item>
+ <combo_item length="1" name="(Korean)" type="string">
+ 한국어 (Coréen) - Bêta
</combo_item>
</combo_box>
<check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml b/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
index aac6bc0..dcb5fac 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
@@ -28,7 +28,7 @@
Options de confidentialité
</text>
<check_box label="N'accepter que les appels de mes amis" name="voice_call_friends_only_check"/>
- <text_editor name="device_settings_text">
+ <text_editor name="device_settings_text" height="48" bottom_delta="-45">
Remarque : si vous cliquez sur Paramètres du matériel, vous serez temporairement déconnecté du Chat vocal. Tous les changements que vous faites seront immédiatement appliqués.
</text_editor>
<button label="Paramètres du matériel" name="device_settings_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index 7071e0f..37a1298 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Règlement" name="Covenant">
- <text name="covenant_help_text">
- Les changements apportés au règlement apparaîtront sur toutes les parcelles du domaine.
+ <text name="covenant_help_text" bottom="-25">
+ Les changements apportés au règlement apparaîtront sur toutes les
+parcelles du domaine.
</text>
- <text name="region_name_lbl">
+ <text name="region_name_lbl" bottom_delta="-31">
Région :
</text>
<text name="region_name_text">
(inconnue)
</text>
- <text name="estate_name_lbl">
+ <text name="estate_name_lbl" bottom_delta="-19">
Domaine :
</text>
<text name="estate_name_text">
@@ -20,7 +21,7 @@
</text>
<button label="?" name="covenant_help" />
<button label="Redéfinir" name="reset_covenant" />
- <text name="estate_owner_lbl">
+ <text name="estate_owner_lbl" bottom_delta="-19">
Propriétaire :
</text>
<text name="estate_owner_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index d3ee6df..07a4d5d 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -10,10 +10,10 @@
<button label="?" name="disable_scripts_help"/>
<check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactiver les collisions entre non-avatars dans cette région"/>
<button label="?" name="disable_collisions_help"/>
- <check_box label="Désactiver les propriétés physiques" name="disable_physics_check" tool_tip="Désactiver toutes les propriétés physiques dans cette région"/>
+ <check_box label="Désactiver les propriétés physiques" name="disable_physics_check" tool_tip="Désactiver toutes les propriétés physiques dans cette région"/>
<button label="?" name="disable_physics_help"/>
- <button label="Appliquer" name="apply_btn"/>
- <text name="objret_text_lbl">
+ <button label="Appliquer" name="apply_btn" bottom_delta="-38"/>
+ <text name="objret_text_lbl" bottom_delta="-42">
Renvoi de l'objet
</text>
<text name="resident_text_lbl">
@@ -30,11 +30,11 @@
<check_box label="Ne renvoyer que les objets sur le terrain de quelqu'un d'autre" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu'un d'autre"/>
<check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
<button label="Renvoyer" name="return_btn"/>
- <button label="Afficher les objets souvent responsables de collision..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles"/>
- <button label="?" name="top_colliders_help"/>
- <button label="Afficher les objets exécutant le plus de scripts..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts"/>
- <button label="?" name="top_scripts_help"/>
- <button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes"/>
- <button label="?" name="restart_help"/>
- <button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d'une heure"/>
+ <button label="Afficher les objets souvent responsables de collision..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
+ <button label="?" name="top_colliders_help" left="337"/>
+ <button label="Afficher les objets exécutant le plus de scripts..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
+ <button label="?" name="top_scripts_help" left="337"/>
+ <button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
+ <button label="?" name="restart_help" left="177" />
+ <button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d'une heure" width="160"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 36f820c..475339d 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Domaine" name="Estate">
- <text name="estate_help_text">
- Les changements apportés aux paramètres de cet onglet auront des répercussions sur toutes les régions du domaine.
+ <text name="estate_help_text" bottom="-34">
+ Les changements apportés aux paramètres
+de cet onglet auront des répercussions sur
+toutes les régions du domaine.
</text>
- <text name="estate_text">
+ <text name="estate_text" bottom_delta="-34">
Domaine :
</text>
<text name="estate_name">
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 ec3d407..0ac07f7 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -26,9 +26,9 @@
<button label="?" name="parcel_changes_help"/>
<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"/>
<button label="?" name="parcel_search_help"/>
- <spinner label="Nombre limite d'avatars" name="agent_limit_spin"/>
+ <spinner label="Nombre limite d'avatars" name="agent_limit_spin" label_width="127" width="190"/>
<button label="?" name="agent_limit_help"/>
- <spinner label="Bonus objet" name="object_bonus_spin"/>
+ <spinner label="Bonus objet" name="object_bonus_spin" label_width="127" width="190"/>
<button label="?" name="object_bonus_help"/>
<text label="Maturité" name="access_text">
Maturité :
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 219e0da..96c1530 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -8,9 +8,9 @@
</text>
<spinner label="Niveau de l'eau" name="water_height_spin"/>
<button label="?" name="water_height_help"/>
- <spinner label="Limite d'élévation du terrain" name="terrain_raise_spin"/>
+ <spinner label="Limite d'élévation du terrain" name="terrain_raise_spin"/>
<button label="?" name="terrain_raise_help"/>
- <spinner label="Limite d'abaissement du terrain" name="terrain_lower_spin"/>
+ <spinner label="Limite d'abaissement du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
<button label="?" name="terrain_lower_help"/>
<check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
<button label="?" name="use_estate_sun_help"/>
@@ -18,10 +18,10 @@
<button label="?" name="fixed_sun_help"/>
<slider label="Phase" name="sun_hour_slider"/>
<button label="Appliquer" name="apply_btn"/>
- <button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants"/>
- <button label="?" name="download_raw_help"/>
- <button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants"/>
- <button label="?" name="upload_raw_help"/>
+ <button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+ <button label="?" name="download_raw_help" left="246" />
+ <button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+ <button label="?" name="upload_raw_help" left="246" />
<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'élévation/abaissement"/>
<button label="?" name="bake_terrain_help"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index a59304c..5ba025f 100644
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<role_actions>
<action_set
description="Ces pouvoirs permettent d'ajouter et de supprimer des membres du groupe et permettent aux nouveaux membres de rejoindre le groupe sans recevoir d'invitation."
name="Membership">
<action description="Inviter des membres dans ce groupe"
- longdescription="Invitez des membres à rejoindre ce goupe en utilisant le bouton Inviter un nouveau membre à partir de l'onglet Membres et rôles > Membres."
+ longdescription="Invitez des membres à rejoindre ce groupe en utilisant le bouton Inviter un nouveau membre à partir de l'onglet Membres et rôles > Membres."
name="member invite" value="1" />
<action description="Expulser des membres du groupe"
- longdescription="Expulsez des membres de ce goupe en utilisant le bouton Expulser un membre à partir de l'onglet Membres et rôles > Membres. Un propriétaire ne peut pas être expulsé. Un membre peut être expulsé d'un groupe uniquement s'il a le rôle Invité (Everyone). Si vous n'êtes pas propriétaire, vous devez d'abord retirer les rôles d'un membre avant de pouvoir l'expulser."
+ longdescription="Expulsez des membres de ce groupe en utilisant le bouton Expulser un membre à partir de l'onglet Membres et rôles > Membres. Un propriétaire ne peut pas être expulsé. Un membre peut être expulsé d'un groupe uniquement s'il a le rôle Tous (Everyone). Si vous n'êtes pas propriétaire, vous devez d'abord retirer les rôles d'un membre avant de pouvoir l'expulser."
name="member eject" value="2" />
<action
description="Gérer l'inscription et les frais d'inscription"
- longdescription="Choisissez l'inscription libre pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez les Frais d'inscription à l'onglet Général."
+ longdescription="Choisissez l'inscription libre pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez les frais d'inscription à l'onglet Général."
name="member options" value="3" />
</action_set>
<action_set
@@ -27,7 +27,7 @@
longdescription="Modifiez les noms, titres et descriptions des rôles à l'onglet Membres et rôles > Rôles."
name="role properties" value="6" />
<action description="Attribuer des rôles limités"
- longdescription="Affectez des membres à certains rôles à l'onglet Membres et rôles > Membres. Un membre ne peut attribuer que des rôles auxquels il est lui même affecté."
+ longdescription="Affectez des membres à certains rôles à l'onglet Membres et rôles > Membres. Un membre ne peut attribuer que des rôles auxquels il est lui-même affecté."
name="role assign member limited" value="7" />
<action description="Attribuer tous les rôles"
longdescription="Affectez des membres à tous types de rôles à l'onglet Membres et rôles > Membres > Rôles assignés. Attention : ce pouvoir peut conférer des rôles très importants, proches de ceux d'un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
@@ -44,7 +44,7 @@
name="Group Identity">
<action
description="Modifier le profil public du groupe"
- longdescription="Modifier la charte, le logo, l'affichage dans la recherche et la liste des membres visibles à l'onglet Général."
+ longdescription="Modifiez la charte, le logo, l'affichage dans la recherche et la liste des membres visibles à l'onglet Général."
name="group change identity" value="11" />
</action_set>
<action_set
@@ -83,10 +83,10 @@
description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d'objets et le relief."
name="Parcel Settings">
<action description="Modifier la musique et les médias"
- longdescription="Changez la musique et les médias à partir du menu À propos du terrain, > Médias."
+ longdescription="Changez la musique et les médias à partir du menu À propos du terrain > Médias."
name="land change media" value="20" />
<action description="Changer l'option Modifier le terrain"
- longdescription="Changez l'option Modifier le terrain à partir du menu À propos du terrain > Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l''attribuer. "
+ longdescription="Changez l'option Modifier le terrain à partir du menu À propos du terrain > Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer. "
name="land edit" value="21" />
<action
description="Changer diverses options du terrain"
@@ -162,7 +162,7 @@
description="Ce pouvoir définit les contributions aux frais du groupe, la réception des dividendes et l'accès aux finances du groupe."
name="Accounting">
<action description="Contribuer aux frais du groupe et recevoir des dividendes"
- longdescription="Contribuez aux frais du groupe et recevez des dividendes en cas de bénéfices. Vous recevrez une partie des ventes de terrains et objets appartenant au groupe et contribuerez aux frais divers (mise en vente des terrains etc). "
+ longdescription="Contribuez aux frais du groupe et recevez des dividendes en cas de bénéfices. Vous recevrez une partie des ventes de terrains et objets appartenant au groupe et contribuerez aux frais divers (mise en vente des terrains etc.)"
name="accounting accountable" value="40" />
</action_set>
<action_set
diff --git a/indra/newview/skins/default/xui/ja/alerts.xml b/indra/newview/skins/default/xui/ja/alerts.xml
index 2a915f5..48b7a64 100644
--- a/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/indra/newview/skins/default/xui/ja/alerts.xml
@@ -656,12 +656,12 @@ L$が不足しているのでこのグループに参加することができま
</alert>
<alert name="PromptRecipientEmail">
<message name="message">
- 受信者の電子メール・アドレスを入力してください。
+ 受信者のEメール・アドレスを入力してください。
</message>
</alert>
<alert name="PromptSelfEmail">
<message name="message">
- あなたの電子メール・アドレスを入力してください。
+ あなたのEメール・アドレスを入力してください。
</message>
</alert>
<alert name="PromptMissingSubjMsg">
@@ -878,8 +878,7 @@ L$が不足しているのでこのグループに参加することができま
</alert>
<alert name="GoToAuctionPage">
<message name="message">
- オークションの詳細を見たり、
-入札をするために[SECOND_LIFE]ウェブ・ページに移動しますか？
+ [SECOND_LIFE]ウェブ・ページに移動し、入札あるいはオークションの詳細を確認しますか？
</message>
<option name="GotoPage">
OK
@@ -1018,10 +1017,10 @@ L$が不足しているのでこのグループに参加することができま
</alert>
<alert name="UnsupportedHardware">
<message name="message">
- 警告： あなたのシステムは Second Life を使用するために必要な必須動作環境の条件をを満たしていません。 Second Life をこのままご使用になると、不十分なパフォーマンスしか得られないおそれがあります。 また、サポート外のシステム構成でご使用の場合、テクニカルサポートをご利用いただくことができません。
+ 警告： あなたのシステムは Second Life を使用するために必要な必須動作環境の条件を満たしていません。 Second Life をこのままご使用になると、不十分なパフォーマンスしか得られないおそれがあります。 また、サポート外のシステム構成でご使用の場合、テクニカルサポートをご利用いただくことができません。
必須動作環境の条件
-［_URL］ にアクセスして、さらに詳しい情報をご覧になりますか?
+[_URL] にアクセスして、さらに詳しい情報をご覧になりますか?
</message>
<ignore name="ignore">
サポート外のハードウェアの検出時
@@ -1386,6 +1385,28 @@ www.secondlife.comに戻って、新規アカウントの作成を行います
キャンセル
</option>
</alert>
+ <alert name="EjectAvatarNoBan">
+ <message name="message">
+ このアバターをあなたの土地から追放しますか？
+ </message>
+ <option name="Eject">
+ 追放
+ </option>
+ <option name="Cancel">
+ キャンセル
+ </option>
+ </alert>
+ <alert name="EjectAvatarFullnameNoBan">
+ <message name="message">
+ [AVATAR_NAME] をあなたの土地から追放しますか？
+ </message>
+ <option name="Eject">
+ 追放
+ </option>
+ <option name="Cancel">
+ キャンセル
+ </option>
+ </alert>
<alert name="InvalidUUID">
<message name="message">
UUIDが無効です。
@@ -2066,7 +2087,7 @@ L$は贈与されません。
</alert>
<alert name="AddFriend" title="フレンドを追加">
<message name="message">
- フレンド同士はお互いの現在地を地図に表示することを許可し、オンラインステータスの更新ができます
+ フレンドとして追加すると、お互いの現在地の地図への表示許可、オンラインステータス表示の設定をすることができます。
[NAME] にフレンドシップを送りますか？
</message>
@@ -2082,7 +2103,7 @@ L$は贈与されません。
</alert>
<alert name="AddFriendWithMessage" title="フレンドを追加">
<message name="message">
- フレンド同士はお互いの現在地を地図に表示することを許可し、オンラインステータスの更新ができます
+ フレンドとして追加すると、お互いの現在地の地図への表示許可、オンラインステータス表示の設定をすることができます。
[NAME] にフレンドシップのオファーをしますか？
</message>
@@ -2439,8 +2460,8 @@ http://www.apple.com/quicktime/で、最新版をダウンロードしてくだ
</alert>
<alert name="AvatarMoved">
<message name="message">
- [TYPE]のロケーションは現在利用できません。 [HELP]
-あなたは近くの地域に移されました。
+ あなたが訪れたい[TYPE]のロケーションは現在ご利用できません。 [HELP]
+近くの地域に移動しました。
</message>
</alert>
<alert name="ClothingLoading">
@@ -3057,14 +3078,13 @@ F1キーを押してください。
</alert>
<alert name="BusyModeSet">
<message name="message">
- ビジーモードに設定されました。
-チャットとＩＭが隠れます。 ＩＭ
-は、ビジーモードの応答を受け取ります。 全てのテレポート
-のオファーは拒否されます。 全ての持ち物のオファーはゴミ箱に
-送られます。
+ 取り込み中に設定されました。
+チャットとインスタント・メッセージ（IM）が隠れます。
+相手は「取り込み中応答メッセージ」をIMで受け取ります。
+テレポートのオファーは全て拒否され、持ち物のオファーは全てゴミ箱に送られます。
</message>
<ignore name="ignore">
- ビジー・モードを設定するとき
+ 取り込み中の設定をするとき
</ignore>
<option name="OK">
OK
@@ -3190,10 +3210,10 @@ F1キーを押してください。
</alert>
<alert name="OfferTeleport">
<message name="message">
- あなたのロケーションへのテレポートを次のメッセージと共に贈りますか？
+ 次のメッセージを添えてあなたが今いる場所へのテレポートを送りますか？
</message>
<editline name="editline">
- [REGION]に参加希望
+ [REGION]に来ませんか？
</editline>
<option name="OK">
OK
@@ -3207,7 +3227,7 @@ F1キーを押してください。
ユーザーをゴッド・コールで呼び寄せますか？
</message>
<editline name="editline">
- [REGION]に参加希望
+ [REGION]に来ませんか？
</editline>
<option name="OK">
OK
@@ -4215,7 +4235,7 @@ http://secondlife.com/support/incidentreport.php
使用してください。できるだけ詳しい情報を提供してください。
自動返答メールに、より詳しい情報を付け加えて返信することも
できます。
-バグレポートは全て調査され解決されます。これによって電子メールで返答が送られてくることはありません。
+バグレポートは全て調査され解決されます。これによってEメールで返答が送られてくることはありません。
-
テクニカルな問題が生じた場合は、次のサポートに連絡してください:
http://secondlife.com/community/support.php
@@ -4317,17 +4337,16 @@ Linden Lab
キャンセル
</option>
</alert>
- <alert name="BusyModePay" title="ビジー・モードの警告">
+ <alert name="BusyModePay" title="取り込み中の警告">
<message name="message">
- 現在、ビジー・モードのため、この支払いと
+ 現在、取り込み中のため、この支払いと
引き換えのアイテムを受け取ることが
できません。
-この取引を完了する前に、ビジー・
-モードを外しますか？
+この取引を完了する前に、取り込み中の設定を解除しますか？
</message>
<ignore name="ignore">
- ビジー・モードの人またはオブジェクトに支払うとき
+ 取り込み中の人またはオブジェクトに支払うとき
</ignore>
<option name="Yes">
OK
@@ -4411,7 +4430,7 @@ Linden Lab
</alert>
<alert name="GraphicsPreferencesHelp">
<message name="message">
- このパネルはウィンドウのサイズと解像度、およびクライアントのグラフィックの品質を制御します。 [環境設定]>[グラフィック]のインタフェースでは、次の 4 つの中からグラフィック・レベルを選択できます。低、中、高、超高。 また、[カスタム]チェックボックスをクリックし、次の設定を操作することで、グラフィックスの設定をカスタマイズすることもできます。
+ このパネルでは、ウィンドウのサイズと解像度、およびクライアントのグラフィックの品質を設定することができます。[環境設定]>[表示]のインタフェースでは、低、中、高、超高の4つの中からグラフィック・レベルを選択できます。また、[カスタム]チェックボックスをクリックし、以下のグラフィックスの設定をカスタマイズすることもできます。
シェーダー:ピクセル・シェーダーのさまざまな種類を有効または無効にします。
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index f281193..9027f84 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -29,6 +29,6 @@
道のりは短いが、すべきことは山のようにある –アラン・チューニング
</text_editor>
<text name="you_are_at">
- [POSITION]中
+ [POSITION]
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 1abab03..c6f6e12 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -157,7 +157,7 @@
地域オブジェクトボーナス要因: [BONUS]
</text>
<text length="1" name="Simulator primitive usage:" type="string" width="500">
- シミュレータの基本要素使用状況：
+ 地域全体のプリム使用状況：
</text>
<text left="200" name="objects_available">
[MAX]の内[COUNT]（[AVAILABLE]利用可能）
@@ -169,13 +169,13 @@
[MAX]の内[COUNT]（[DELETED]を削除）
</string>
<text length="1" name="Primitives parcel supports:" type="string" width="200">
- 区画でサポートされる基本要素数：
+ 区画でサポートされるプリム数：
</text>
<text left="200" length="1" name="object_contrib_text" type="string">
[COUNT]
</text>
<text length="1" name="Primitives on parcel:" type="string">
- 区画上の基本要素数：
+ 区画上のプリム数：
</text>
<text left="200" length="1" name="total_objects_text" type="string">
[COUNT]
@@ -224,7 +224,7 @@
<column name="online_status"/>
<column label="名前" name="name"/>
<column label="カウント" name="count"/>
- <column label="Most Recent" name="mostrecent"/>
+ <column label="最新" name="mostrecent"/>
</name_list>
</panel>
<panel label="オプション" name="land_options_panel">
@@ -240,12 +240,12 @@
<check_box label="すべての住人" left="280" name="edit objects check"/>
<check_box label="グループ" left="380" name="edit group objects check"/>
<text left="138" length="1" name="allow_label3" type="string" width="144">
- オブジェクト・エントリ：
+ オブジェクトの進入：
</text>
<check_box label="すべての住人" left="280" name="all object entry check"/>
<check_box label="グループ" left="380" name="group object entry check"/>
<text left="138" length="1" name="allow_label4" type="string" width="144">
- スクリプト実行：
+ スクリプトの実行：
</text>
<check_box label="すべての住人" left="280" name="check other scripts"/>
<check_box label="グループ" left="380" name="check group scripts"/>
@@ -379,7 +379,7 @@
<text name="Voice settings:">
ボイス：
</text>
- <radio_group name="parcel_voice_channel">
+ <radio_group name="parcel_voice_channel" width="310">
<radio_item name="Estate">
不動産空間チャンネルを使用
</radio_item>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index ee7e4df..fb0659f 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,15 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="avatar_texture_debug" title="アバター・テクスチャー">
- <text name="">
- 構築されたテクスチャー
+ <text name="baked_label" width="128">
+ 構築されたﾃｸｽﾁｬｰ
</text>
- <text name="">
- 合成テクスチャー
- </text>
- <text name="baked_label">
- 構築されたテクスチャー
- </text>
- <text name="composite_label">
+ <text name="composite_label" width="128">
合成テクスチャー
</text>
<texture_picker label="頭" name="baked_head" />
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index 179d017..49c8758 100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="beacons" title="ビーコン（標識）">
<panel name="beacons_panel">
- <check_box label="タッチオンリーのスクリプトを含むオブジェクト" name="touch_only"/>
+ <check_box label="ﾀｯﾁｵﾝﾘｰのｽｸﾘﾌﾟﾄを含むｵﾌﾞｼﾞｪｸﾄ" name="touch_only"/>
<check_box label="スクリプト・オブジェクト" name="scripted"/>
<check_box label="物理的オブジェクト" name="physical"/>
<check_box label="音源" name="sounds"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ca8f44d..3079d45 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -35,19 +35,19 @@
データを取得しています...
</text>
<text name="balance_label">
- 現在所有しているのは
+ 現在所有している額
</text>
<text name="balance_amount">
L$ [AMT]
</text>
<text name="buying_label">
- あなたは購しようとしています
+ 購入する額
</text>
<text name="buying_amount">
L$ [AMT]
</text>
<text name="total_label">
- あなたの残高は
+ 合計残高
</text>
<text name="total_amount">
L$ [AMT]
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_history.xml b/indra/newview/skins/default/xui/ja/floater_chat_history.xml
index 7b92c12..1f7b99d 100644
--- a/indra/newview/skins/default/xui/ja/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/ja/floater_chat_history.xml
@@ -28,7 +28,7 @@
ジェスチャー
</combo_item>
</combo_box>
- <check_box label="ミュートされたテキストを表示" name="show mutes"/>
+ <check_box label="無視されたテキストを表示" name="show mutes"/>
<button label="< <" label_selected="> >" name="toggle_active_speakers_btn" tool_tip="ここをクリックして、このIMセッションへのアクティブな参加者リストを表示。"/>
<panel name="chat_panel">
<string name="gesture_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_customize.xml b/indra/newview/skins/default/xui/ja/floater_customize.xml
index 7b4fdbc..3b99bc9 100644
--- a/indra/newview/skins/default/xui/ja/floater_customize.xml
+++ b/indra/newview/skins/default/xui/ja/floater_customize.xml
@@ -53,7 +53,7 @@
<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="Makeup" />
<button label="身体細部" label_selected="身体細部" name="Body Detail" />
<text type="string" length="1" name="title">
[DESC]
diff --git a/indra/newview/skins/default/xui/ja/floater_directory.xml b/indra/newview/skins/default/xui/ja/floater_directory.xml
index 0090ceb..018a4a5 100644
--- a/indra/newview/skins/default/xui/ja/floater_directory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_directory.xml
@@ -237,7 +237,7 @@
何も見つかりませんでした。
</string>
<button label="戻る" name="back_btn" />
- <button label="転送" name="forward_btn" />
+ <button label="進む" name="forward_btn" />
<string name="loading_text">
ロード中...
</string>
@@ -400,7 +400,7 @@
<column label="" name="score" />
</scroll_list>
<button label="戻る" name="back_btn" />
- <button label="転送" name="forward_btn" />
+ <button label="進む" name="forward_btn" />
<line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
<button label="検索" name="search_btn" />
<check_box label="成人向けコンテンツを含める" name="mature_check" />
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 9da09ff..7413141 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -33,9 +33,9 @@
<text name="Enable VBO:">
VBO を有効化：
</text>
- <check_box label="OpenGL Vertex Buffer オブジェクトを有効化" name="vbo"
+ <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo"
tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。 しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。" />
- <slider label="テクスチャ記憶(MB)：" name="GrapicsCardTextureMemory"
+ <slider label="テクスチャﾒﾓﾘ(MB)：" name="GrapicsCardTextureMemory"
tool_tip="テクスチャーに割り当てるメモリの合計。 ビデオ・カード・メモリをデフォルトにします。 この数値を減らすと、パフォーマンスが改善されますが、テクスチャーがぼやけた感じになる場合があります。" />
<spinner label="フォグの距離比率：" name="fog" />
<button label="OK" label_selected="OK" name="OK" />
diff --git a/indra/newview/skins/default/xui/ja/floater_im.xml b/indra/newview/skins/default/xui/ja/floater_im.xml
index 30dae0a..eec6447 100644
--- a/indra/newview/skins/default/xui/ja/floater_im.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im.xml
@@ -10,7 +10,7 @@
このボイスチャットに応答/接続する場合は、[BUTTON NAME]をクリックしてください。
</string>
<string name="muted_message">
- あなたはこの住人をミュートしています。 メッセージを送信すると、ミュートは自動的に解除されます。
+ あなたはこの住人を無視しています。 メッセージを送信すると、無視設定は自動的に解除されます。
</string>
<string name="generic_request_error">
要求中にエラーが発生しました。後でもう一度試してください。
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index 81484f4..fe2f075 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -2,7 +2,7 @@
<floater name="inspect" title="オブジェクト検査">
<scroll_list name="object_list"
tool_tip="このリストからオブジェクトを選択し、この世界で強調表示します。">
- <column label="オブジェクト名" name="object_name" />
+ <column label="ｵﾌﾞｼﾞｪｸﾄ名" name="object_name" />
<column label="所有者名" name="owner_name" />
<column label="制作者名" name="creator_name" />
<column label="作成日" name="creation_date" />
diff --git a/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index ade57de..944e0e8 100644
--- a/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -21,7 +21,7 @@
<string name="default_text_label">
ここをクリックしてIM
</string>
- <button label="プロフィール..." name="profile_callee_btn" width="100"/>
+ <button label="プロフィール" name="profile_callee_btn" width="100"/>
<button label="コール" name="start_call_btn" left_delta="105" width="100"/>
<button label="呼出終了" name="end_call_btn" width="100" />
<panel name="speaker_controls" left_delta="96">
diff --git a/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml b/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
index 1ab40ec..227af33 100644
--- a/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
@@ -2,7 +2,7 @@
<floater label="(不明）" name="im_floater" title="(不明）">
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
- <button label="グループインフォ" name="group_info_btn" width="120"/>
+ <button label="グループ情報" name="group_info_btn" width="120"/>
<button label="コールに参加" name="start_call_btn" left_delta="125" width="120"/>
<button label="コールの終了" name="end_call_btn" width="120" />
<button label="< <" label_selected="> >" name="toggle_active_speakers_btn" tool_tip="このIMセッションのアクティブな参加者のリスト表示を切り替えるにはここをクリックします"/>
@@ -33,7 +33,7 @@
Rumplstiltskin Califragilistic
</text>
<text name="Mute:">
- ミュート:
+ 無視:
</text>
<check_box label="テキスト" name="mute_text_btn"/>
<check_box label="ボイス" name="mute_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 55707b9..a002991 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -3,7 +3,7 @@
<layout_stack name="stack1">
<layout_panel name="nav_controls">
<button label="戻る" name="back" />
- <button label="転送" name="forward" />
+ <button label="進む" name="forward" />
<button label="再ロード" name="reload" />
<button label="行く" name="go" />
</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_mute.xml b/indra/newview/skins/default/xui/ja/floater_mute.xml
index dbc89f8..c76288f 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="mute floater"
- title="ミュートされた住人およびオブジェクト">
+ title="無視された住人およびオブジェクト" short_title="無視リスト">
<scroll_list name="mutes" tool_tip="List of currently muted residents" />
- <button label="住人をミュートする..."
- label_selected="住人をミュートする..." name="Mute resident..."
- tool_tip="ミュートする住人を選択" />
- <button label="オブジェクトを名前でミュート..."
- label_selected="オブジェクトを名前でミュート..."
+ <button label="住人を無視する"
+ label_selected="住人を無視する" name="Mute resident..."
+ tool_tip="無視する住人を選択" />
+ <button label="オブジェクト名で無視"
+ label_selected="オブジェクト名で無視"
name="Mute object by name..." />
- <button label="ミュートしない" label_selected="ミュートしない"
+ <button label="無視の解除" label_selected="無視の解除"
name="Unmute"
- tool_tip="住人またはオブジェクトをミュート・リストから削除" />
+ tool_tip="住人またはオブジェクトを無視リストから削除" />
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index abb738a..c32d684 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="オブジェクト名でミュート(消声)する">
+<floater name="mute by name" title="オブジェクト名で無視する">
<text name="message">
- 名前によるミュート(消声)は、オブジェクト・チャット、およびＩＭのみに影響し、サウンド(環境音など)には影響しません。
-正確なオブジェクト名をタイプする必要があります。
+ ﾃｷｽﾄのみに影響し、ｻｳﾝﾄﾞ(環境音など)には影響しません。
+正確なオブジェクト名を入力してください。
</text>
<line_editor name="object_name">
オブジェクト名
</line_editor>
<button label="OK" name="OK" />
- <button label="キャンセル" name="Cancel" />
+ <button label="ｷｬﾝｾﾙ" name="Cancel" />
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
index e39f9f1..427077c 100644
--- a/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
@@ -31,7 +31,7 @@
<check_box label="左耳" name="checkbox_Left Ear" left="212" />
<check_box label="右耳" name="checkbox_Right Ear" left="312" />
<check_box label="左目眼球" name="checkbox_Left Eyeball" left="312"/>
- <check_box label="右眼眼球" name="checkbox_Right Eyeball" left="312" />
+ <check_box label="右目眼球" name="checkbox_Right Eyeball" left="312" />
<check_box label="鼻" name="checkbox_Nose" left="312" />
<check_box label="右上腕" name="checkbox_R Upper Arm" left="312" />
<check_box label="右前腕" name="checkbox_R Forearm" left="312" />
@@ -59,10 +59,10 @@
</text>
<text type="string" length="1"
name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. "Make New Outfit" makes a new folder and saves copies of the items you are now wearing into it.">
- 服装フォルダには、服と身体部位が含まれます。
-服などを装着するには、服装フォルダをアバターにドラッグします。
+ 服装とは服や身体部位が入ったフォルダです。
+服装フォルダをアバターにドラッグし、中身を装着します。
-[新しい服装を作成]では、新しいフォルダを作成し、
+[服装を作成]では、新しいフォルダを作成し、
現在装着しているアイテムのコピーを保存します。
</text>
<text type="string" length="1" name="Folder name:">
@@ -78,7 +78,7 @@
服：
</text>
<text type="string" length="1" name="Attachments:" left="212">
- 添付物：
+ 装着物：
</text>
<text type="string" length="1" name="Options:">
オプション：
diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml
index 1689ec7..65c4f65 100644
--- a/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_postcard.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="スナップショットを電子メールで送信">
+<floater name="Postcard" title="スナップショットをEメールで送信">
<text name="to_label">
- 住人の電子メール：
+ 住人のEメール：
</text>
<line_editor left="145" name="to_form" width="125" />
<text name="from_label">
@@ -15,13 +15,13 @@
<text name="subject_label">
件名：
</text>
- <line_editor label="件名をここにタイプ。" left="145" name="subject_form"
+ <line_editor label="件名をここに入力" left="145" name="subject_form"
width="125" />
<text name="msg_label">
メッセージ：
</text>
<text_editor bottom_delta="-120" height="110" name="msg_form">
- メッセージをここにタイプ。
+ メッセージをここに入力してください。
</text_editor>
<check_box label="ウェブ上で公開" name="allow_publish_check"
tool_tip="このポストカードをウェブ上で公開します。" />
@@ -29,12 +29,12 @@
tool_tip="このポストカードには成人向け内容が含まれます。" />
<button label="?" left="300" name="publish_help_btn" />
<text name="fine_print">
- あなたの受信者がSLに参加すると、あなたは紹介ボーナスを受け取れます
+ この受信者がSLに参加すると、あなたに紹介ボーナスが入ります
</text>
<button bottom_delta="-52" label="取り消し" name="cancel_btn" />
<button label="送信" name="send_btn" />
<text name="default_subject">
- Second Life からのポストカード。
+ Second Life からのポストカード
</text>
<text name="default_message">
これは絶対チェック！
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 2112e00..eddccdf 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -36,7 +36,7 @@
<text name="owner_name">
Hendrerit Vulputate
</text>
- <combo_box name="category_combo" >
+ <combo_box name="category_combo" tool_tip="カテゴリー -- この報告に最も適したカテゴリーを選択してください">
<combo_item name="Select_category">
カテゴリーを選択
</combo_item>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index ac15c1f..defd5b0 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -5,7 +5,7 @@
</text>
<radio_group label="スナップショット・タイプ" name="snapshot_type_radio">
<radio_item name="postcard">
- 電子メールで送信
+ Eメールで送信
</radio_item>
<radio_item name="texture">
持ち物に保存(L$10)
@@ -35,11 +35,11 @@
サイズ
</text>
<text name="format_label" width="75">
- フォーマット
+ 形式
</text>
<combo_box label="解像度" name="postcard_size_combo">
<combo_item name="CurrentWindow">
- 現在のウィンドウ
+ 現在のｳｨﾝﾄﾞｳ
</combo_item>
<combo_item name="640x480">
640x480
@@ -56,7 +56,7 @@
</combo_box>
<combo_box label="解像度" name="texture_size_combo">
<combo_item name="CurrentWindow">
- 現在のウィンドウ
+ 現在のｳｨﾝﾄﾞｳ
</combo_item>
<combo_item name="Small(128x128)">
小（128x128）
@@ -73,7 +73,7 @@
</combo_box>
<combo_box label="解像度" name="local_size_combo">
<combo_item name="CurrentWindow">
- 現在のウィンドウ
+ 現在のｳｨﾝﾄﾞｳ
</combo_item>
<combo_item name="320x240">
320x240
@@ -97,7 +97,7 @@
カスタム
</combo_item>
</combo_box>
- <combo_box label="フォーマット" name="local_format_combo">
+ <combo_box label="形式" name="local_format_combo">
<combo_item name="PNG">
PNG
</combo_item>
@@ -110,7 +110,7 @@
</combo_box>
<spinner label="幅" name="snapshot_width" label_width="25" width="90"/>
<spinner label="高さ" name="snapshot_height" label_width="30" left="115" width="90"/>
- <check_box label="比率の制限" name="keep_aspect_check"/>
+ <check_box label="縦横比の固定" name="keep_aspect_check"/>
<slider label="画質" name="image_quality_slider"/>
<text name="layer_type_label">
ｷｬﾌﾟﾁｬ：
@@ -129,7 +129,7 @@
<check_box label="インタフェースを表示" name="ui_check"/>
<check_box label="HUD オブジェクトを表示" name="hud_check"/>
<check_box label="保存後も開いた状態を保持" name="keep_open_check"/>
- <check_box label="フレームをフリーズ（全画面）" name="freeze_frame_check"/>
+ <check_box label="画面全体を静止させる" name="freeze_frame_check"/>
<check_box label="自動更新" name="auto_snapshot_check"/>
<string name="unknown">
未知
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index b8e6c3e..0842e81 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -4,7 +4,7 @@
<text name="tool label">
フォーカス
</text>
- <button label="" label_selected="" name="button move" tool_tip="動く" />
+ <button label="" label_selected="" name="button move" tool_tip="動かす" />
<text name="tool label2">
移動
</text>
@@ -137,7 +137,7 @@
<text name="perm_modify">
このオブジェクトは修正できます。
</text>
- <check_box label="グループ分担" name="checkbox share with group"
+ <check_box label="グループで共同管理" name="checkbox share with group"
tool_tip="グループ・メンバーに対して移動、修正、コピー、削除を許可" />
<text name="text deed continued">
譲渡...
@@ -253,7 +253,7 @@
</panel>
<panel label="オブジェクト" name="Object">
<text name="select_single">
- パラメーターを編集するには、基本要素を1つだけ選択してください。
+ プリムを1つだけ選択して編集してください
</text>
<text name="edit_object">
オブジェクトのパラメーターを編集：
@@ -289,19 +289,19 @@
</text>
<combo_box name="material">
<combo_item name="Stone">
- 石
+ 石材
</combo_item>
<combo_item name="Metal">
金属
</combo_item>
<combo_item name="Glass">
- グラス
+ ガラス
</combo_item>
<combo_item name="Wood">
- 木
+ 木材
</combo_item>
<combo_item name="Flesh">
- 肉体
+ 肌
</combo_item>
<combo_item name="Plastic">
プラスチック
@@ -336,7 +336,7 @@
リング
</combo_item>
<combo_item name="Sculpted">
- 変形済み
+ スカルプト
</combo_item>
</combo_box>
<text name="text cut">
@@ -345,13 +345,13 @@
<spinner label="B" name="cut begin" />
<spinner label="E" name="cut end" />
<text name="text hollow">
- 中空
+ 中空(空洞)
</text>
<text name="text skew">
傾斜
</text>
<text name="Hollow Shape">
- 中空の形
+ 中空（空洞）の形
</text>
<combo_box name="hole">
<combo_item name="Default">
@@ -386,10 +386,10 @@
<spinner label="X" name="Shear X" />
<spinner label="Y" name="Shear Y" />
<text name="advanced_cut">
- プロフィール・カットの始点と終点
+ ﾌﾟﾛﾌｨｰﾙ･ｶｯﾄの始点と終点
</text>
<text name="advanced_dimple">
- さざなみの始点と終点
+ くぼみの始点と終点
</text>
<spinner label="B" name="Path Limit Begin" />
<spinner label="E" name="Path Limit End" />
@@ -402,9 +402,9 @@
半径
</text>
<text name="text revolutions">
- レボリューション
+ 回転体
</text>
- <texture_picker label="変形テクスチャー" name="sculpt texture control"
+ <texture_picker label="スカルプトテクスチャー" name="sculpt texture control"
tool_tip="クリックして写真を選択してください。" />
<check_box label="ミラー" name="sculpt mirror control"
tool_tip="スカルプトされたプリムをX軸上で反転" />
@@ -433,7 +433,7 @@
</panel>
<panel label="特徴" name="Features">
<text name="select_single">
- 特徴を編集するには、基本要素を1つだけ選択してください。
+ プリムを1つだけ選択して編集してください
</text>
<text name="edit_object">
オブジェクトの特徴を編集：
@@ -605,7 +605,7 @@
<button label="土地を放棄..." label_selected="土地を放棄..."
name="button abandon land" />
<button label="再分割..." label_selected="再分割..." name="button subdivide land" />
- <button label="参加する..." label_selected="参加する..."
+ <button label="統合する..." label_selected="統合する..."
name="button join land" />
<button label="土地情報..." label_selected="土地情報..."
name="button about land" />
@@ -623,7 +623,7 @@
土地をクリックし、ボタンを押したまま入力して修正変更
</text>
<text name="status_camera">
- ビューをクリックし、ドラッグして変更
+ クリックしドラッグして視界を調整
</text>
<text name="status_grab">
ﾄﾞﾗｯｸﾞし移動､Ctrlで持上げ､Ctrl+Shiftでｽﾋﾟﾝ
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index af038ea..9b0f2db 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -3,9 +3,9 @@
<text name="media_label">
メディア URL：
</text>
- <button label="OK" name="ok_btn" />
- <button label="キャンセル" name="cancel_btn" />
- <button label="キャンセル" name="cancel_btn2" />
+ <combo_box left="100" name="media_entry" width="360" />
+ <button label="OK" name="ok_btn" width="78"/>
+ <button label="キャンセル" name="cancel_btn" width="80"/>
<button label="クリア" name="clear_btn" />
<text name="loading_label">
ロード中．．．
diff --git a/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml b/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
index 3be4b21..10de376 100644
--- a/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<pie_menu name="Avatar Pie">
<menu_item_call label="プロフィール..." name="Profile..." />
- <menu_item_call label="ミュート" name="Avatar Mute" />
+ <menu_item_call label="無視" name="Avatar Mute" />
<menu_item_call label="移動先" name="Go To" />
<menu_item_call label="評価" name="Rate" />
<menu_item_call label="フレンドを追加..." name="Add Friend" />
diff --git a/indra/newview/skins/default/xui/ja/menu_pie_object.xml b/indra/newview/skins/default/xui/ja/menu_pie_object.xml
index 64a8190..eeefd5f 100644
--- a/indra/newview/skins/default/xui/ja/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_pie_object.xml
@@ -17,7 +17,7 @@
<menu_item_call label="オーナーを評価..." name="Rate Owner..." />
<menu_item_call label="嫌がらせの報告..." name="Report Abuse..." />
<menu_item_call label="クリエーターを評価..." name="Rate Creator..." />
- <menu_item_call label="ミュート" name="Object Mute" />
+ <menu_item_call label="無視" name="Object Mute" />
<menu_item_call label="検査" name="Object Inspect" />
</pie_menu>
<menu_item_call label="購入..." name="Buy..." />
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 0c7df77..b888051 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -5,7 +5,7 @@
<menu_item_call label="画像をアップロード（L$[COST]）..." name="Upload Image"/>
<menu_item_call label="サウンドをアップロード（L$[COST]）..." name="Upload Sound"/>
<menu_item_call label="アニメーションをアップロード（L$[COST]）..." name="Upload Animation"/>
- <menu_item_call label="大量アップロード（L＄[COST]／ファイル）…" name="Bulk Upload"/>
+ <menu_item_call label="一括アップロード（L＄[COST]／ファイル）…" name="Bulk Upload"/>
<menu_item_separator label="-----------" name="separator"/>
<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
@@ -57,11 +57,11 @@
<menu_item_separator label="-----------" name="separator8"/>
<menu_item_call label="環境設定..." name="Preferences..."/>
</menu>
- <menu label="ビュー" name="View">
+ <menu label="表示" name="View">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_call label="マウスルック" name="Mouselook"/>
- <menu_item_check label="建造" name="Build"/>
- <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam"/>
+ <menu_item_call label="一人称視点（マウスルック）" name="Mouselook"/>
+ <menu_item_check label="制作ツール" name="Build"/>
+ <menu_item_check label="ジョイスティック操作" name="Joystick Flycam"/>
<menu_item_call label="表示をリセット" name="Reset View"/>
<menu_item_call label="最後のチャットを閲覧" name="Look at Last Chatter"/>
<menu_item_separator label="-----------" name="separator"/>
@@ -69,19 +69,19 @@
<menu_item_check label="ローカル・チャット" name="Chat History"/>
<menu_item_check label="コミュニケーション" name="Instant Message"/>
<menu_item_call label="持ち物" name="Inventory"/>
- <menu_item_check label="アクティブ・スピーカー" name="Active Speakers"/>
- <menu_item_check label="ミュートリスト" name="Mute List"/>
+ <menu_item_check label="ボイスチャット・ユーザー一覧" name="Active Speakers"/>
+ <menu_item_check label="無視リスト" name="Mute List"/>
<menu_item_separator label="-----------" name="separator2"/>
<menu_item_check label="カメラ・コントロール" name="Camera Controls"/>
<menu_item_check label="移動コントロール" name="Movement Controls"/>
<menu_item_check label="世界地図" name="World Map"/>
<menu_item_check label="ミニマップ" name="Mini-Map"/>
<menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="統計バー" name="Statistics Bar"/>
- <menu_item_check label="土地境界線" name="Property Lines"/>
+ <menu_item_check label="地域の統計情報" name="Statistics Bar"/>
+ <menu_item_check label="土地の境界線" name="Property Lines"/>
<menu_item_check label="土地オーナー" name="Land Owners"/>
<menu_item_separator label="-----------" name="separator4"/>
- <menu label="ホバリング・ヒント" name="Hover Tips">
+ <menu label="ヒントのポップアップ" name="Hover Tips">
<menu_item_check label="ヒントを表示" name="Show Tips"/>
<menu_item_separator label="-----------" name="separator"/>
<menu_item_check label="土地のヒント" name="Land Tips"/>
@@ -90,11 +90,11 @@
<menu_item_check label="透明オブジェクトを強調表示" name="Highlight Transparent"/>
<menu_item_check label="ビーコン(標識)" name="beacons"/>
<menu_item_check label="パーティクルを隠す" name="Hide Particles"/>
- <menu_item_check label="HUD添付物を表示" name="Show HUD Attachments"/>
+ <menu_item_check label="HUD装着物を表示" name="Show HUD Attachments"/>
<menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="拡大" name="Zoom In"/>
- <menu_item_call label="デフォルトを拡大" name="Zoom Default"/>
- <menu_item_call label="縮小" name="Zoom Out"/>
+ <menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
+ <menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
+ <menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
<menu_item_separator label="-----------" name="separator6"/>
<menu_item_call label="[全画面表示]" name="Toggle Fullscreen"/>
<menu_item_call label="UIサイズをデフォルトに設定" name="Set UI Size to Default"/>
@@ -104,18 +104,22 @@
<menu_item_check label="常に走る" name="Always Run"/>
<menu_item_check label="飛行" name="Fly"/>
<menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="ここにランドマークを作成" name="Create Landmark Here"/>
+ <menu_item_call label="この場所のランドマークを作成" name="Create Landmark Here"/>
<menu_item_call label="ホームをここに設定" name="Set Home to Here"/>
<menu_item_separator label="-----------" name="separator2"/>
<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
<menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="退席中に設定" name="Set Away"/>
- <menu_item_call label="ビジーに設定" name="Set Busy"/>
+ <menu_item_call label="離席中に設定" name="Set Away"/>
+ <menu_item_call label="取り込み中に設定" name="Set Busy"/>
<menu_item_call label="アニメーションをすべて停止" name="Stop All Animations"/>
- <menu_item_call label="キーを解除" name="Release Keys"/>
+ <menu_item_call label="キー制御を解除" name="Release Keys"/>
<menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="口座履歴..." name="Account History..."/>
- <menu_item_call label="自分の口座の管理..." name="Manage My Account..."/>
+ <menu_item_call label="口座履歴..." name="Account History...">
+ <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ja" />
+ </menu_item_call>
+ <menu_item_call label="自分の口座の管理..." name="Manage My Account...">
+ <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja" />
+ </menu_item_call>
<menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..."/>
<menu_item_separator label="-----------" name="separator5"/>
<menu_item_call label="自分の土地..." name="My Land..."/>
@@ -123,7 +127,7 @@
<menu_item_call label="土地を購入..." name="Buy Land..."/>
<menu_item_call label="地域／不動産..." name="Region/Estate..."/>
<menu_item_separator label="-----------" name="separator6"/>
- <menu label="環境設定" name="Environment Settings">
+ <menu label="環境の設定" name="Environment Settings">
<menu_item_call label="日の出" name="Sunrise"/>
<menu_item_call label="正午" name="Noon"/>
<menu_item_call label="日没" name="Sunset"/>
@@ -178,7 +182,7 @@
<menu_item_call label="Second Life ヘルプ" name="Second Life Help"/>
<menu_item_call label="チュートリアル" name="Tutorial"/>
<menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="オフィシャルLindenブログ..." name="Official Linden Blog..."/>
+ <menu_item_call label="Linden公式ブログ..." name="Official Linden Blog..."/>
<menu_item_separator label="-----------" name="separator2"/>
<menu_item_call label="スクリプト・ポータル..." name="Scripting Portal..."/>
<menu_item_separator label="-----------" name="separator3"/>
@@ -191,7 +195,9 @@
<menu_item_call label="パブリック問題トラッカー ヘルプ..." name="Publc Issue Tracker Help..."/>
<menu_item_separator label="-----------" name="separator7"/>
<menu_item_call label="バグの報告 101..." name="Bug Reporing 101..."/>
- <menu_item_call label="セキュリティ問題..." name="Security Issues..."/>
+ <menu_item_call label="セキュリティ問題..." name="Security Issues...">
+ <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/ja" />
+ </menu_item_call>
<menu_item_call label="QA Wiki..." name="QA Wiki..."/>
<menu_item_separator label="-----------" name="separator9"/>
<menu_item_call label="バグの報告..." name="Report Bug..."/>
diff --git a/indra/newview/skins/default/xui/ja/need_to_long.xml b/indra/newview/skins/default/xui/ja/need_to_long.xml
deleted file mode 100644
index de50c4c..0000000
--- a/indra/newview/skins/default/xui/ja/need_to_long.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<strings>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//ClickWebProfileHelpAvatar/message</b_path>
-<c_attribute/>
-<d_old>
-
- If this resident has a web profile URL set then you can:
- * Click Load to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
-
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
-
-</d_old>
-<e_new>
-
- If this resident has set a web profile URL then you can:
- * Click "Load" to load the page with the embedded web browser.
- * Click Load->"Open in external browser" to view externally.
- * Click Load->"Home URL" to return to resident's web profile if you've navigated away.
-
-When viewing your own profile you can enter any URL as your web profile and click OK to set it.
-Other residents can visit the URL you set when they view your profile.
-
-</e_new>
-<f_translation>
-
- この住人がウェブプロフィールURLを設定している場合は、以下のことが可能です。
- * そのページを内蔵ブラウザーで表示するには、[ロード]をクリックします。
- * そのページを外部ブラウザーで表示するには、[ロード]-[開く]をクリックします。
- * 別のページにアクセスしてしまい、住人のウェブ・プロフィールに戻りたい時は、[ロード]-[ホームURL]をクリックします。
-
-自分のプロフィールを表示しているときは、任意のURLをウェブプロフィールとして入力し、[OK]をクリックして設定できます。
-プロフィールを見た他の住人は、そのURLにアクセスすることができます。
-
-</f_translation>
-<f_old_trans>
-
- この住人がウェブ・プロフィールURLを設定している場合は、以下のことが可能です。
-*そのページを内蔵ブラウザーで表示するには、[ロード]をクリックします。
-*そのページをデフォルトの外部ウェブ・ブラウザーで表示するには、[開く]をクリックします。
-
-自分のプロフィールを表示しているときは、任意のURLをウェブ・プロフィールとして入力できます。
-プロフィールを見た住人は、そのURLにアクセスすることができます。
-
-</f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//HelpReportAbuseContainsCopyright/message</b_path>
-<c_attribute/>
-<d_old>
-
- Dear Resident,
-
-Reports about copyright infringement can only be submitted
-as described at http://secondlife.com/corporate/dmca.php.
-
-Reports concerning copyright infringement will automatically
-be discarded if they are submitted through the 'Abuse Report'
-feature. If your report does not relate to copyright infringement,
-you may close this window and finish submitting your report.
-
-Thank you,
-
-Linden Lab
-
-</d_old>
-<e_new>
-
- Dear Resident,
-
-If you are reporting intellectual property infringement, please make sure you are reporting it correctly:
-
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
-
-(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you must submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
-
-If you still wish to continue with the abuse process, please close this window and finish submitting your report.
-
-Thank you,
-
-Linden Lab
-</e_new>
-<f_translation>
-
- 親愛なる住人の皆様へ
-
-知的所有権の侵害を報告する場合は、以下のとおり正確に報告してください。
-
-(1) 嫌がらせの処理。 住人がSecond Lifeの許可システムを不当に使用し、知的所有権が侵害されていると考えられる場合は、嫌がらせ報告を提出することができます。許可システムを不当に使用する手段としては、たとえば、CopyBotまたは類似したコピー・ツールがあります。 嫌がらせ対応担当チームが調査を行い、Second Lifeのコミュニティ・スタンダードまたは利用規約に違反する態度に対しては適切な懲罰処分が行われます。 ただし、嫌がらせ対応担当チームでは、コンテンツをSecond Lifeワールドから削除するリクエストに対する処理または回答は行いません。
-
-(2) DMCAまたはコンテンツの削除処理。 Second Lifeからのコンテンツの削除をリクエストするには、http://secondlife.com/corporate/dmca.phpのDMCAポリシーにある、侵害に関する有効な通知を提出する必要があります。
-
-嫌がらせの処理を継続する場合は、このウインドウを閉じ、報告を提出してください。
-
-ご協力ありがとうございます。
-
-Linden Lab
-</f_translation>
-<f_old_trans>
-
- 親愛なる住人の皆様へ：
-
-著作権侵害に関する報告はhttp://secondlife.com/corporate/dmca.phpの
-記述に従ってのみ提出することができます。
-
-[嫌がらせ報告]機能を通じて著作権侵害に関する報告を提出しても、その報告は自動的に破棄されます。著作権侵害に関係のない報告であれば、このウィンドウを閉じて報告を提出することができます。
-
-ご協力ありがとうございます。
-
-Linden Lab
-
-</f_old_trans>
-</string>
-<string>
-<a_file>floater_about.xml</a_file>
-<b_path>/floater_about/credits_editor</b_path>
-<c_attribute/>
-<d_old>
-
- Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks, Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
-
- Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- All rights reserved. See licenses.txt for details.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- Happiness is a warm puppy. -- Charles M. Schulz
-</d_old>
-<e_new>
-
- Second Life is brought to you by Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn and many others.
-
- Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- All rights reserved. See licenses.txt for details.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- What happens to a dream deferred? --Langston Hughes
-</e_new>
-<f_translation>
-
- Second Lifeは、Philip、Tessa、Andrew、Cory、Ben、Bunny、Char、Charlie、Colin、Dan、Daniel、Doug、Eric、Hamlet、Haney、Hunter、Ian、Jeff、Jim、John、Lee、Mark、Peter、Phoenix、Richard、Robin、Xenon、Steve、Tanya、Eddie、Frank、Bruce、Aaron、Alice、Bob、Debra、Eileen、Helen、Janet、Louie、Leviathania、Stefan、Ray、Kevin、Tom、Mikeb、MikeT、Burgess、Elena、Tracy、BillTodd、Ryan、Zach、Sarah、Nova、Otakon、Tim、Stephanie、Michael、Evan、Nicolas、Catherine、Rachelle、Dave、Holly、Bub、Kelly、Magellan、Ramzi、Don、Sabin、Jill、Rheya、DanceStar、Jeska、Hungry、Torley、Kona、Callum、Charity、Ventrella、Jack、Uncle、Vektor、Iris、Chris、Nicole、Mick、Reuben、Blue、Babbage、Yedwab、Deana、Lauren、Brent、Pathfinder、Chadrick、Altruima、Jesse、Monroe、David、Tess、Lizzie、Patsy、Pony、Isaac、Lawrence、Cyn、Bo、Gia、Annette、Marius、Tbone、Jonathan、Karen、Ginsu、Yuko、Makiko、Thomas、Harry、Seth、Alexei、Brian、Guy、Runitai、Ethan、Data、Cornelius、Kenny、Swiss、Zero、Natria、Wendy、Stephen、Teeple、Thumper、Lucy、Dee、Mia、Liana、Warren、Branka、Aura、beez、Milo、Hermia、Red、Thrax、Joe、Sally、Magenta、Paul、Jose、Rejean、Henrik、Lexie、Amber、Logan、Xan、Nora、Morpheus、Donovan、Leyla、MichaelFrancis、Beast、Cube、Bucky、Joshua、Stryfe、Harmony、Teresa、Claudia、Walker、Glenn、Fritz、Fordak、June、Cleopetra、Jean、Ivy、Betsy、Roosevelt、Spike、Ken、Which、Tofu、Chiyo、Rob、Zee、dustin、George、Del、Matthew、Cat、Jacqui、Lightfoot、Adrian、Viola、Alfred、Noel、Irfan、Sunil、Yool、Rika、Jane、Xtreme、Frontier、a2、Neo、Siobhan、Yoz、Justin、Elle、Qarl、Benjamin、Isabel、Gulliver、Everett、Christopher、Izzy、Stephany、Garry、Sejong、Sean、Tobin、Iridium、Meta、Anthony、Jeremy、JP、Jake、Maurice、Madhavi、Leopard、Kyle、Joon、Kari、Bert、Belinda、Jon、Kristi、Bridie、Pramod、KJ、Socrates、Maria、Ivan、Aric、Yamasaki、Adreanne、Jay、MitchK、Ceren、Coco、Durl、Jenny、Periapse、Kartic、Storrs、Lotte、Sandy、Colossus、Zen、BigPapi、Brad、Pastrami、Kurz、Mani、Neuro、Jaime、MJ、Rowan、Sgt、Elvis、Gecko、Samuel、Sardonyx、Leo、Bryan、Niko、Soft、Poppy、Rachel、Aki、Angelo、Banzai、Alexa、Sue、CeeLo、Bender、CG、Gillian、Pelle、Nick、Echo、Zara、Christine、Shamiran、Emma、Blake、Keiko、Plexus、Joppa、Sidewinder、Erica、Ashlei、Twilight、Kristen、Brett、Q、Enus、Simon、Bevis、Kraft、Kip、Chandler、Ron、LauraP、Ram、KyleJM、Scouse、Prospero、Melissa、Marty、Nat、Hamilton、Kend、Lordan、Jimmy、Kosmo、Seraph、Green、Ekim、Wiggo、JT、Rome、Doris、Miz、Benoc、Whump、Trinity、Patch、Kate、TJ、Bao、Joohwan、Christy、Sofia、Matias、Cogsworth、Johan、Oreh、Cheah、Angela、Brandy、Mango、Lan、Aleks、Gloria、Heidy、Mitchell、Space、Colton、Bambers、Einstein、Maggie、Malbers、Rose、Winnie、Stella、Milton、Rothman、Niall、Marin、Allison、James、Katie、Dawn、Katt、Kalpana、Judy、Andrea、Ambroff、Infinity、Gail、Rico、Raymond、Yi、William、Christa、M、Teagan、Scout、Molly、Dante、Corr、Dynamike、Usi、Kaylee、Lil、Danica、Sascha、Kelv、Jacob、Nya、Rodney、Brandon、Elsie、Blondin、Grant、Katrin、Nyx、Gabriel、Locklainn、Claire、Devin、Minerva、Monty、Austin、Bradford、Si、Keira、H、Caitlin、Dita、Makai、Jennと、その他多数の人達によって作成されました。
-
- このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。 aaron23 decuir、Abra Miles、absolute balderdash、adelle fitzgerald、Aeron Kohime、Aki Shichiroji、Alger Meads、Alissa Sabre、AlwaysIcey Mapholisto、Arawn Spitteler、Aren Mandala、Arianna Wrigglesworth、Bagushii Kohime、Balpien Hammerer、Blinking2342 Blinker、byakuya runo、Capucchy Streeter、Chandra Jun、Coyote Pace、Crusher Soderstrom、Cummere Mayo、cyberrosa Rossini、Dael Ra、danana dodonpa、Darek Deluca、Davec Horsforth、django yifu、draco crane、Dre Dagostino、Ephyu Reino、etan quan、Fenrix Murakami、Fledhyris Proudhon、Fred Wardhani、Frederich Courier、garth fairchang、Gellan Glenelg、Geraldine Giha、GOLAN Eilde、gonzo joubert、Hachiro Yokosuka、Hampton Hax、harleywood guru、Hevenz Vansant、imnotgoing sideways、Jaden Giles、Jeanette Janus、Karl Dorance、keaton Akina、Khashai Steinbeck、KiPSOFT Tuqiri、kirstenlee Cinquetti、Kitty Barnett、Laurent Vesta、Lazure Ryba、Lima Vesperia、Linzi Bingyi、Lisa Lowe、LuDon Ninetails、Mark Rosenbaum、McCabe Maxsted、Michi Lumin、Midi Aeon、ml0rtd kit、Mo Eriksen、Morice Flanagan、Mysterion Aeon、Nad Gough、norgan torok、Pygar Bu、Qie Niangao、rachel corleone、Rado Arado、roberto salubrius、Royer Pessoa、samia bechir、Sasha Nurmi、Sean Heying、Selkit Diller、Shadow Pidgeon、simon kline、Smokie Ember、Soap Clawtooth、Strife Onizuka、Tal Chernov、Talan Hyun、tangletwigs fairymeadow、Tanya Spinotti、Tayra Dagostino、Teebone Aeon、Theremes Langdon、Thraxis Epsilon、tucor Capalini、Vasko Hawker、VenusMari Zapedzki、Vex Streeter、Viktoria Dovgal、Vincent Nacon、Viridian Exonar、Vivienne Schell、WarKirby Magojiro、Wilton Lundquist、Yukinoroh Kamachi、Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- 無断転写、複製、転載を禁じます。 詳細はlicenses.txtを参照してください。
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- 後回しにされた夢はどうなるの? --ラングストン・ヒューズ
-</f_translation>
-<f_old_trans>
-
- Second Life は、 Philip、 Tessa、 Andrew、 Cory、 Ben、 Bunny、 Char、 Charlie、 Colin、 Dan、 Daniel、 Doug、 Eric、 Hamlet、 Haney、 Hunter、 Ian、 Jeff、 Jim、 John、 Lee、 Mark、 Peter、 Phoenix、 Richard、 Robin、 Xenon、 Steve、 Tanya、 Eddie、 Frank、 Bruce、 Aaron、 Alice、 Bob、 Debra、 Eileen、 Helen、 Janet、 Louie、 Leviathania、 Stefan、 Ray、 Kevin、 Tom、 Mikeb、 MikeT、 Burgess、 Elena、 Tracy、 BillTodd、 Ryan、 Zach、 Sarah、 Nova、 Otakon、 Tim、 Stephanie、 Michael、 Evan、 Nicolas、 Catherine、 Rachelle、 Dave、 Holly、 Bub、 Kelly、 Magellan、 Ramzi、 Don、 Sabin、 Jill、 Rheya、 DanceStar、 Jeska、 Hungry、 Torley、 Kona、 Callum、 Charity、 Ventrella、 Jack、 Uncle、 Vektor、 Iris、 Chris、 Nicole、 Mick、 Reuben、 Blue、 Babbage、 Yedwab、 Deana、 Lauren、 Brent、 Pathfinder、 Chadrick、 Altruima、 Jesse、 Monroe、 David、 Tess、 Lizzie、 Patsy、 Pony、 Isaac、 Lawrence、 Cyn、 Bo、 Gia、 Annette、 Marius、 Tbone、 Jonathan、 Karen、 Ginsu、 Yuko、 Makiko、 Thomas、 Harry、 Seth、 Alexei、 Brian、 Guy、 Runitai、 Ethan、 Data、 Cornelius、 Kenny、 Swiss、 Zero、 Natria、 Wendy、 Stephen、 Teeple、 Thumper、 Lucy、 Dee、 Mia、 Liana、 Warren、 Branka、 Aura、 beez、 Milo、 Hermia、 Red、 Thrax、 Joe、 Sally、 Magenta、 Paul、 Jose、 Rejean、 Henrik、 Lexie、 Amber、 Logan、 Xan、 Nora、 Morpheus、 Donovan、 Leyla、 MichaelFrancis、 Beast、 Cube、 Bucky、 Joshua、 Stryfe、 Harmony、 Teresa、 Claudia、 Walker、 Glenn、 Fritz、 Fordak、 June、 Cleopetra、 Jean、 Ivy、 Betsy、 Roosevelt、 Spike、 Ken、 Which、 Tofu、 Chiyo、 Rob、 Zee、 dustin、 George、 Del、 Matthew、 Cat、 Jacqui、 Lightfoot、 Adrian、 Viola、 Alfred、 Noel、 Irfan、 Sunil、 Yool、 Rika、 Jane、 Xtreme、 Frontier、 a2、 Neo、 Siobhan、 Yoz、 Justin、 Elle、 Qarl、 Benjamin、 Isabel、 Gulliver、 Everett、 Christopher、 Izzy、 Stephany、 Garry、 Sejong、 Sean、 Tobin、 Iridium、 Meta、 Anthony、 Jeremy、 JP、 Jake、 Maurice、 Madhavi、 Leopard、 Kyle、 Joon、 Kari、 Bert、 Belinda、 Jon、 Kristi、 Bridie、 Pramod、 KJ、 Socrates、 Maria、 Ivan、 Aric、 Yamasaki、 Adreanne、 Jay、 MitchK、 Ceren、 Coco、 Durl、 Jenny、 Periapse、 Kartic、 Storrs、 Lotte、 Sandy、 Colossus、 Zen、 BigPapi、 Brad、 Pastrami、 Kurz、 Mani、 Neuro、 Jaime、 MJ、 Rowan、 Sgt、 Elvis、 Gecko、 Samuel、 Sardonyx、 Leo、 Bryan、 Niko、 Soft、 Poppy、 Rachel、 Aki、 Angelo、 Banzai、 Alexa、 Sue、 CeeLo、 Bender、 CG、 Gillian、 Pelle、 Nick、 Echo、 Zara、 Christine、 Shamiran、 Emma、 Blake、 Keiko、 Plexus、 Joppa、 Sidewinder、 Erica、 Ashlei、 Twilight、 Kristen、 Brett、 Q、 Enus、 Simon、 Bevis、 Kraft、 Kip、 Chandler、 Ron、 LauraP、 Ram、 KyleJM、 Scouse、 Prospero、 Melissa、 Marty、 Nat、 Hamilton、 Kend、 Lordan、 Jimmy、 Kosmo、 Seraph、 Green、 Ekim、 Wiggo、 JT、 Rome、 Doris、 Miz、 Benoc、 Whump、 Trinity、 Patch、 Kate、 TJ、 Bao、 Joohwan、 Christy、 Sofia、 Matias、 Cogsworth、 Johan、 Oreh、 Cheah、 Angela、 Brandy、 Mango、 Lan、 Aleks、 Gloria、 Heidy、 Mitchell、 Space、 Colton、 Bambers、 Einstein、 Maggie、 Malbers、 Rose、 Winnie、 Stella、 Milton、 Rothman、 Niall、 Marin、 Allison、 James、 Katie、 Dawn、 Katt、 Kalpana、 Judy、 Andrea、 Ambroff、 Infinity、 Gail、 Rico、 Raymond、 Yi、 William、 Christa、 M、 Teagan、 Scout、 Molly、 Dante、 Corr、 Dynamike、 Usi、 Kaylee、 Lil、 Danica、 Sascha、 Kelv、 Jacob、 Nya、 Rodney、 Brandon、 Elsie、 Blondin、 Grant、 Katrin、 Nyx、 Gabriel、 Locklainn、 Claire、 Devin、 Minerva、 Monty、 Austin、 Bradford、 Si、 Keira、 H、 Caitlin、 Dita、 Makai、 Jenn と、その他多数の人達によって作成されました。
-
-このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。aaron23 decuir、 Abra Miles、 absolute balderdash、 adelle fitzgerald、 Aeron Kohime、 Aki Shichiroji、 Alger Meads、 Alissa Sabre、 AlwaysIcey Mapholisto、 Arawn Spitteler、 Aren Mandala、 Arianna Wrigglesworth、 Bagushii Kohime、 Balpien Hammerer、 Blinking2342 Blinker、 byakuya runo、 Capucchy Streeter、 Chandra Jun、 Coyote Pace、 Crusher Soderstrom、 Cummere Mayo、 cyberrosa Rossini、 Dael Ra、 danana dodonpa、 Darek Deluca、 Davec Horsforth、 django yifu、 draco crane、 Dre Dagostino、 Ephyu Reino、 etan quan、 Fenrix Murakami、 Fledhyris Proudhon、 Fred Wardhani、 Frederich Courier、 garth fairchang、 Gellan Glenelg、 Geraldine Giha、 GOLAN Eilde、 gonzo joubert、 Hachiro Yokosuka、 Hampton Hax、 harleywood guru、 Hevenz Vansant、 imnotgoing sideways、 Jaden Giles、 Jeanette Janus、 Karl Dorance、 keaton Akina、 Khashai Steinbeck、 KiPSOFT Tuqiri、 kirstenlee Cinquetti、 Kitty Barnett、 Laurent Vesta、 Lazure Ryba、 Lima Vesperia、 Linzi Bingyi、 Lisa Lowe、 LuDon Ninetails、 Mark Rosenbaum、 McCabe Maxsted、 Michi Lumin、 Midi Aeon、 ml0rtd kit、 Mo Eriksen、 Morice Flanagan、 Mysterion Aeon、 Nad Gough、 norgan torok、 Pygar Bu、 Qie Niangao、 rachel corleone、 Rado Arado、 roberto salubrius、 Royer Pessoa、 samia bechir、 Sasha Nurmi、 Sean Heying、 Selkit Diller、 Shadow Pidgeon、 simon kline、 Smokie Ember、 Soap Clawtooth、 Strife Onizuka、 Tal Chernov、 Talan Hyun、 tangletwigs fairymeadow、 Tanya Spinotti、 Tayra Dagostino、 Teebone Aeon、 Theremes Langdon、 Thraxis Epsilon、 tucor Capalini、 Vasko Hawker、 VenusMari Zapedzki、 Vex Streeter、 Viktoria Dovgal、 Vincent Nacon、 Viridian Exonar、 Vivienne Schell、 WarKirby Magojiro、 Wilton Lundquist、 Yukinoroh Kamachi、 Zyzzy Zarf
-
-3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
-無断複写・転載を禁じます。詳細はlicenses.txtを参照してください。
-
-Voice chat Audio coding:Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)
-
-
-しあわせはあったかい子犬-- チャールズ・M・シュルツ
-
-</f_old_trans>
-</string>
-</strings>
diff --git a/indra/newview/skins/default/xui/ja/need_to_translate.xml b/indra/newview/skins/default/xui/ja/need_to_translate.xml
deleted file mode 100644
index 35c56fd..0000000
--- a/indra/newview/skins/default/xui/ja/need_to_translate.xml
+++ /dev/null
@@ -1,1551 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<strings>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//AddFriend/editline</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Would you be my friend?
- </e_new>
-<f_old_trans/>
-<f_translation>
- フレンドになっていただけますか?
- </f_translation>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//EstateObjectReturn/message</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
- Are you sure you want to return objects owned by
-[USER_NAME] ?
-
-</e_new>
-<f_old_trans/>
-<f_translation>
- [USER_NAME]が所有しているオブジェクトを返却しますか?
- </f_translation>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//EstateObjectReturn/Return</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- OK
- </e_new>
-<f_old_trans/>
-<f_translation>
- OK
- </f_translation>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//EstateObjectReturn/Cancel</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Cancel
- </e_new>
-<f_old_trans/>
-<f_translation>
- キャンセル
- </f_translation>
-</string>
-<string>
-<a_file>floater_about_land.xml</a_file>
-<b_path>/floaterland/landtab/land_general_panel/no_selection_text</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
- No parcel selected.
-Go to World menu > About Land or select another parcel to show its details.
-
-</e_new>
-<f_old_trans/>
-<f_translation>
-
- 区画が選定されていません。
-[世界]メニュー>[土地情報]に進むか、別の区画を選択して、詳細を表示します。
-
-</f_translation>
-</string>
-<string>
-<a_file>floater_instant_message.xml</a_file>
-<b_path>/im_floater/inventory_item_offered</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Inventory item offered
- </e_new>
-<f_old_trans/>
-<f_translation>
- 贈られた持ち物アイテム
- </f_translation>
-</string>
-<string>
-<a_file>floater_live_lsleditor.xml</a_file>
-<b_path>/script ed float/mono</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Mono</e_new>
-<f_old_trans/>
-<f_translation>モノ</f_translation>
-<f_old_trans/>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak</b_path>
-<c_attribute>title</c_attribute>
-<d_old/>
-<e_new>Memory Leaking Simulation</e_new>
-<f_old_trans/>
-<f_translation>メモリ・リーク・シミュレーション</f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/leak_speed</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Leaking Speed (bytes per frame):</e_new>
-<f_old_trans/>
-<f_translation>リークスピード(1フレームごとのバイト数):</f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/max_leak</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Max Leaked Memory (MB):</e_new>
-<f_old_trans/>
-<f_translation>リークした最大メモリ数(MB)：</f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/total_leaked_label</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Current leaked memory: [SIZE] KB
- </e_new>
-<f_old_trans/>
-<f_translation>
- 現在のリークメモリサイズ： [SIZE] KB
- </f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/note_label_1</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- [NOTE1]
- </e_new>
-<f_old_trans/>
-<f_translation>
- [NOTE1]
- </f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/note_label_2</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- [NOTE2]
- </e_new>
-<f_old_trans/>
-<f_translation>
- [NOTE2]
- </f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/start_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Start</e_new>
-<f_old_trans/>
-<f_translation>開始</f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/stop_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Stop</e_new>
-<f_old_trans/>
-<f_translation>停止</f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/release_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Release</e_new>
-<f_old_trans/>
-<f_translation>解放</f_translation>
-</string>
-<string>
-<a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/close_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Close</e_new>
-<f_old_trans/>
-<f_translation>閉じる</f_translation>
-</string>
-<string>
-<a_file>floater_postcard.xml</a_file>
-<b_path>/Postcard/upload_message</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- "Sending..."
- </e_new>
-<f_old_trans/>
-<f_translation>
- "送信中..."
- </f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Select_category</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Select category
-</e_new>
-<f_old_trans/>
-<f_translation>
-カテゴリーを選択
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Age__Age_play</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Age > Age play
-</e_new>
-<f_old_trans/>
-<f_translation>
-年齢>年齢偽証
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Age__Adult_resident_on_Teen_Second_Life</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Age > Adult resident on Teen Second Life
-</e_new>
-<f_old_trans/>
-<f_translation>
-年齢>成人の住人がTeen Second Life上にいる
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Age__Underage_resident_on_Adult_Second_Life</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Age > Underage resident on Adult Second Life
-</e_new>
-<f_old_trans/>
-<f_translation>
-年齢>未成年の住人がAdult Second Life上にいる
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Assault__Combat_sandbox___unsafe_area</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Assault > Combat sandbox / unsafe area
-</e_new>
-<f_old_trans/>
-<f_translation>
-攻撃>コンバット・サンドボックス/危険なエリア
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Assault__Safe_area</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Assault > Safe area
-</e_new>
-<f_old_trans/>
-<f_translation>
-攻撃>安全なエリア
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Assault__Weapons_testing_sandbox</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Assault > Weapons testing sandbox
-</e_new>
-<f_old_trans/>
-<f_translation>
-攻撃>武器テスト用サンドボックス
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Copyright_or_intellectual_property_violation</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Copyright or intellectual property violation
-</e_new>
-<f_old_trans/>
-<f_translation>
-著作権または知的所有権に関する違反
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Commerce__Failure_to_deliver_product_or_service</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Commerce > Failure to deliver product or service
-</e_new>
-<f_old_trans/>
-<f_translation>
-商取引>製品またはサービスの提供が行われない
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disclosure__First_Life_information</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Disclosure > First life information
-</e_new>
-<f_old_trans/>
-<f_translation>
-開示>1st Lifeの情報
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disclosure__Remotely_monitoring chat</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Disclosure > Remotely monitoring chat
-</e_new>
-<f_old_trans/>
-<f_translation>
-開示>離れたところからチャットをモニターしている
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disclosure__Second_Life_information_chat_IMs</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Disclosure > Second Life information/chat/IMs
-</e_new>
-<f_old_trans/>
-<f_translation>
-開示>Second Lifeの情報/チャット/IM
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Unfair_use_of_region_resources</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
-Disturbing the peace > Unfair use of region resources
-</e_new>
-<f_old_trans/>
-<f_translation>
-平穏を乱す行為>地域リソースの使用が不公平
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Excessive_scripted_objects</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
-Disturbing the peace > Excessive scripted objects
-</e_new>
-<f_old_trans/>
-<f_translation>
-平穏を乱す行為>スクリプト・オブジェクトの乱用
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Object_littering</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Disturbing the peace > Object littering
-</e_new>
-<f_old_trans/>
-<f_translation>
-平穏を乱す行為>オブジェクトの捨て置き
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Repetitive_spam</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Disturbing the peace > Repetitive spam
-</e_new>
-<f_old_trans/>
-<f_translation>
-平穏を乱す行為>繰り返しスパム
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Unwanted_advert_spam</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Disturbing the peace > Unwanted advert spam
-</e_new>
-<f_old_trans/>
-<f_translation>
-平穏を乱す行為>不要な広告スパム
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__L$</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Fraud > L$
-</e_new>
-<f_old_trans/>
-<f_translation>
-詐欺> L$
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__Land</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Fraud > Land
-</e_new>
-<f_old_trans/>
-<f_translation>
-詐欺>土地
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__Pyramid_scheme_or_chain_letter</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Fraud > Pyramid scheme or chain letter
-</e_new>
-<f_old_trans/>
-<f_translation>
-詐欺>マルチ商法またはチェーン・メール
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__US$</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Fraud > US$
-</e_new>
-<f_old_trans/>
-<f_translation>
-詐欺> US$
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Advert_farms___visual_spam</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Harassment > Advert farms / visual spam
-</e_new>
-<f_old_trans/>
-<f_translation>
-嫌がらせ>広告委託/視覚的なスパム
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Defaming_individuals_or_groups</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Harassment > Defaming individuals or groups
-</e_new>
-<f_old_trans/>
-<f_translation>
-嫌がらせ>個人またはグループの中傷
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Impeding_movement</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Harassment > Impeding movement
-</e_new>
-<f_old_trans/>
-<f_translation>
-嫌がらせ>移動の妨害
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Sexual_harassment</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Harassment > Sexual harassment
-</e_new>
-<f_old_trans/>
-<f_translation>
-嫌がらせ>性的な嫌がらせ
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Solicting_inciting_others_to_violate_ToS</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
-Harassment > Solicting/inciting others to violate ToS
-</e_new>
-<f_old_trans/>
-<f_translation>
-嫌がらせ>利用規約（ToS）に違反する行為を行うよう他者を勧誘/扇動
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Verbal_abuse</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Harassment > Verbal abuse
-</e_new>
-<f_old_trans/>
-<f_translation>
-嫌がらせ>暴言
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Broadly_offensive_content_or_conduct</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Indecency > Broadly offensive content or conduct
-</e_new>
-<f_old_trans/>
-<f_translation>
-わいせつ>著しく不快であると見なされるコンテンツまたは行為
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Broadly_visible_mature_content</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Indecency > Broadly visible mature content
-</e_new>
-<f_old_trans/>
-<f_translation>
-わいせつ>あからさまに見せつけられる成人向けと見なされるコンテンツ
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Inappropriate_avatar_name</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Indecency > Inappropriate avatar name
-</e_new>
-<f_old_trans/>
-<f_translation>
-わいせつ>不適切なアバター名
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Mature_content_in_PG_region</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Indecency > Mature content in PG region
-</e_new>
-<f_old_trans/>
-<f_translation>
-わいせつ>PG地域で成人向けと見なされるコンテンツ
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Abuse_of_sandbox_resources</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Land > Abuse of sandbox resources
-</e_new>
-<f_old_trans/>
-<f_translation>
-土地>サンドボックス・リソースの乱用
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Encroachment__Objects_textures</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Land > Encroachment > Objects/textures
-</e_new>
-<f_old_trans/>
-<f_translation>
-土地>不法侵入>オブジェクト/テクスチャー
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Encroachment__Particles</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Land > Encroachment > Particles
-</e_new>
-<f_old_trans/>
-<f_translation>
-土地>不法侵入>パーティクル
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Encroachment__Trees_plants</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Land > Encroachment > Trees/plants
-</e_new>
-<f_old_trans/>
-<f_translation>
-土地>不法侵入>樹木/植物
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Trademark_violation</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Trademark violation
-</e_new>
-<f_old_trans/>
-<f_translation>
-商標権の侵害
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Wagering_gambling</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-Wagering/gambling
-</e_new>
-<f_old_trans/>
-<f_translation>
-賭け/ギャンブル
-</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/omit_abuser_name</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Don't know abuser's name</e_new>
-<f_old_trans/>
-<f_translation>嫌がらせをした人の名前が不明</f_translation>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/omit_abuser_name</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>
-Check this if you are unable to provide the abuser's name
-</e_new>
-<f_old_trans/>
-<f_translation>嫌がらせをした人の名前を提供できないかについて、これを確認</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox</b_path>
-<c_attribute>title</c_attribute>
-<d_old/>
-<e_new/>
-<f_old_trans/>
-<f_translation/>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//chat_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new/>
-<f_old_trans/>
-<f_translation/>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//chat_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>Show Chat Bar. (Enter)</e_new>
-<f_old_trans/>
-<f_translation>チャット・バーを表示 （エンター・キー）</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//communicate_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Communicate</e_new>
-<f_old_trans/>
-<f_translation>コミュニケーション</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//communicate_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>Communicate with your Friends and Groups.</e_new>
-<f_old_trans/>
-<f_translation>フレンドやグループとコミュニケーション</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//fly_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Fly</e_new>
-<f_old_trans/>
-<f_translation>飛行</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//fly_btn</b_path>
-<c_attribute>label_selected</c_attribute>
-<d_old/>
-<e_new>Stop Flying</e_new>
-<f_old_trans/>
-<f_translation>飛行を停止</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//fly_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>
-Start flying. Use E/C or PgUp/PgDn to fly up and down.
-</e_new>
-<f_old_trans/>
-<f_translation>飛行開始： EキーまたはPageUpキーで上昇、CキーまたはPageDownキーで下降</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_unfocused_floater/titlebar_focused</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Unfocused</e_new>
-<f_old_trans/>
-<f_translation>アンフォーカス</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_unfocused_floater/combo_box_1</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Combo Box</e_new>
-<f_old_trans/>
-<f_translation>コンボ・ボックス</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_unfocused_floater/Chat History Editor</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Text</e_new>
-<f_old_trans/>
-<f_translation>テキスト</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/titlebar_focused</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Focused</e_new>
-<f_old_trans/>
-<f_translation>フォーカス</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Focused</e_new>
-<f_old_trans/>
-<f_translation>フォーカス</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/SliderTestName</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Slider</e_new>
-<f_old_trans/>
-<f_translation>スライダー</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/check_box_test_1</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>True</e_new>
-<f_old_trans/>
-<f_translation>正</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/check_box_test_2</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>False</e_new>
-<f_old_trans/>
-<f_translation>不</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/Chat History Editor</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Chat Text</e_new>
-<f_old_trans/>
-<f_translation>チャット・テキスト</f_translation>
-</string>
-<string>
-<a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_2</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Unfocused</e_new>
-<f_old_trans/>
-<f_translation>アンフォーカス</f_translation>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/save_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>Save image to a file</e_new>
-<f_old_trans/>
-<f_translation>画像をファイルに保存</f_translation>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/format_label</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Format
- </e_new>
-<f_old_trans/>
-<f_translation>
- フォーマット
- </f_translation>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Format</e_new>
-<f_old_trans/>
-<f_translation>フォーマット</f_translation>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo/PNG</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- PNG
- </e_new>
-<f_old_trans/>
-<f_translation>
- PNG
- </f_translation>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo/JPEG</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- JPEG
- </e_new>
-<f_old_trans/>
-<f_translation>
- JPEG
- </f_translation>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo/BMP</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- BMP
- </e_new>
-<f_old_trans/>
-<f_translation>
- BMP
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Strength:</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Strength:
- </e_new>
-<f_old_trans/>
-<f_translation>
- 強度:
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Price: L$
- </e_new>
-<f_old_trans/>
-<f_translation>
- 価格： L$
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Default</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Price: L$
- </e_new>
-<f_old_trans/>
-<f_translation>
- 価格： L$
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Total</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Total Price: L$
- </e_new>
-<f_old_trans/>
-<f_translation>
- 合計価格: L$
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Per Unit</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Price Per: L$
- </e_new>
-<f_old_trans/>
-<f_translation>
- 単価： L$
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Mixed</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Mixed Price
- </e_new>
-<f_old_trans/>
-<f_translation>
- 混合価格
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Sale Mixed</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Mixed Sale
- </e_new>
-<f_old_trans/>
-<f_translation>
- 混合販売
- </f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt mirror control</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Mirror</e_new>
-<f_old_trans/>
-<f_translation>ミラー</f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt mirror control</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>Flips sculpted prim along the X axis.</e_new>
-<f_old_trans/>
-<f_translation>スカルプトされたプリムをX軸上で反転</f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt invert control</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Inside-out</e_new>
-<f_old_trans/>
-<f_translation>裏返し</f_translation>
-</string>
-<string>
-<a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt invert control</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>
-Inverts the sculpted prims normals, making it appear inside-out.
-</e_new>
-<f_old_trans/>
-<f_translation>スカルプトされたプリムのノーマルを逆転させ、裏返しに表示</f_translation>
-</string>
-<string>
-<a_file>floater_top_objects.xml</a_file>
-<b_path>/top_objects/objects_list/time</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Time</e_new>
-<f_old_trans/>
-<f_translation>時間</f_translation>
-</string>
-<string>
-<a_file>floater_tos.xml</a_file>
-<b_path>/modal container/agree_chk</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>I Agree to the Terms of Service</e_new>
-<f_old_trans/>
-<f_translation>利用規約に同意します</f_translation>
-</string>
-<string>
-<a_file>menu_viewer.xml</a_file>
-<b_path>/Main Menu/World/Release Keys</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Release Keys</e_new>
-<f_old_trans/>
-<f_translation>キーを解除</f_translation>
-</string>
-<string>
-<a_file>menu_viewer.xml</a_file>
-<b_path>/Main Menu/Tools/Recompile Scripts in Selection/Mono</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Mono</e_new>
-<f_old_trans/>
-<f_translation>モノ</f_translation>
-</string>
-<string>
-<a_file>menu_viewer.xml</a_file>
-<b_path>/Main Menu/Tools/Recompile Scripts in Selection/LSL</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>LSL</e_new>
-<f_old_trans/>
-<f_translation>LSL</f_translation>
-</string>
-<string>
-<a_file>mime_types.xml</a_file>
-<b_path>/default/"application/smil"/"application/smil_label"</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
- Synchronized Multimedia Integration Language (SMIL)
-
-</e_new>
-<f_old_trans/>
-<f_translation>
- 同期マルチメディア統合言語(SMIL)
- </f_translation>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//OfferFriendshipNoMessage/message</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-
- [NAME] is offering friendship.
-
-(By default, you will be able to
-see each other's online status.)
-
-</e_new>
-<f_old_trans/>
-<f_translation>
-
- [NAME]は、フレンドシップを贈っています。
-
-(デフォルトでお互いのオンライン・ステータスを見ることができるようになります。)
-
-</f_translation>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//OfferFriendshipNoMessage/Accept</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Accept
- </e_new>
-<f_old_trans/>
-<f_translation>
- 受け入れる
- </f_translation>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//OfferFriendshipNoMessage/Decline</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Decline
- </e_new>
-<f_old_trans/>
-<f_translation>
- 拒否
- </f_translation>
-</string>
-<string>
-<a_file>panel_login.xml</a_file>
-<b_path>/panel_login/create_new_account_text</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Create new account.
- </e_new>
-<f_old_trans/>
-<f_translation>新しいアカウントを作成します。
- </f_translation>
-</string>
-<string>
-<a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/user</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>You</e_new>
-<f_old_trans/>
-<f_translation>貴方</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/agent</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Others</e_new>
-<f_old_trans/>
-<f_translation>その他</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/play_typing_animation</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Play typing animation</e_new>
-<f_old_trans/>
-<f_translation>タイピング動作のアニメーションを再生</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_general.xml</a_file>
-<b_path>/general_panel/language_is_public</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Share language with objects</e_new>
-<f_old_trans/>
-<f_translation>言語をオブジェクトと共有</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_general.xml</a_file>
-<b_path>/general_panel/language_is_public</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>
-This lets in-world objects know your preferred language.
-</e_new>
-<f_old_trans/>
-<f_translation>優先言語をインワールドのオブジェクトが認識する</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_graphics1.xml</a_file>
-<b_path>/Display panel/QualityPerformanceSelection</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new/>
-<f_old_trans/>
-<f_translation/>
-</string>
-<string>
-<a_file>panel_preferences_im.xml</a_file>
-<b_path>/im/friends_online_notify_checkbox</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Show Online Friend Notifications</e_new>
-<f_old_trans/>
-<f_translation>オンライン・フレンド通知を表示</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_popups.xml</a_file>
-<b_path>/popups/show_in_inventory</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>
-Automatically show newly accepted objects in inventory
-</e_new>
-<f_old_trans/>
-<f_translation>新たに受け取ったオブジェクトを持ち物に自動的に表示</f_translation>
-</string>
-<string>
-<a_file>panel_preferences_skins.xml</a_file>
-<b_path>/Skins panel/classic_preview</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new/>
-<f_old_trans/>
-<f_translation/>
-</string>
-<string>
-<a_file>panel_preferences_skins.xml</a_file>
-<b_path>/Skins panel/silver_preview</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new/>
-<f_old_trans/>
-<f_translation/>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/target_avatar_name</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- (none)
- </e_new>
-<f_old_trans/>
-<f_translation>
- (なし)
- </f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_scripts</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Return only those objects with scripts</e_new>
-<f_old_trans/>
-<f_translation>スクリプトのあるオブジェクトのみを返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_scripts</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>Return only objects which have scripts.</e_new>
-<f_old_trans/>
-<f_translation>スクリプトがあるオブジェクトのみを返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_other_land</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Return only those objects on someone else's land</e_new>
-<f_old_trans/>
-<f_translation>他人の土地にあるオブジェクトのみを返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_other_land</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>
-Return only objects which are on land belonging to someone else
-</e_new>
-<f_old_trans/>
-<f_translation>他人に属する土地にあるオブジェクトのみを返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_estate_wide</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Return objects in every region of this estate</e_new>
-<f_old_trans/>
-<f_translation>この不動産の各地域のオブジェクトを返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_estate_wide</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old/>
-<e_new>
-Return objects in all of the regions that make up this estate
-</e_new>
-<f_old_trans/>
-<f_translation>この不動産に含まれているすべての地域のオブジェクトを返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old/>
-<e_new>Return</e_new>
-<f_old_trans/>
-<f_translation>返却</f_translation>
-</string>
-<string>
-<a_file>panel_region_estate.xml</a_file>
-<b_path>/Estate/abuse_email_text</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
- Abuse email address:
- </e_new>
-<f_old_trans/>
-<f_translation>
- 嫌がらせに関するメール先:
- </f_translation>
-</string>
-<string>
-<a_file>panel_region_estate.xml</a_file>
-<b_path>/Estate/email_unsupported</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Feature unsupported</e_new>
-<f_old_trans/>
-<f_translation>サポートされていない機能</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old/>
-<e_new>
-These Abilities include powers to allow or restrict access to group chat sessions and group voice chat.
-</e_new>
-<f_old_trans/>
-<f_translation>
-これらのアビリティには、グループ・チャット・セッションやグループ・ボイス・チャットへのアクセスの許可や制限の権限が含まれます。
-</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat/join group chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old/>
-<e_new>Join Group Chat</e_new>
-<f_old_trans/>
-<f_translation>グループ・チャットに参加する</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat/join group chat</b_path>
-<c_attribute>longdescription</c_attribute>
-<d_old/>
-<e_new>
-Members in a Role with this Ability can join group chat sessions, for text and voice.
-</e_new>
-<f_old_trans/>
-<f_translation>
-このアビリティを持つ役割のメンバーは、グループ・チャット・セッションにテキストおよびボイスで参加できます。
-</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat/join voice chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old/>
-<e_new>Join Group Voice Chat</e_new>
-<f_old_trans/>
-<f_translation>グループ・ボイス・チャットに参加する</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat/join voice chat</b_path>
-<c_attribute>longdescription</c_attribute>
-<d_old/>
-<e_new>
-Members in a Role with this Ability can join group voice chat sessions. NOTE: The Join Group Chat ability is required to access the voice chat session.
-</e_new>
-<f_old_trans/>
-<f_translation>
-このアビリティを持つ役割のメンバーは、グループ・ボイス・チャット・セッションに参加できます。 注： ボイス・チャット・セッションにアクセスするには、グループ・チャットに参加するアビリティが必要です。
-</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat/moderate group chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old/>
-<e_new>Moderate Group Chat</e_new>
-<f_old_trans/>
-<f_translation>グループ・チャットを管理する</f_translation>
-</string>
-<string>
-<a_file>role_actions.xml</a_file>
-<b_path>//Chat/moderate group chat</b_path>
-<c_attribute>longdescription</c_attribute>
-<d_old/>
-<e_new>
-Members in a Role with this Ability can control access and participation in group voice and text chat sessions.
-</e_new>
-<f_old_trans/>
-<f_translation>
-このアビリティを持つ役割のメンバーは、グループ・ボイス・チャット・セッションおよびグループ・テキスト・チャット・セッションへのアクセスや参加をコントロールすることができます。
-</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//LoginInitializingMultimedia</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Initializing multimedia...</e_new>
-<f_old_trans/>
-<f_translation>マルチメディアを初期化しています...</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//AgentLostConnection</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>
-This region may be experiencing trouble. Please check your connection to the Internet.
-</e_new>
-<f_old_trans/>
-<f_translation>この地域には、問題が発生している可能性があります。 インターネット接続を確認してください。</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//TooltipMustSingleDrop</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Only a single item can be dragged here</e_new>
-<f_old_trans/>
-<f_translation>1つのアイテムのみをここにドラッグできます</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//ReleaseNotes</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Release Notes</e_new>
-<f_old_trans/>
-<f_translation>リリースノート</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//texture_loading</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Loading...</e_new>
-<f_old_trans/>
-<f_translation>ロード中...</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//worldmap_offline</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>Offline</e_new>
-<f_old_trans/>
-<f_translation>オフライン</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//whisper</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>whispers:</e_new>
-<f_old_trans/>
-<f_translation>ささやく:</f_translation>
-</string>
-<string>
-<a_file>strings.xml</a_file>
-<b_path>//shout</b_path>
-<c_attribute/>
-<d_old/>
-<e_new>shouts:</e_new>
-<f_old_trans/>
-<f_translation>叫ぶ:</f_translation>
-</string>
-</strings>
diff --git a/indra/newview/skins/default/xui/ja/need_to_update.xml b/indra/newview/skins/default/xui/ja/need_to_update.xml
deleted file mode 100644
index e7ad3f0..0000000
--- a/indra/newview/skins/default/xui/ja/need_to_update.xml
+++ /dev/null
@@ -1,759 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<strings>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//ClickPublishHelpAvatar/message</b_path>
-<c_attribute/>
-<d_old>
-
- Selecting "Show in Search" will show:
- - my profile in search results
- - a link to my profile in public group pages
-
-</d_old>
-<e_new>
-
-Selecting "Show in Search" will show:
-- my profile in search results
-- a link to my profile in public group pages
-
-</e_new>
-<f_translation>
-
-[検索に表示]を選択すると表示:
-- 検索結果における自分のプロフィール
-- パブリック・グループ・ページにおける自分のプロフィールへのリンク
-
-</f_translation>
-<f_old_trans>
-
- 「検索に表示」を選択すると表示:
- - 検索結果における自分のプロフィール
- - パブリックグループページにおける自分のプロフィールへのリンク
-
-</f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//PromptMissingSubjMsg/message</b_path>
-<c_attribute/>
-<d_old>
-
- Send postcard with the default subject or message?
-
-</d_old>
-<e_new>
-
- Email snapshot with the default subject or message?
-
-</e_new>
-<f_translation>
- デフォルトの件名またはメッセージを付けて、スナップショットを送信しますか？
- </f_translation>
-<f_old_trans>
- デフォルトの件名またはメッセージを付けて、ポストカードを送信しますか？
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//ErrorUploadingPostcard/message</b_path>
-<c_attribute/>
-<d_old>
-
- There was a problem uploading a postcard due to the following reason: [REASON]
-
-</d_old>
-<e_new>
-
- There was a problem sending a snapshot due to the following reason: [REASON]
-
-</e_new>
-<f_translation>
- 次の理由で、スナップショットの送信時に問題が起こりました： [REASON]
- </f_translation>
-<f_old_trans>
- 次の理由で、ポストカードのアップロード時に問題が起こりました。 [REASON]
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//MustHaveAccountToLogIn/message</b_path>
-<c_attribute/>
-<d_old>
-
- You must have an account to connect to [SECOND_LIFE].
-Go to www.secondlife.com to create an account?
-
-</d_old>
-<e_new>
-
-Oops! Something was left blank.
-You need to enter both the First and Last name of your avatar.
-
-You need an account to enter [SECOND_LIFE]. Would you like to create one now?
-</e_new>
-<f_translation>
-
-おっと! 記入漏れがありますよ。
-アバターのファーストネームとラストネームの両方を入力する必要があります。
-
-[SECOND_LIFE]に入るには、アカウントが必要です。 アカウントを作成しますか?
-</f_translation>
-<f_old_trans>
-
- [SECOND_LIFE]に接続するにはアカウントが必要です。
-アカウントを作成するためにwww.secondlife.comを開きますか？
-
-</f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//MustHaveAccountToLogIn/OK</b_path>
-<c_attribute/>
-<d_old>
- OK
- </d_old>
-<e_new>
- Create a new account
- </e_new>
-<f_translation>
- 新しいアカウントを作成
- </f_translation>
-<f_old_trans>
- OK
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//MustHaveAccountToLogIn/Cancel</b_path>
-<c_attribute/>
-<d_old>
- Cancel
- </d_old>
-<e_new>
- Try again
- </e_new>
-<f_translation>
- もう一度試す
- </f_translation>
-<f_old_trans>
- 取り消し
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//ChangeSkin/message</b_path>
-<c_attribute/>
-<d_old>
-
- New skin will appear after you restart [SECOND_LIFE].
-
-</d_old>
-<e_new>
-
- The new skin will appear after you restart [SECOND_LIFE].
-
-</e_new>
-<f_translation>
- 新しいスキンは[SECOND_LIFE]を再起動すると現れます
- </f_translation>
-<f_old_trans>
- 新しいスキンは[SECOND_LIFE]を再起動すると現れます
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//CannotGiveCategory/message</b_path>
-<c_attribute/>
-<d_old>
-
- You do not have permission to transfer
- the selected folder.
-
-</d_old>
-<e_new>
-
- You do not have permission to transfer
-the selected folder.
-
-</e_new>
-<f_translation>
- 選択したフォルダを譲渡できる権限
-がありません
- </f_translation>
-<f_old_trans>
- 選択したフォルダを譲渡できる権限
- がありません。
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//CannotBuyLandNoRegion/message</b_path>
-<c_attribute/>
-<d_old>
-
- Unable to buy land:
- Cannot find the region this land is in.
-
-</d_old>
-<e_new>
-
- Unable to buy land:
-Cannot find the region this land is in.
-
-</e_new>
-<f_translation>
- 土地を購入できません：
-この土地がある地域を見つけることができません
- </f_translation>
-<f_old_trans>
- 土地を購入できません：
- この土地がある地域を見つけることができません。
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//YouHaveBeenLoggedOut/message</b_path>
-<c_attribute/>
-<d_old>
-
- You have been logged out of [SECOND_LIFE]:
-[MESSAGE]
-
-Click Continue to look at existing IM and chat.
-You will not be able to perform any other operations.
-Click Quit to exit [SECOND_LIFE] immediately.
-
-</d_old>
-<e_new>
-You have been logged out of [SECOND_LIFE]:
- [MESSAGE]
-You can still look at existing IM and chat by clicking 'View IM & Chat'. Otherwise, click 'Quit' to exit [SECOND_LIFE] immediately.
- </e_new>
-<f_translation>
-
-あなたは[SECOND_LIFE]からログアウトされました。
- [MESSAGE]
-[IMとチャットを表示]をクリックすると、現在あるIMとチャットを確認できます。 確認しない場合は、[終了]をクリックして、すぐに[SECOND_LIFE]を終了してください。
-
-</f_translation>
-<f_old_trans>
-
- あなたは[SECOND_LIFE]からログアウトされました：
-[MESSAGE]
-
-[続行]をクリックすると現在あるIMとチャットを確認できます。
-これ以外の操作はできません。
-[終了]をクリックして、すぐに[SECOND_LIFE]を終了してください。
-
-</f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//YouHaveBeenLoggedOut/Continue</b_path>
-<c_attribute/>
-<d_old>
- Continue
- </d_old>
-<e_new>
- View IM & Chat
- </e_new>
-<f_translation>
- IMとチャットを表示
- </f_translation>
-<f_old_trans>
- 続行
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//AddFriend/message</b_path>
-<c_attribute/>
-<d_old>
-
- Friends can give permissions to
-track each other on the map and
-receive online status updates.
-
-Offer friendship to [NAME]?
-
-</d_old>
-<e_new>
-
- Friends can give permissions to track each
-other on the map and receive online status updates.
-
-Offer friendship to [NAME]?
-
-</e_new>
-<f_translation>
-
- フレンド同士は、地図上でお互いを追跡し、
-オンライン・ステータスの更新情報を受信する権限を与え合うことができます。
-
-[NAME]とフレンド登録をしますか?
-
-</f_translation>
-<f_old_trans>
-
- フレンド同士は、地図上で互いを追跡し、
-オンライン・ステータスの更新情報を受信する
-権限を与え合うことができます。
-
-[NAME]とフレンド登録をしますか？
-
-</f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//ConfirmClearCookies/message</b_path>
-<c_attribute/>
-<d_old>
-
- Are you sure you want to clear
-your cookies?
-
-</d_old>
-<e_new>
-
- Are you sure you want to clear your cookies?
-
-</e_new>
-<f_translation>
- 本当にクッキーをクリアしますか?
- </f_translation>
-<f_old_trans>
- 本当にクッキーを
-クリアしますか？
- </f_old_trans>
-</string>
-<string>
-<a_file>alerts.xml</a_file>
-<b_path>//Cannot_Purchase_an_Attachment/message</b_path>
-<c_attribute/>
-<d_old>
-
- Items may not be purchased while
- they are part of an attachment.
-
-</d_old>
-<e_new>
-
- Items may not be purchased while
-they are part of an attachment.
-
-</e_new>
-<f_translation>
- アイテムが添付物の一部である間は、
-アイテムを購入できません。
- </f_translation>
-<f_old_trans>
- アイテムが添付物の一部である間は、
- アイテムを購入できません。
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_about_land.xml</a_file>
-<b_path>/floaterland/landtab/land_access_panel/estate_override</b_path>
-<c_attribute/>
-<d_old>
-
- One ore more of these options is set at the estate level
-
-</d_old>
-<e_new>
-
- One or more of these options is set at the estate level
-
-</e_new>
-<f_translation>
- 1つ以上のオプションが、不動産レベルで設定されています。
- </f_translation>
-<f_old_trans>
- 1つ以上のオプションが、不動産レベルで設定されています。
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_im.xml</a_file>
-<b_path>/im_floater/muted_message</b_path>
-<c_attribute/>
-<d_old>
- [FIRST] [LAST] is muted.
- </d_old>
-<e_new>
-
- You have muted this resident. Sending a message will automatically unmute them.
-
-</e_new>
-<f_translation>
-
- あなたはこの住人をミュートしています。 メッセージを送信すると、ミュートは自動的に解除されます。
-
-</f_translation>
-<f_old_trans>
- 住人はミュートされています。
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_postcard.xml</a_file>
-<b_path>/Postcard</b_path>
-<c_attribute>title</c_attribute>
-<d_old>Send Postcard</d_old>
-<e_new>Email Snapshot</e_new>
-<f_translation>スナップショットを電子メールで送信</f_translation>
-<f_old_trans>ポストカードを送る</f_old_trans>
-</string>
-<string>
-<a_file>floater_postcard.xml</a_file>
-<b_path>/Postcard/fine_print</b_path>
-<c_attribute/>
-<d_old>
-
- If your postcard recipient joins SL, you'll get a referral bonus.
-
-</d_old>
-<e_new>
-
- If your recipient joins SL, you'll get a referral bonus.
-
-</e_new>
-<f_translation>
- あなたの受信者がSLに参加すると、あなたは紹介ボーナスを受け取れます
- </f_translation>
-<f_old_trans>
- あなたのポストカードの受信者がSLに参加すると、あなたは紹介ボーナスを受
-け取ります。
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Intolerance</b_path>
-<c_attribute/>
-<d_old>
- Intolerance
- </d_old>
-<e_new>
-Intolerance
-</e_new>
-<f_translation>
-不寛容
-</f_translation>
-<f_old_trans>
- 非許容
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Other</b_path>
-<c_attribute/>
-<d_old>
- Other
- </d_old>
-<e_new>
-Other
-</e_new>
-<f_translation>
-その他
-</f_translation>
-<f_old_trans>
- その他
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/type_label</b_path>
-<c_attribute/>
-<d_old>
- What would you like to do?
- </d_old>
-<e_new>
- Snapshot destination
- </e_new>
-<f_translation>
- スナップショットの送り先
- </f_translation>
-<f_old_trans>
- 何をしたいですか？
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/snapshot_type_radio/postcard</b_path>
-<c_attribute/>
-<d_old>
- Send a postcard
- </d_old>
-<e_new>
- Send via email
- </e_new>
-<f_translation>
- 電子メールで送信
- </f_translation>
-<f_old_trans>
- ポストカード送信
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/snapshot_type_radio/texture</b_path>
-<c_attribute/>
-<d_old>
- Upload a snapshot
- </d_old>
-<e_new>
- Save to your inventory (L$10)
- </e_new>
-<f_translation>
- 持ち物に保存(L$10)
- </f_translation>
-<f_old_trans>
- アップロード
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/snapshot_type_radio/local</b_path>
-<c_attribute/>
-<d_old>
- Save snapshot to hard drive
- </d_old>
-<e_new>
- Save to your hard drive
- </e_new>
-<f_translation>
- ハードディスクに保存
- </f_translation>
-<f_old_trans>
- ハード・ドライブに保存
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/upload_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Upload (L$10)</d_old>
-<e_new>Save (L$10)</e_new>
-<f_translation>保存(L$10)</f_translation>
-<f_old_trans>ｱｯﾌﾟﾛｰﾄﾞL$10</f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/type_label2</b_path>
-<c_attribute/>
-<d_old>
- What size image do you need?
- </d_old>
-<e_new>
- Size
- </e_new>
-<f_translation>
- サイズ
- </f_translation>
-<f_old_trans>
- どんな大きさの画像が必要ですか？
- </f_old_trans>
-</string>
-<string>
-<a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/auto_snapshot_check</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Auto-snapshot</d_old>
-<e_new>Auto-refresh</e_new>
-<f_translation>自動更新</f_translation>
-<f_old_trans>自動スナップショット</f_old_trans>
-</string>
-<string>
-<a_file>menu_pie_avatar.xml</a_file>
-<b_path>/Avatar Pie/Add Friend</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Add Friend</d_old>
-<e_new>Add Friend...</e_new>
-<f_translation>フレンドを追加...</f_translation>
-<f_old_trans>フレンドを追加</f_old_trans>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//OfferFriendship/message</b_path>
-<c_attribute/>
-<d_old>
-
- [NAME] is offering friendship.
-
- By default, you will be able to
-see each other's online status.
-
-</d_old>
-<e_new>
-
- [NAME] is offering friendship.
-
-[MESSAGE]
-
-(By default, you will be able to see each other's online status.)
-
-</e_new>
-<f_translation>
-
- [NAME]は、フレンドを贈っています。
-
-[MESSAGE]
-
-(デフォルトでお互いのオンライン・ステータスを見ることができるようになります。)
-
-</f_translation>
-<f_old_trans>
-
- [NAME] は、フレンドシップを贈っています。
-
- デフォルトでお互いのオンライン・ステータスを見ることができるようになります。
-
-</f_old_trans>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//FailedToLoadWearableUnnamed/message</b_path>
-<c_attribute/>
-<d_old>
-
- Failed to load [TYPE].
-Please notify the vendor from whom you purchased this item.
-
-</d_old>
-<e_new>
-
- Oops!
-You tried to wear a [TYPE] and it did not load.
-
-Don't panic.
-Try again in a minute to give things a chance to settle down.
-
-</e_new>
-<f_translation>
-
- おっと!
-まだ読み込まれていないため、[TYPE]を装着できません。
-
-すこし時間がたてば状況が改善されるはずですので、しばらくしてからもう一度試してみてください
-
-</f_translation>
-<f_old_trans>
-
- [TYPE]をロードできませんでした。
-このアイテムを購入した販売者に通知してください。
-
-</f_old_trans>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//FailedToLoadWearable/message</b_path>
-<c_attribute/>
-<d_old>
-
- Failed to load [TYPE] named [DESC].
-Please notify the vendor from whom you purchased this item.
-
-</d_old>
-<e_new>
-
- Oops!
-You tried to wear [TYPE] named [DESC] and it did not load.
-
-Don't panic.
-Try again in a minute to give things a chance to settle down.
-
-</e_new>
-<f_translation>
-
- おっと!
-まだ読み込まれていないため、[DESC]という名前の[TYPE]を装着できません。
-
-すこし時間がたてば状況が改善されるはずですので、しばらくしてからもう一度試してみてください
-
-</f_translation>
-<f_old_trans>
-
- [DESC]という名前の[TYPE]をロードできませんでした。
-本アイテムを購入した販売者に通知してください。
-
-</f_old_trans>
-</string>
-<string>
-<a_file>notify.xml</a_file>
-<b_path>//FirstTeleport/message</b_path>
-<c_attribute/>
-<d_old>
-
- You have just teleported.
-You are at the Infohub nearest your destination.
-Your destination is marked with a tall red beacon.
-
-</d_old>
-<e_new>
-
- This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub.
-Your destination is marked with a tall beacon.
-Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
-
-</e_new>
-<f_translation>
-
- この地域では、ポイント間のテレポートが認められていませんので、最も近いテレハブ周辺に移動しました。
-あなたの目的地は、大きなビーコンで標されています。赤い矢印に続いて進むとビーコンへ辿り着きます。
-矢印をクリックするとビーコンを消せます
-
-</f_translation>
-<f_old_trans>
-
- あなたはたった今、テレポートしました。
-あなたの目的地に一番近いインフォハブにいます。
-目的地は、背の高い赤い標識で示されています。
-
-</f_old_trans>
-</string>
-<string>
-<a_file>panel_login.xml</a_file>
-<b_path>/panel_login/connect_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Connect</d_old>
-<e_new>Enter Second Life</e_new>
-<f_translation>Second Lifeに入る</f_translation>
-<f_old_trans>接続</f_old_trans>
-</string>
-<string>
-<a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/script_error</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Color</d_old>
-<e_new>Errors</e_new>
-<f_translation>エラー</f_translation>
-<f_old_trans>色</f_old_trans>
-</string>
-<string>
-<a_file>panel_preferences_skins.xml</a_file>
-<b_path>/Skins panel/skin_selection/default</b_path>
-<c_attribute/>
-<d_old>
- Classic
- </d_old>
-<e_new>
- Default
- </e_new>
-<f_translation>
- デフォルト
- </f_translation>
-<f_old_trans>
- クラシック
- </f_old_trans>
-</string>
-<string>
-<a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/choose_avatar_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Choose Avatar...</d_old>
-<e_new>Choose...</e_new>
-<f_translation>選択...</f_translation>
-<f_old_trans>アバターを選択...</f_old_trans>
-</string>
-
-</strings>
diff --git a/indra/newview/skins/default/xui/ja/notify.xml b/indra/newview/skins/default/xui/ja/notify.xml
index 849a1fb..4039637 100644
--- a/indra/newview/skins/default/xui/ja/notify.xml
+++ b/indra/newview/skins/default/xui/ja/notify.xml
@@ -74,7 +74,7 @@
</notify>
<notify name="InMaxGroups">
<message name="message">
- あなたはすでに最大限の数のグループに属しています。 1つのグループから抜けないと新しいグループを作ることはできません。
+ あなたは所属できる最大数のグループにすでに属しています。 グループをどれか1つ抜けないと新しいグループを作ることはできません。
</message>
</notify>
<notify name="GestureMissing">
@@ -148,9 +148,8 @@
</notify>
<notify name="IncompleteInventory">
<message name="message">
- あなたの提供するコンテンツは、この場所ではまだ
-全部揃いません。 少ししてから、もう一度
-試してください。
+ あなたの提供するコンテンツは、この場所ではまだ全部揃いません。
+少ししてからもう一度試してください。
</message>
</notify>
<notify name="CannotModifyProtectedCategories">
@@ -165,12 +164,12 @@
</notify>
<notify name="OfferedCard">
<message name="message">
- あなたは[FIRST] [LAST]にコーリング・カードを贈りました。
+ あなたは[FIRST] [LAST]にコーリング・カードを送りました。
</message>
</notify>
<notify name="OfferedFriendship">
<message name="message">
- あなたは[FIRST] [LAST]にフレンドシップを贈りました。
+ あなたは[FIRST] [LAST]にフレンドシップを送りました。
</message>
</notify>
<notify name="UnableToBuyWhileDownloading">
@@ -342,15 +341,13 @@
<notify name="OtherObjectsReturned">
<message name="message">
選択されている土地の区画上にあった
- [FIRST] [LAST]が所有するオブジェクトは
-オーナーの持ち物に返却されました。
+ [FIRST] [LAST]が所有するオブジェクトはオーナーの持ち物に返却されました。
</message>
</notify>
<notify name="OtherObjectsReturned2">
<message name="message">
選択された土地の区画上にあり、住人の
-[NAME]の所有だったオブジェクトは
-オーナーに返却されました。
+[NAME]の所有だったオブジェクトはオーナーに返却されました。
</message>
</notify>
<notify name="GroupObjectsReturned">
@@ -395,7 +392,7 @@
</notify>
<notify name="NoBuild">
<message name="message">
- この土地は建造無効（「建造不可」）に設定されています。
+ この土地はオブジェクトの作成禁止に設定されています。
ここでオブジェクトを作ることはできません。
</message>
</notify>
@@ -435,44 +432,44 @@
</notify>
<notify name="ObjectGiveItem">
<message name="message">
- [FIRST] [LAST]が所有している[OBJECTFROMNAME]と名付けられたオブジェクトが、あなたに[OBJECTNAME]という[OBJECTTYPE]を与えました。
+ [FIRST] [LAST]所有の[OBJECTFROMNAME]から、[OBJECTNAME]という[OBJECTTYPE]が送られてきました。
</message>
<option name="Keep">
- 維持
+ 受け取る
</option>
<option name="Discard">
破棄
</option>
<option name="Mute">
- ミュート
+ 無視リスト
</option>
</notify>
<notify name="ObjectGiveItemUnknownUser">
<message name="message">
- (未知のユーザー) が所有している[OBJECTFROMNAME]と名付けられたオブジェクトが、あなたに[OBJECTNAME]という[OBJECTTYPE]を与えました。
+ (未知のユーザー) 所有の[OBJECTFROMNAME]から、あなたに[OBJECTNAME]という[OBJECTTYPE]が送られてきました。
</message>
<option name="Keep">
- 維持
+ 受け取る
</option>
<option name="Discard">
破棄
</option>
<option name="Mute">
- ミュート
+ 無視リスト
</option>
</notify>
<notify name="UserGiveItem">
<message name="message">
- [NAME]は、あなたに[OBJECTNAME]という名前の[OBJECTTYPE]を与えました。
+ [NAME]は、あなたに[OBJECTNAME]という名前の[OBJECTTYPE]を渡しました。
</message>
<option name="Keep">
- 維持
+ 受け取る
</option>
<option name="Discard">
破棄
</option>
<option name="Mute">
- ミュート
+ 無視リスト
</option>
</notify>
<notify name="GodMessage">
@@ -492,13 +489,12 @@
辞退
</option>
<option name="Info">
- インフォ
+ 情報
</option>
</notify>
<notify name="JoinGroupOfficerNoFee">
<message name="message">
- [NAME]は、あなたをオフィサー
-としてグループに招待しています。
+ [NAME]は、あなたをオフィサーとしてグループに招待しています。
参加費用はかかりません。
[MESSAGE]
@@ -510,14 +506,13 @@
辞退
</option>
<option name="Info">
- インフォ
+ 情報
</option>
</notify>
<notify name="JoinGroupMember">
<message name="message">
[NAME]は、あなたを一般メンバーとしてグループに招待しています。
-グループへの参加費用はL$[COST]
-です。
+グループへの参加費用はL$[COST]です。
[MESSAGE]
</message>
<option name="Join">
@@ -527,7 +522,7 @@
辞退
</option>
<option name="Info">
- インフォ
+ 情報
</option>
</notify>
<notify name="JoinGroupMemberNoFee">
@@ -544,13 +539,12 @@
辞退
</option>
<option name="Info">
- インフォ
+ 情報
</option>
</notify>
<notify name="OfferTeleport">
<message name="message">
- [NAME]はあなたをテレポート
-で呼び寄せようとしています：
+ [NAME]はあなたをテレポートで呼び寄せようとしています：
[MESSAGE]
</message>
@@ -575,7 +569,7 @@
</notify>
<notify name="OfferFriendship">
<message name="message">
- [NAME]は、フレンドを贈っています。
+ [NAME]は、フレンド登録を申し込んでいます。
[MESSAGE]
@@ -590,7 +584,7 @@
</notify>
<notify name="OfferFriendshipNoMessage">
<message name="message">
- [NAME]は、フレンドシップを贈っています。
+ [NAME]は、フレンド登録を申し込んでいます。
(デフォルトでお互いのオンライン・ステータスを見ることができるようになります。)
</message>
@@ -603,17 +597,17 @@
</notify>
<notify name="FriendshipAccepted">
<message name="message">
- [NAME]は、フレンドシップを受け入れました。
+ [NAME]は、フレンド登録を受け入れました。
</message>
</notify>
<notify name="FriendshipDeclined">
<message name="message">
- [NAME]は、フレンドシップを断りました。
+ [NAME]は、フレンド登録を断りました。
</message>
</notify>
<notify name="OfferCallingCard">
<message name="message">
- [FIRST] [LAST]がコーリング・カードを贈っています。
+ [FIRST] [LAST]がコーリング・カードを送ってきています。
これにより、あなたの持ち物にブックマークが追加され、
この住人にすばやくIMすることができます。
</message>
@@ -626,14 +620,14 @@
</notify>
<notify name="RegionRestartMinutes">
<message name="message">
- この地域は[MINUTES]分後にリスタートされます。
-この地域の外に出ないと、強制ログアウトになります。
+ この地域は[MINUTES]分後に再起動されます。
+強制ログアウトとなりますので、この地域の外に出てください。
</message>
</notify>
<notify name="RegionRestartSeconds">
<message name="message">
- この地域は[SECONDS]秒後にリスタートされます。
-この地域の外に出ないと、強制ログアウトになります。
+ この地域は[SECONDS]秒後に再起動されます。
+強制ログアウトとなりますので、この地域の外に出てください。
</message>
</notify>
<notify name="LoadWebPage">
@@ -699,7 +693,7 @@
</notify>
<notify name="AttachToYourAvatar">
<message name="message">
- あなたのアバターに添付
+ あなたのアバターに装着添付
</message>
</notify>
<notify name="ReleaseOwnership">
@@ -746,7 +740,7 @@
いいえ
</option>
<option name="Mute">
- ミュート
+ 無視リスト
</option>
</notify>
<notify name="ScriptQuestionCautionChatGranted">
@@ -769,7 +763,7 @@
'[OBJECTNAME]'が所有するオブジェクト'[NAME]'は、次のことを求めています：
[QUESTIONS]
-このオブジェクトと制作者を、あなたが信用しない場合は、リクエストを拒否してください。追加情報は、詳細ボタンをクリックしてください。
+このオブジェクトと制作者が信用できない場合は、リクエストを拒否してください。追加情報は、詳細ボタンをクリックしてください。
このリクエストを許可しますか？
</message>
@@ -803,17 +797,15 @@
</notify>
<notify name="FirstBalanceIncrease">
<message name="message">
- 今、L$[AMOUNT]を受け取りました。
-オブジェクトと他のユーザーがあなたにお金を払う
-かもしれません。あなたの残高は
-画面の右上に表示されています。
+ L$[AMOUNT]を受け取りました。
+オブジェクトおよび他のユーザーがあなたにお金を支払ったようです。
+あなたの残高は画面の右上に表示されています。
</message>
</notify>
<notify name="FirstBalanceDecrease">
<message name="message">
- 今、L$[AMOUNT]を支払いました。
-あなたの残高は画面の右上に
-表示されています。
+ L$[AMOUNT]を支払いました。
+あなたの残高は画面の右上に表示されています。
</message>
</notify>
<notify name="FirstSit">
@@ -850,49 +842,47 @@
<notify name="FirstTeleport">
<message name="message">
この地域では、ポイント間のテレポートが認められていませんので、最も近いテレハブ周辺に移動しました。
-あなたの目的地は、大きなビーコンで標されています。赤い矢印に続いて進むとビーコンへ辿り着きます。
-矢印をクリックするとビーコンを消せます
+あなたの目的地は、大きな標識（ビーコン）で表示されています。赤い矢印に向かって進むと標識（ビーコン）へ辿り着きます。
+矢印をクリックすると標識（ビーコン）を消せます
</message>
</notify>
<notify name="FirstOverrideKeys">
<message name="message">
あなたの移動キーをオブジェクトが操作しています。
矢印かAWSDのキーで動作を確認してください。
-銃などのオブジェクトだと、マウスルックに移行する必要があります。
-Mキーを押して移行します。
+銃などのオブジェクトだと、一人称視点（マウスルック）に変更する必要があります。
+Mキーを押して変更します。
</message>
</notify>
<notify name="FirstAppearance">
<message name="message">
あなたは容姿を編集中です。
回転、ズームするには矢印キーを使います。
-編集が終わったら[全てを保存]をクリックして
-容姿を保存し、終了します。
+編集が終わったら[すべて保存]をクリックして容姿を保存し、終了します。
容姿の編集は何度でも行えます。
</message>
</notify>
<notify name="FirstInventory">
<message name="message">
- これは、オブジェクト、ノートカード、服、その他の所有物がすべて入った持ち物です。
-*オブジェクトや服装フォルダを装着するには、マウスでアバターにドラッグします。
-*オブジェクトを世界に持ち込むには、地面の上にドラッグします。
+ これは、オブジェクト、ノートカード、服、その他あなたの所有物がすべて入った「持ち物」です。
+*マウスでアバターにオブジェクトや服装フォルダをドラッグして装着します。
+*オブジェクトを地面の上にドラッグすると、周囲の世界に表示させます。（Rez）
*ノートカードを読むには、ダブルクリックします。
</message>
</notify>
<notify name="FirstSandbox">
<message name="message">
ここはサンドボックスです。
-あなたがここで作ったオブジェクトはあなたが
-立ち去った後、削除されるかもしれません。サンドボックスは定期的に清掃されます。詳細については、画面上部、地域名の隣の情報を参照してください。
+あなたがここで作ったオブジェクトはあなたが立ち去った後、削除されるかもしれません。サンドボックスは定期的に清掃されます。詳細については、画面上部、地域名の隣の情報を参照してください。
-サンドボックスは一般的でなく、目印のサインがついています。.
+サンドボックスは特別なエリアで、目印のサインがついています。
</message>
</notify>
<notify name="FirstFlexible">
<message name="message">
このオブジェクトは フレキシブルです。
-フレキシブル・チェックボックスのチェックが外されるまでは、オブジェクトは
-物理的でなくファントムでなければなりません。
+フレキシブル・チェックボックスのチェックが外されるまでは、
+オブジェクトは物理的でなくファントムでなければなりません。
</message>
</notify>
<notify name="FirstDebugMenus">
@@ -904,9 +894,9 @@ Mキーを押して移行します。
</notify>
<notify name="FirstSculptedPrim">
<message name="message">
- 変形されたプリムを編集しています。
-変形されたプリムは、形状を指定するための特別なテクスチャーが必要です。
-持ち物ライブラリで、変形されたテクスチャーのサンプルを参照できます。
+ スカルプトプリムを編集しています。
+スカルプトプリムは、形状を指定するための特別なテクスチャーが必要です。
+持ち物ライブラリで、スカルプトテクスチャーのサンプルを参照できます。
</message>
</notify>
<notify name="FirstMedia">
@@ -916,8 +906,7 @@ Mキーを押して移行します。
</notify>
<notify name="MaxListSelectMessage">
<message name="message">
- このリストから、 [MAX_SELECT] 個までのアイテムを
-選択できます。
+ このリストから、 [MAX_SELECT] 個までのアイテムを選択できます。
</message>
</notify>
<notify name="VoiceInviteP2P">
@@ -937,17 +926,17 @@ Mキーを押して移行します。
</notify>
<notify name="AutoUnmuteByIM">
<message name="message">
- [FIRST] [LAST]にインスタント・メッセージが送信され、ミュートが自動的に解除されました。
+ [FIRST] [LAST]にインスタント・メッセージが送信され、無視設定が自動的に解除されました。
</message>
</notify>
<notify name="AutoUnmuteByMoney">
<message name="message">
- [FIRST] [LAST]にお金が与えられ、ミュートが自動的に解除されました。
+ [FIRST] [LAST]にお金を渡したため、無視設定が自動的に解除されました。
</message>
</notify>
<notify name="AutoUnmuteByInventory">
<message name="message">
- [FIRST] [LAST]に持ち物が与えられ、ミュートが自動的に解除されました。
+ [FIRST] [LAST]に持ち物を渡したため、無視設定が自動的に解除されました。
</message>
</notify>
<notify name="VoiceInviteGroup">
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar.xml b/indra/newview/skins/default/xui/ja/panel_avatar.xml
index 5bdc712..8b04d32 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar.xml
@@ -70,17 +70,17 @@
<text name="Give item:">
品目を贈る：
</text>
- <text name="Give inventory" tool_tip="この人に持ち物品目を与えるには、ここにドロップします">
+ <text name="Give inventory" tool_tip="ここに物品目をドロップしてこの人に贈ります">
持ち物アイテムをここにドロップします
</text>
<check_box label="検索に表示" name="allow_publish" tool_tip="検索で、詳細やイメージなどさらなるプロフィール情報を公開する。"/>
<button label="?" label_selected="?" name="?"/>
<button label="地図上で検索" label_selected="地図上で検索" name="Find on Map"/>
- <button label="テレポートを贈る..." label_selected="テレポートを贈る..." name="Offer Teleport..."/>
- <button label="フレンドを追加..." label_selected="フレンドを追加..." name="Add Friend..."/>
- <button label="支払い..." label_selected="支払い..." name="Pay..."/>
- <button label="インスタント・メッセージ..." label_selected="インスタント・メッセージ..." name="Instant Message..." tool_tip="インスタント メッセージ (IM)"/>
- <button label="ミュート" label_selected="ミュート" name="Mute"/>
+ <button label="テレポートを贈る" label_selected="テレポートを贈る" name="Offer Teleport..."/>
+ <button label="フレンドを追加" label_selected="フレンドを追加" name="Add Friend..."/>
+ <button label="支払う" label_selected="支払う" name="Pay..."/>
+ <button label="ｲﾝｽﾀﾝﾄ･ﾒｯｾｰｼﾞ" label_selected="ｲﾝｽﾀﾝﾄ･ﾒｯｾｰｼﾞ" name="Instant Message..." tool_tip="インスタント・メッセージ (IM)"/>
+ <button label="無視する" label_selected="無視する" name="Mute"/>
</panel>
<panel label="ウェブ" name="WebProfile">
<flyout_button label="ロード" label_selected="ロード" name="load" tool_tip="プロファイル・ページを内蔵ブラウザーでロードします。">
@@ -95,33 +95,33 @@
<check_box label="ウェブ・プロフィール自動ロード" name="auto_load" tool_tip="プロフィールにあるすべてのウェブ・ページを確認なしで自動的にロードする"/>
</panel>
<panel label="興味" name="Interests">
- <text name="I Want To:">
+ <text name="I Want To:" width="74">
したいこと：
</text>
- <check_box label="作成する" name="chk0"/>
- <check_box label="探検する" name="chk1"/>
- <check_box label="会う" name="chk2"/>
- <check_box label="雇用される" name="chk6"/>
+ <check_box label="作成" name="chk0"/>
+ <check_box label="探検" name="chk1"/>
+ <check_box label="出会い" name="chk2"/>
+ <check_box label="就職" name="chk6"/>
<check_box label="グループ" name="chk3"/>
- <check_box label="購入する" name="chk4"/>
- <check_box label="販売する" name="chk5"/>
- <check_box label="雇用する" name="chk7"/>
+ <check_box label="購入" name="chk4"/>
+ <check_box label="販売" name="chk5"/>
+ <check_box label="雇用" name="chk7"/>
<text name="Skills:">
スキル：
</text>
<check_box label="テクスチャー" name="schk0"/>
- <check_box label="ｱｰｷﾃｸﾁｬ" name="schk1"/>
+ <check_box label="アーキテクチャ" name="schk1"/>
<check_box label="イベント計画" name="schk2"/>
<check_box label="モデル" name="schk3"/>
<check_box label="スクリプト" name="schk4"/>
- <check_box label="カスタム・キャラクター" name="schk5"/>
+ <check_box label="キャラクターのカスタム" name="schk5"/>
<text name="Languages:">
言語：
</text>
</panel>
<panel label="ピック" name="Picks">
<text name="Tell everyone about your favorite places in Second Life.">
- Second Lifeのお気入りの場所を皆に話してください
+ Second Lifeのお気入りの場所を皆に教えてください
</text>
<button label="新規..." label_selected="新規..." name="New..."/>
<button label="削除..." label_selected="削除..." name="Delete..."/>
@@ -156,10 +156,9 @@
ロード中．．．
</string>
<text name="label">
- このスペースに、この人物に関するメモを記録します。 進行中の取引、
-共同プロジェクトなどを記録。メモを見ることができるのは
-あなただけです。 本人を含めた他の人は、メモを見ることができません。
- </text>
+ このスペースには、進行中の取引、共同プロジェクトなどこの人物に関
+わるメモを記録してください。 本人を含めた他人には見ることのできな
+い、あなただけのメモ帳です。</text>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="OK"/>
@@ -170,8 +169,7 @@
<button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="この住人のカスタマー・サービス・ツールを開きます。"/>
<string name="ShowOnMapNonFriend">
地図上でロケーションを表示します。
-あなたが相手とフレンドシップを交わしていないため、
-表示できません。
+相手とフレンドシップを交わしていないため、表示できません。
</string>
<string name="ShowOnMapFriendOffline">
地図上でロケーションを表示します。
diff --git a/indra/newview/skins/default/xui/ja/panel_classified.xml b/indra/newview/skins/default/xui/ja/panel_classified.xml
index 22113f7..385ed96 100644
--- a/indra/newview/skins/default/xui/ja/panel_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified.xml
@@ -8,7 +8,7 @@
<button label="テレポート" name="classified_teleport_btn" />
<button label="地図上に表示" name="classified_map_btn" />
<button label="プロフィール" name="classified_profile_btn" />
- <check_box label="成人" name="classified_mature_check">
+ <check_box label="成人" name="classified_mature_check" width="160">
<combo_item name="select_mature">
-成熟度を選択-
</combo_item>
@@ -25,7 +25,7 @@
広告掲載： [DATE]、L$[AMT] 支払い済み
</string>
<text name="update_txt">
- アップデート
+ 更新
</text>
<text name="publish_txt">
公開．．．
diff --git a/indra/newview/skins/default/xui/ja/panel_event.xml b/indra/newview/skins/default/xui/ja/panel_event.xml
index 3132024..889e1da 100644
--- a/indra/newview/skins/default/xui/ja/panel_event.xml
+++ b/indra/newview/skins/default/xui/ja/panel_event.xml
@@ -7,7 +7,7 @@
（なし）
</text>
<text name="event_category_label">
- 入力する:
+ タイプ:
</text>
<text name="event_category" left="150">
（なし）
diff --git a/indra/newview/skins/default/xui/ja/panel_groups.xml b/indra/newview/skins/default/xui/ja/panel_groups.xml
index 2256593..ca334b4 100644
--- a/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="groups">
<text name="groupdesc">
- 現在アクティブなグループ名は太字で表示されています。
+ ｱｸﾃｨﾌﾞなｸﾞﾙｰﾌﾟ名は太字で表示されています
</text>
<text name="groupcount">
- あなたは[COUNT]グループに所属しています (最大[MAX])。
+ あなたは[COUNT] ｸﾞﾙｰﾌﾟに所属しています (最大[MAX])
</text>
<button label="IM/コール" name="IM"
tool_tip="インスタントメッセージ・セッションを開く" />
- <button label="インフォ" name="Info" />
+ <button label="情報" name="Info" />
<button label="アクティブ" name="Activate" />
- <button label="立ち去る" name="Leave" />
+ <button label="抜ける" name="Leave" />
<button label="作成..." name="Create" />
<button label="検索..." name="Search..." />
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index a8d6798..f90b012 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,29 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_login">
- <text name="first_name_text">
+ <text name="first_name_text" left="20">
ファーストネーム：
</text>
- <text name="last_name_text">
+ <line_editor left="20" name="first_name_edit" width="126" />
+ <text name="last_name_text" left="158">
ラストネーム：
</text>
+ <line_editor left="158" name="last_name_edit" width="126" />
<text name="password_text">
パスワード：
</text>
- <text name="start_location_text">
+ <text name="start_location_text" left="20" >
ログイン位置：
</text>
- <combo_box name="start_location_combo">
+ <combo_box name="start_location_combo" left_delta="92" width="172">
<combo_item name="MyHome">
自宅（ホーム）
</combo_item>
<combo_item name="MyLastLocation">
- 最後のロケーション
+ 最後にログアウトした場所
</combo_item>
<combo_item name="Typeregionname">
- <地域の名前入力>
+ < 地域の名前入力 >
</combo_item>
</combo_box>
- <check_box label="パスワードを記憶" name="remember_check"/>
+ <check_box label="パスワードを記憶" name="remember_check" left_delta="180"/>
<text name="full_screen_text">
ログイン時にはフルスクリーン表示になります
</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_place.xml b/indra/newview/skins/default/xui/ja/panel_place.xml
index 7339a05..1fa0d02 100644
--- a/indra/newview/skins/default/xui/ja/panel_place.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place.xml
@@ -33,7 +33,7 @@
土地情報のご利用には、サーバーのアップデートが必要です。
</text>
<text name="server_error_text">
- 現在の所在地についての情報は現在ご利用できません。時間をおいて、再度、試みてください。
+ このロケーションの情報は現在ご利用できません。時間をおいて再度お試しください。
</text>
<text name="server_forbidden_text">
現在の所在地についての情報は、アクセス制限のため利用できません。区画所有者の許可があるかどうかご確認ください。
diff --git a/indra/newview/skins/default/xui/ja/panel_place_small.xml b/indra/newview/skins/default/xui/ja/panel_place_small.xml
index 32e3520..1b5e6e0 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_small.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_small.xml
@@ -33,7 +33,7 @@
土地情報のご利用には、サーバーのアップデートが必要です。
</text>
<text name="server_error_text">
- 現在の所在地についての情報が現在ご利用できません。時間をおいて、再度、試みてください。
+ このロケーションの情報は現在ご利用できません。時間をおいて再度お試しください。
</text>
<text name="server_forbidden_text">
現在の所在地についての情報は、アクセス制限のためご利用できません。区画所有者の許可があるかどうかご確認ください。
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 96a4bc3..e22aca4 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -17,13 +17,13 @@
<text length="1" name="text_box2" type="string">
チャット・カラー：
</text>
- <color_swatch label="貴方" name="user"/>
- <color_swatch label="その他" name="agent"/>
+ <color_swatch label="貴方" name="user" width="56"/>
+ <color_swatch label="その他" name="agent" left_delta="60"/>
<color_swatch label="IM" name="im"/>
<color_swatch label="ｼｽﾃﾑ" name="system"/>
<color_swatch label="チャット" name="users"/>
- <color_swatch label="所有者" name="objects"/>
- <color_swatch label="所有者" name="owner"/>
+ <color_swatch label="ｵﾌﾞｼﾞｪｸﾄ" name="objects" width="56"/>
+ <color_swatch label="所有者" name="owner" left_delta="60"/>
<color_swatch label="吹出し" name="background"/>
<color_swatch label="URL" name="links"/>
<text length="1" name="text_box3" type="string">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 07502ee..b6211db 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -4,11 +4,11 @@
<radio_item name="MyHome" tool_tip="常に自宅（ホーム）にログイン">
自宅(ホーム)
</radio_item>
- <radio_item name="MyLastLocation" tool_tip="常に最後にいたロケーションにログイン">
- 最後のロケーション
+ <radio_item name="MyLastLocation" tool_tip="常に最後にいた場所にログイン">
+ 最後にログアウトした場所
</radio_item>
</radio_group>
- <check_box label="ログイン画面に開始ロケーションを表示" name="show_location_checkbox"/>
+ <check_box label="ログイン画面にログイン位置を表示" name="show_location_checkbox"/>
<combo_box name="fade_out_combobox">
<combo_item name="Never">
なし
@@ -26,7 +26,7 @@
グループ・タイトル：
</text>
<check_box label="グループ・タイトルをすべて非表示" name="show_all_title_checkbox"/>
- <check_box label="自分のグループ・タイトルを隠す" name="show_my_title_checkbox"/>
+ <check_box label="画面上で自分のグループ・タイトルを隠す" name="show_my_title_checkbox"/>
<color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリックして開く"/>
<text name="UI Size:">
UI サイズ：
@@ -94,6 +94,9 @@
<combo_item length="1" name="(Korean)" type="string">
한국어 (韓国語) – ベータ
</combo_item>
+ <combo_item length="1" name="Danish" type="string">
+ Dansk (デンマーク語) - Beta
+ </combo_item>
<combo_item length="1" name="Portugese" type="string">
Português (ポルトガル語) – ベータ
</combo_item>
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 e7311d0..7b987d5 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -74,7 +74,7 @@
品質および
</text>
<text name="QualityText">
- 実行：
+ パフォーマンス：
</text>
<text name="FasterText">
速い
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_im.xml b/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
index 551d862..b6c82b7 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
@@ -26,6 +26,6 @@
<check_box label="タイムスタンプに日付を加える" name="log_date_timestamp"/>
<button label="パス変更" label_selected="パス変更" name="log_path_button"/>
<text length="1" name="text_box3" type="string">
- ログインオプション：
+ 取り込み中応答ﾒｯｾｰｼﾞ：
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml b/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
index d549d68..f0b2c00 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
@@ -23,7 +23,7 @@
<text name="push_to_talk_label">
プッシュ・トゥ・トークトリガー：
</text>
- <button label="セットキー" name="set_voice_hotkey_button"/>
+ <button label="キー設定" name="set_voice_hotkey_button"/>
<button label="ミドルマウスボタン" name="set_voice_middlemouse_button"/>
<text name="privacy_heading">
プライバシーオプション
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_web.xml b/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
index 907caf8..c1115a7 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
@@ -13,7 +13,7 @@
<text name="cache_size_label_l">
キャッシュ：
</text>
- <button label="今すぐクリア" name="clear_cache" />
+ <button label="今すぐクリア" name="clear_cache" width="105" />
<text name="cookie_label">
クッキー：
</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 0cd66a4..4e6bae7 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -13,7 +13,7 @@
<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効化"/>
<button label="?" name="disable_physics_help"/>
<button label="適用" name="apply_btn"/>
- <text name="objret_text_lbl">
+ <text name="objret_text_lbl" width="120" >
オブジェクトの返却
</text>
<text name="resident_text_lbl">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 26b3432..67f05eb 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="不動産" name="Estate">
<text name="estate_help_text">
- このタブの設定を変更するとこの不動産内の全ての地域に影響を与えます。
+ このタブの設定を変更するとこの不動産内
+の全ての地域に影響を与えます。
</text>
<text name="estate_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 0708c9c..cd1b7ce 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -3,20 +3,20 @@
<text name="region_text_lbl">
地域：
</text>
- <text name="region_text">
+ <text name="region_text" left="90">
未知
</text>
- <text name="version_channel_text_lbl">
- バージョン:
+ <text name="version_channel_text_lbl" width="100">
+ バージョン：
</text>
- <text name="version_channel_text">
+ <text name="version_channel_text" left="90">
不明
</text>
<check_box label="土地整備をブロック" name="block_terraform_check" />
<button label="?" name="terraform_help" />
<check_box label="飛行をブロック" name="block_fly_check" />
<button label="?" name="fly_help" />
- <check_box label="損害を許可" name="allow_damage_check" />
+ <check_box label="ダメージを許可" name="allow_damage_check" />
<button label="?" name="damage_help" />
<check_box label="プッシュを制限" name="restrict_pushobject" />
<button label="?" name="restrict_pushobject_help" />
@@ -46,6 +46,6 @@
<button label="適用" name="apply_btn" />
<button label="ユーザー1人ホームテレポート" name="kick_btn" />
<button label="ユーザー全員ホームテレポート" name="kick_all_btn" />
- <button label="メッセージを領域へ送信..." name="im_btn" />
+ <button label="メッセージを地域へ送信..." name="im_btn" />
<button label="テレハブの管理..." name="manage_telehub_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 3e2f224..eb06ad7 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <text length="1" name="ParcelNameText" tool_tip="あなたが立っている土地区画の名前。 「土地情報」をクリックしてください。" type="string">
+ <text length="1" name="ParcelNameText" tool_tip="あなたが立っている土地区画の名前。 「土地情報」をクリックしてください。" type="string">
区画名はここです
</text>
<text length="1" name="BalanceText" tool_tip="口座残高" type="string">
diff --git a/indra/newview/skins/default/xui/ja/panel_toolbar.xml b/indra/newview/skins/default/xui/ja/panel_toolbar.xml
index 56d0407..60536fc 100644
--- a/indra/newview/skins/default/xui/ja/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_toolbar.xml
@@ -5,24 +5,24 @@
</string>
<layout_stack name="toolbar_stack">
<button label="IM" name="im_btn"
- tool_tip="フレンドとインスタント・メッセージ" />
+ tool_tip="友人とインスタント・メッセージ" />
<button label="コミュニケート" name="communicate_btn"
- tool_tip="フレンドやグループとコミュケート。" />
+ tool_tip="友人やグループとの交流" />
<button label="" name="chat_btn"
- tool_tip="チャット・バーを表示します。(Enter)" />
+ tool_tip="チャット・バーを表示します(Enter)" />
<button label="フレンド" name="friends_btn"
- tool_tip="フレンドを探して会話する" />
+ tool_tip="友人を探して会話する" />
<button label="飛行" label_selected="飛行を停止" name="fly_btn"
- tool_tip="飛行開始。 EキーまたはPageUpキーで上昇、CキーまたはPageDownキーで下降。" />
+ tool_tip="飛行開始 EキーまたはPageUpキーで上昇、CキーまたはPageDownキーで下降" />
<button label="スナップショット" name="snapshot_btn"
- tool_tip="スクリーンショットをディスクまたは持ち物に保存します。" />
+ tool_tip="スクリーンショットをディスクまたは持ち物に保存します" />
<button label="検索" name="directory_btn"
- tool_tip="場所、イベント、人など、さまざまな対象を検索できます。" />
- <button label="建造" name="build_btn" tool_tip="オブジェクト新規作成" />
+ tool_tip="場所、イベント、人など、さまざまな対象を検索できます" />
+ <button label="制作" name="build_btn" tool_tip="オブジェクト新規作成" />
<button label="ミニマップ" name="radar_btn"
- tool_tip="あなたの周辺領域の地図。 （Ctrl＋Shift＋M）" />
- <button label="地図" name="map_btn" tool_tip="世界地図。 （Ctrl＋M）" />
+ tool_tip="あなたの周辺領域の地図 （Ctrl＋Shift＋M）" />
+ <button label="地図" name="map_btn" tool_tip="世界地図 （Ctrl＋M）" />
<button label="持ち物" name="inventory_btn"
- tool_tip="あなたのアイテム。 (Ctrl-I)" />
+ tool_tip="あなたのアイテム (Ctrl-I)" />
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/ko/floater_mute.xml b/indra/newview/skins/default/xui/ko/floater_mute.xml
index 6acc4ce..9dccb0e 100644
--- a/indra/newview/skins/default/xui/ko/floater_mute.xml
+++ b/indra/newview/skins/default/xui/ko/floater_mute.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="주민 및 오브젝트 차단">
+<floater name="mute floater" title="주민 및 오브젝트 차단" short_title="차단 목록">
<scroll_list name="mutes" tool_tip="현재 차단된 주민들" />
<button label="차단할 주민" label_selected="차단할 주민"
name="Mute resident..." tool_tip="차단할 주민 선택" />
diff --git a/indra/newview/skins/default/xui/ko/menu_viewer.xml b/indra/newview/skins/default/xui/ko/menu_viewer.xml
index c48a850..5ce9981 100644
--- a/indra/newview/skins/default/xui/ko/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ko/menu_viewer.xml
@@ -144,8 +144,12 @@
<menu_item_call label="모든 애니메이션 중지" name="Stop All Animations" />
<menu_item_call label="키 해제" name="Release Keys" />
<menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="계정 기록" name="Account History..." />
- <menu_item_call label="내 계정 관리" name="Manage My Account..." />
+ <menu_item_call label="계정 기록" name="Account History..." >
+ <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ko" />
+ </menu_item_call>
+ <menu_item_call label="내 계정 관리" name="Manage My Account..." >
+ <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ko" />
+ </menu_item_call>
<menu_item_call label="린든달러(L$) 구매" name="Buy and Sell L$..." />
<menu_item_separator label="-----------" name="separator5" />
<menu_item_call label="내 토지" name="My Land..." />
diff --git a/indra/newview/skins/default/xui/ko/need_to_long.xml b/indra/newview/skins/default/xui/ko/need_to_long.xml
deleted file mode 100644
index 804383d..0000000
--- a/indra/newview/skins/default/xui/ko/need_to_long.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<strings>
-<string><a_file>alerts.xml</a_file>
-<b_path>//HelpReportAbuseContainsCopyright/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Dear Resident,
-
-Reports about copyright infringement can only be submitted
-as described at http://secondlife.com/corporate/dmca.php.
-
-Reports concerning copyright infringement will automatically
-be discarded if they are submitted through the 'Abuse Report'
-feature. If your report does not relate to copyright infringement,
-you may close this window and finish submitting your report.
-
-Thank you,
-
-Linden Lab
- </d_old>
-<e_new>
- Dear Resident,
-
-If you are reporting intellectual property infringement, please make sure you are reporting it correctly:
-
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
-
-(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you must submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
-
-If you still wish to continue with the abuse process, please close this window and finish submitting your report.
-
-Thank you,
-
-Linden Lab</e_new>
-<f_translation>
- 주민 여러분께,
-
-저작권 침해 사례를 신고하려면 다음 절차에 따라 올바른 방식으로 신고하시기 바랍니다:
-
-(1) 악용 신고 절차. 특정 주민이 세컨드라이프의 권한을 부당하게 이용하는 것으로 판단되는 경우 악용 신고서를 제출할 수 있습니다. 예를 들면, CopyBot(무단복제)나 유사한 복제 도구를 사용해서 저작권을 침해하는 행위를 들 수 있습니다. 악용 신고 전담팀은 세컨드라이프 커뮤니티 규칙과 서비스 약관을 위반한 행위를 조사하고 적절한 징계 조치를 취할 것입니다. 하지만 악용 신고 전담팀에서는 해당 컨텐츠 삭제를 직접 취급하지 않습니다.
-
-(2) DMCA 또는 컨텐츠 삭제 절차. 세컨드라이프에서 컨텐츠 삭제를 요청하려면 http://secondlife.com/corporate/dmca.php의 DMCA 정책에 명시된 대로 유효한 저작권 침해 통지서를 제출해야 합니다.
-
-악용 신고 절차를 계속해서 진행하려면 이 창을 닫고 신고 제출을 완료하십시오.
-
-감사합니다.
-
-린든랩 드림</f_translation>
-<f_old_trans>
- 주민 여러분께,
-
-저작권 침해에 대한 신고는 http://secondlife.com/corporate/dmca.php의
-설명에 따라 제출해 주셔야 합니다.
-
-저작권 침해에 대한 신고가 '악용 신고'
-와는 다르게 신고 되어야 하며 악용 신고를 통해 제출되는 경우 자동으로
-폐기됩니다. 신고하시는 내용이 저작권 침해와 관련이 없다면
-이 창을 닫아 신고를 종료하십시오.
-
-감사합니다.
-
-린든랩 드림
- </f_old_trans>
-</string><string><a_file>floater_about.xml</a_file>
-<b_path>/floater_about/credits_editor</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks, Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
-
- Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- All rights reserved. See licenses.txt for details.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- Happiness is a warm puppy. -- Charles M. Schulz</d_old>
-<e_new>
- Second Life is brought to you by Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn and many others.
-
- Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- All rights reserved. See licenses.txt for details.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- What happens to a dream deferred? --Langston Hughes</e_new>
-<f_translation>
- 세컨드라이프 제작자들: Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, 그 외에 많은 분들이 수고해 주셨습니다.
-
- 현재 버전이 최상의 버전이 될 수 있도록 도와주신 여러분께 감사드립니다: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- 저작권 보유. 자세한 내용은 licenses.txt를 참조하십시오.
-
- 음성 채팅 오디오 코딩: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- 미루어진 꿈엔 무슨 일이 일어나려나? --Langston Hughes</f_translation>
-<f_old_trans>
- 세컨드라이프 제작자들: Philip, Tessa, Andrew, Cory, Ben, Bunny, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Hunter, Ian, Jeff, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, BillTodd, Ryan, Zach, Sarah, Nova, Otakon, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, DanceStar, Jeska, Hungry, Torley, Kona, Callum, Charity, Ventrella, Jack, Uncle, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Monroe, David, Tess, Lizzie, Patsy, Pony, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, James, Katie, Dawn, Katt, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, 그 외에 많은 분들이 수고해 주셨습니다.
-
- 현재 버전이 최상의 버전이 될 수 있도록 도와주신 여러분께 감사드립니다: aaron23 decuir, Abra Miles, absolute balderdash, adelle fitzgerald, Aeron Kohime, Aki Shichiroji, Alger Meads, Alissa Sabre, AlwaysIcey Mapholisto, Arawn Spitteler, Aren Mandala, Arianna Wrigglesworth, Bagushii Kohime, Balpien Hammerer, Blinking2342 Blinker, byakuya runo, Capucchy Streeter, Chandra Jun, Coyote Pace, Crusher Soderstrom, Cummere Mayo, cyberrosa Rossini, Dael Ra, danana dodonpa, Darek Deluca, Davec Horsforth, django yifu, draco crane, Dre Dagostino, Ephyu Reino, etan quan, Fenrix Murakami, Fledhyris Proudhon, Fred Wardhani, Frederich Courier, garth fairchang, Gellan Glenelg, Geraldine Giha, GOLAN Eilde, gonzo joubert, Hachiro Yokosuka, Hampton Hax, harleywood guru, Hevenz Vansant, imnotgoing sideways, Jaden Giles, Jeanette Janus, Karl Dorance, keaton Akina, Khashai Steinbeck, KiPSOFT Tuqiri, kirstenlee Cinquetti, Kitty Barnett, Laurent Vesta, Lazure Ryba, Lima Vesperia, Linzi Bingyi, Lisa Lowe, LuDon Ninetails, Mark Rosenbaum, McCabe Maxsted, Michi Lumin, Midi Aeon, ml0rtd kit, Mo Eriksen, Morice Flanagan, Mysterion Aeon, Nad Gough, norgan torok, Pygar Bu, Qie Niangao, rachel corleone, Rado Arado, roberto salubrius, Royer Pessoa, samia bechir, Sasha Nurmi, Sean Heying, Selkit Diller, Shadow Pidgeon, simon kline, Smokie Ember, Soap Clawtooth, Strife Onizuka, Tal Chernov, Talan Hyun, tangletwigs fairymeadow, Tanya Spinotti, Tayra Dagostino, Teebone Aeon, Theremes Langdon, Thraxis Epsilon, tucor Capalini, Vasko Hawker, VenusMari Zapedzki, Vex Streeter, Viktoria Dovgal, Vincent Nacon, Viridian Exonar, Vivienne Schell, WarKirby Magojiro, Wilton Lundquist, Yukinoroh Kamachi, Zyzzy Zarf
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
- 저작권 보유. 자세한 내용은 licenses.txt를 참조하십시오.
-
- 음성 채팅 오디오 코딩: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- 행복이란 포근한 강아지 한마리다. -- Charles M. Schulz
- </f_old_trans>
-</string>
-</strings>
diff --git a/indra/newview/skins/default/xui/ko/need_to_translate.xml b/indra/newview/skins/default/xui/ko/need_to_translate.xml
deleted file mode 100644
index 8c1887c..0000000
--- a/indra/newview/skins/default/xui/ko/need_to_translate.xml
+++ /dev/null
@@ -1,1232 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<strings>
-<string><a_file>alerts.xml</a_file>
-<b_path>//AddFriend/editline</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Would you be my friend?
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 제 친구가 되시겠습니까?
- </f_translation>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//EstateObjectReturn/message</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Are you sure you want to return objects owned by
-[USER_NAME] ?
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-[USER_NAME]이(가) 소유하는 오브젝트를 반환하시겠습니까?
- </f_translation>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//EstateObjectReturn/Return</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- OK
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 확인
- </f_translation>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//EstateObjectReturn/Cancel</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Cancel
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 취소
- </f_translation>
-</string><string><a_file>floater_about_land.xml</a_file>
-<b_path>/floaterland/landtab/land_general_panel/no_selection_text</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- No parcel selected.
-Go to World menu > About Land or select another parcel to show its details.
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 구획을 선택하지 않았습니다.
-세부 사항을 보려면 '월드 메뉴 > 토지 소개'를 선택 하시거나 다른 구획을 선택하십시오.
- </f_translation>
-</string><string><a_file>floater_instant_message.xml</a_file>
-<b_path>/im_floater/inventory_item_offered</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Inventory item offered
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 인벤토리 아이템이 제공되었습니다.
- </f_translation>
-</string><string><a_file>floater_live_lsleditor.xml</a_file>
-<b_path>/script ed float/mono</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Mono</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>모노</f_translation>
-<f_old_trans></f_old_trans>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak</b_path>
-<c_attribute>title</c_attribute>
-<d_old></d_old>
-<e_new>Memory Leaking Simulation</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>메모리 손실 시뮬레이션</f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/leak_speed</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Leaking Speed (bytes per frame):</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>손실 속도(프레임당 바이트 수):</f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/max_leak</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Max Leaked Memory (MB):</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>손실된 최대 메모리(MB):</f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/total_leaked_label</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Current leaked memory: [SIZE] KB
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 현재 손실된 메모리: [SIZE] KB
- </f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/note_label_1</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- [NOTE1]
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- [NOTE1]
- </f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/note_label_2</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- [NOTE2]
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- [NOTE2]
- </f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/start_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Start</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>시작</f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/stop_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Stop</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>중지</f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/release_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Release</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>해제</f_translation>
-</string><string><a_file>floater_mem_leaking.xml</a_file>
-<b_path>/MemLeak/close_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Close</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>닫기</f_translation>
-</string><string><a_file>floater_postcard.xml</a_file>
-<b_path>/Postcard/upload_message</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- "Sending..."
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- "보내는 중..."
- </f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Select_category</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Select category
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-카테고리 선택
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Age__Age_play</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Age > Age play
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-연령관련 > 에이지 플레이
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Age__Adult_resident_on_Teen_Second_Life</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Age > Adult resident on Teen Second Life
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-연령관련 > 틴 세컨드라이프내의 성인 주민
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Age__Underage_resident_on_Adult_Second_Life</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Age > Underage resident on Adult Second Life
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-연령관련 > 세컨드라이프의 미성년자 주민
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Assault__Combat_sandbox___unsafe_area</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Assault > Combat sandbox / unsafe area
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-폭력관련 > 전투 샌드박스/위험 지대
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Assault__Safe_area</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Assault > Safe area
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-폭력관련 > 안전 지대
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Assault__Weapons_testing_sandbox</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Assault > Weapons testing sandbox
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-폭력관련 > 총기류 테스트 샌드박스
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Copyright_or_intellectual_property_violation</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Copyright or intellectual property violation
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-저작권 또는 지적재산권 위반 관련
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Commerce__Failure_to_deliver_product_or_service</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Commerce > Failure to deliver product or service
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-쇼핑관련 > 제품 배달 또는 서비스 제공 실패
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disclosure__First_Life_information</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disclosure > First life information
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-개인정보 관련 > 오프라인 정보
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disclosure__Remotely_monitoring chat</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disclosure > Remotely monitoring chat
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-개인정보 관련 > 원격 모니터링 채팅
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disclosure__Second_Life_information_chat_IMs</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disclosure > Second Life information/chat/IMs
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-개인정보 관련 > 세컨드라이프 정보/채팅/메신저
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Unfair_use_of_region_resources</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disturbing the peace > Unfair use of region resources
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-치안관련 > 지역 자원의 부당한 이용
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Excessive_scripted_objects</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disturbing the peace > Excessive scripted objects
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-치안관련 > 초과 스크립트 오브젝트
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Object_littering</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disturbing the peace > Object littering
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-치안관련 > 오브젝트 혼란 방치
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Repetitive_spam</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disturbing the peace > Repetitive spam
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-치안관련 > 반복적인 스팸
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Disturbing_the_peace__Unwanted_advert_spam</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Disturbing the peace > Unwanted advert spam
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-치안관련 > 원치 않는 광고성 스팸
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__L$</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Fraud > L$
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-사기관련 > L$
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__Land</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Fraud > Land
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-사기관련 > 토지
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__Pyramid_scheme_or_chain_letter</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Fraud > Pyramid scheme or chain letter
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-사기관련 > 피라미드 조직 또는 연쇄 편지
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Fraud__US$</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Fraud > US$
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-사기관련 > US$
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Advert_farms___visual_spam</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Harassment > Advert farms / visual spam
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-괴롭힘 관련> 광고성 유료 사이트/비주얼 스팸
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Defaming_individuals_or_groups</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Harassment > Defaming individuals or groups
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-괴롭힘 관련 > 개인 또는 집단 명예 훼손
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Impeding_movement</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Harassment > Impeding movement
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-괴롭힘 관련 > 고의적인 방해
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Sexual_harassment</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Harassment > Sexual harassment
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-괴롭힘 관련 > 성희롱
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Solicting_inciting_others_to_violate_ToS</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Harassment > Solicting/inciting others to violate ToS
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-괴롭힘 관련 > TOS를 위반하도록 타인 유혹/조장
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Harassment__Verbal_abuse</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Harassment > Verbal abuse
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-괴롭힘 관련 > 언어 폭력
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Broadly_offensive_content_or_conduct</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Indecency > Broadly offensive content or conduct
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-외설 관련> 노골적으로 불쾌한 컨텐츠 또는 행동
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Broadly_visible_mature_content</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Indecency > Broadly visible mature content
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-외설 관련 > 노골적인 성인용 컨텐츠
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Inappropriate_avatar_name</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Indecency > Inappropriate avatar name
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-외설 관련 > 부적절한 아바타 이름
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Indecency__Mature_content_in_PG_region</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Indecency > Mature content in PG region
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-외설 관련 > PG 지역에서 성인용 컨텐츠 사용
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Abuse_of_sandbox_resources</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Land > Abuse of sandbox resources
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-토지 관련 > 샌드박스 리소스 남용
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Encroachment__Objects_textures</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Land > Encroachment > Objects/textures
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-토지 관련 > 침략 > 오브젝트/텍스처
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Encroachment__Particles</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Land > Encroachment > Particles
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-토지 관련 > 침략 > 구획
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Land__Encroachment__Trees_plants</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Land > Encroachment > Trees/plants
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-토지 관련 > 침략 > 나무/식물
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Trademark_violation</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Trademark violation
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-상표 위반 관련
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Wagering_gambling</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
-Wagering/gambling
-</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
-도박 관련
-</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/omit_abuser_name</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Don't know abuser's name</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>악용자의 이름 모름</f_translation>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/omit_abuser_name</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Check this if you are unable to provide the abuser's name</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>악용자의 이름을 제공할 수 없는 경우 이 옵션을 선택하십시오.</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox</b_path>
-<c_attribute>title</c_attribute>
-<d_old></d_old>
-<e_new></e_new>
-<f_old_trans></f_old_trans>
-<f_translation></f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//chat_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new></e_new>
-<f_old_trans></f_old_trans>
-<f_translation></f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//chat_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Show Chat Bar. (Enter)</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>채팅 표시줄 표시 (입력)</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//communicate_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Communicate</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>통신</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//communicate_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Communicate with your Friends and Groups.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>친구 및 그룹과 통신합니다.</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//fly_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Fly</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>비행</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//fly_btn</b_path>
-<c_attribute>label_selected</c_attribute>
-<d_old></d_old>
-<e_new>Stop Flying</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>비행 중지</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox//fly_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Start flying. Use E/C or PgUp/PgDn to fly up and down.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>비행 시작. 위, 아래로 비행하려면 E/C 또는 PgUp/PgDn을 사용하십시오.</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_unfocused_floater/titlebar_focused</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Unfocused</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>초점이 맞지 않음</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_unfocused_floater/combo_box_1</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Combo Box</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>콤보 박스</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_unfocused_floater/Chat History Editor</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Text</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>텍스트</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/titlebar_focused</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Focused</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>초점이 맞음</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Focused</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>초점이 맞음</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/SliderTestName</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Slider</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>슬라이더</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/check_box_test_1</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>True</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>참</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/check_box_test_2</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>False</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>거짓</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_1/Chat History Editor</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Chat Text</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>채팅 텍스트</f_translation>
-</string><string><a_file>floater_skin_preview_template.xml</a_file>
-<b_path>/floater_chatterbox/panel_focused_floater/chatterbox_tabs/test_2</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Unfocused</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>초점이 맞지 않음</f_translation>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/save_btn</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Save image to a file</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>파일에 이미지 저장</f_translation>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/format_label</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Format
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 파일 형식
- </f_translation>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Format</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>파일 형식</f_translation>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo/PNG</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- PNG
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- PNG
- </f_translation>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo/JPEG</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- JPEG
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- JPEG
- </f_translation>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/local_format_combo/BMP</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- BMP
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- BMP
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Strength:</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Strength:
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 강도:
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Price: L$
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 가격: L$
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Default</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Price: L$
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 가격: L$
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Total</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Total Price: L$
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 총 가격: L$
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Per Unit</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Price Per: L$
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 단가: L$
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Cost Mixed</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Mixed Price
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 혼합 가격
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/General/Sale Mixed</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Mixed Sale
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 혼합 판매
- </f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt mirror control</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Mirror</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>미러</f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt mirror control</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Flips sculpted prim along the X axis.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>X축을 따라 sculpted prim(조각 프림)을 뒤집습니다.</f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt invert control</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Inside-out</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>내부-외부</f_translation>
-</string><string><a_file>floater_tools.xml</a_file>
-<b_path>/toolbox floater/Object Info Tabs/Object/sculpt invert control</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Inverts the sculpted prims normals, making it appear inside-out.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>Sculpted prim(조각 프림) 수직선을 반전하여 내/외부가 반전되어 나타나도록 합니다.</f_translation>
-</string><string><a_file>floater_top_objects.xml</a_file>
-<b_path>/top_objects/objects_list/time</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Time</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>시간</f_translation>
-</string><string><a_file>floater_tos.xml</a_file>
-<b_path>/modal container/agree_chk</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>I Agree to the Terms of Service</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>서비스 약관에 동의합니다.</f_translation>
-</string><string><a_file>menu_viewer.xml</a_file>
-<b_path>/Main Menu/World/Release Keys</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Release Keys</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>키 해제</f_translation>
-</string><string><a_file>menu_viewer.xml</a_file>
-<b_path>/Main Menu/Tools/Recompile Scripts in Selection/Mono</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Mono</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>모노</f_translation>
-</string><string><a_file>menu_viewer.xml</a_file>
-<b_path>/Main Menu/Tools/Recompile Scripts in Selection/LSL</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>LSL</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>LSL</f_translation>
-</string><string><a_file>mime_types.xml</a_file>
-<b_path>/default/"application/smil"/"application/smil_label"</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Synchronized Multimedia Integration Language (SMIL)
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- SMIL(동기식 멀티미디어 통합 언어)
- </f_translation>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//OfferFriendshipNoMessage/message</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- [NAME] is offering friendship.
-
-(By default, you will be able to
-see each other's online status.)
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- [NAME]님이 친구 사귀기를 제안합니다.
-
-(기본적으로 사용자는
-서로의 온라인 상태를 볼 수 있습니다.)
- </f_translation>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//OfferFriendshipNoMessage/Accept</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Accept
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 동의
- </f_translation>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//OfferFriendshipNoMessage/Decline</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Decline
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 거부
- </f_translation>
-</string><string><a_file>panel_login.xml</a_file>
-<b_path>/panel_login/create_new_account_text</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Create new account.
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>새 계정을 만듭니다.
- </f_translation>
-</string><string><a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/user</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>You</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>나</f_translation>
-</string><string><a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/agent</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Others</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>다른 사용자</f_translation>
-</string><string><a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/play_typing_animation</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Play typing animation</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>타이핑 애니메이션 재생</f_translation>
-</string><string><a_file>panel_preferences_general.xml</a_file>
-<b_path>/general_panel/language_is_public</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Share language with objects</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>오브젝트와 언어 공유</f_translation>
-</string><string><a_file>panel_preferences_general.xml</a_file>
-<b_path>/general_panel/language_is_public</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>This lets in-world objects know your preferred language.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>인월드 오브젝트에 사용자의 기본 언어를 설정할 수 있습니다.</f_translation>
-</string><string><a_file>panel_preferences_graphics1.xml</a_file>
-<b_path>/Display panel/QualityPerformanceSelection</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new></e_new>
-<f_old_trans></f_old_trans>
-<f_translation></f_translation>
-</string><string><a_file>panel_preferences_im.xml</a_file>
-<b_path>/im/friends_online_notify_checkbox</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Show Online Friend Notifications</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>온라인 친구 보여주기</f_translation>
-</string><string><a_file>panel_preferences_popups.xml</a_file>
-<b_path>/popups/show_in_inventory</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Automatically show newly accepted objects in inventory</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>인벤토리에서 새로 수락한 오브젝트를 자동으로 보여주기</f_translation>
-</string><string><a_file>panel_preferences_skins.xml</a_file>
-<b_path>/Skins panel/classic_preview</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new></e_new>
-<f_old_trans></f_old_trans>
-<f_translation></f_translation>
-</string><string><a_file>panel_preferences_skins.xml</a_file>
-<b_path>/Skins panel/silver_preview</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new></e_new>
-<f_old_trans></f_old_trans>
-<f_translation></f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/target_avatar_name</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- (none)
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- (없음)
- </f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_scripts</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Return only those objects with scripts</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>스크립트가 있는 오브젝트만 반환</f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_scripts</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Return only objects which have scripts.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>스크립트가 있는 오브젝트만 반환합니다.</f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_other_land</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Return only those objects on someone else's land</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>다른 주민의 토지에 속한 오브젝트만 반환</f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_other_land</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Return only objects which are on land belonging to someone else</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>다른 주민이 소유하고 있는 토지에 있는 오브젝트만 반환합니다.</f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_estate_wide</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Return objects in every region of this estate</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>이 사유지의 모든 지역에 속한 오브젝트 반환</f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_estate_wide</b_path>
-<c_attribute>tool_tip</c_attribute>
-<d_old></d_old>
-<e_new>Return objects in all of the regions that make up this estate</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>이 사유지를 구성하는 모든 지역에 포함되는 오브젝트를 반환합니다.</f_translation>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/return_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old></d_old>
-<e_new>Return</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>반환</f_translation>
-</string><string><a_file>panel_region_estate.xml</a_file>
-<b_path>/Estate/abuse_email_text</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>
- Abuse email address:
- </e_new>
-<f_old_trans></f_old_trans>
-<f_translation>
- 악용 신고 이메일 주소:
- </f_translation>
-</string><string><a_file>panel_region_estate.xml</a_file>
-<b_path>/Estate/email_unsupported</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Feature unsupported</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>기능이 지원되지 않습니다.</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old></d_old>
-<e_new>These Abilities include powers to allow or restrict access to group chat sessions and group voice chat.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>이러한 권한에는 그룹 채팅 세션 및 그룹 음성 채팅에 대한 허용 또는 제한의 권한이 포함됩니다.</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat/join group chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old></d_old>
-<e_new>Join Group Chat</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>그룹 채팅 참여</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat/join group chat</b_path>
-<c_attribute>longdescription</c_attribute>
-<d_old></d_old>
-<e_new>Members in a Role with this Ability can join group chat sessions, for text and voice.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>역할에 이 권한이 있는 회원은 텍스트 및 음성을 사용한 그룹 채팅 세션에 참여할 수 있습니다.</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat/join voice chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old></d_old>
-<e_new>Join Group Voice Chat</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>그룹 음성 채팅 참여</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat/join voice chat</b_path>
-<c_attribute>longdescription</c_attribute>
-<d_old></d_old>
-<e_new>Members in a Role with this Ability can join group voice chat sessions. NOTE: The Join Group Chat ability is required to access the voice chat session.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>역할에 이 권한이 있는 회원은 그룹 음성 채팅 세션에 참여할 수 있습니다. 참고: 음성 채팅 세션에 참여하려면 그룹 채팅 참여 권한이 있어야 합니다.</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat/moderate group chat</b_path>
-<c_attribute>description</c_attribute>
-<d_old></d_old>
-<e_new>Moderate Group Chat</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>그룹 채팅 중재</f_translation>
-</string><string><a_file>role_actions.xml</a_file>
-<b_path>//Chat/moderate group chat</b_path>
-<c_attribute>longdescription</c_attribute>
-<d_old></d_old>
-<e_new>Members in a Role with this Ability can control access and participation in group voice and text chat sessions.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>역할에 이 권한이 있는 회원은 그룹 음성 및 텍스트 채팅 세션에 대한 접근과 참여를 제어할 수 있습니다.</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//LoginInitializingMultimedia</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Initializing multimedia...</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>멀티미디어 초기화 중...</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//AgentLostConnection</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>This region may be experiencing trouble. Please check your connection to the Internet.</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>이 지역에 문제가 있을 수 있습니다. 인터넷 연결을 확인하십시오.</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//TooltipMustSingleDrop</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Only a single item can be dragged here</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>하나의 아이템만 여기로 드래그할 수 있습니다.</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//ReleaseNotes</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Release Notes</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>출시 정보</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//texture_loading</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Loading...</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>로딩 중...</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//worldmap_offline</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>Offline</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>오프라인</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//whisper</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>whispers:</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>속삭이기:</f_translation>
-</string><string><a_file>strings.xml</a_file>
-<b_path>//shout</b_path>
-<c_attribute></c_attribute>
-<d_old></d_old>
-<e_new>shouts:</e_new>
-<f_old_trans></f_old_trans>
-<f_translation>외치기:</f_translation>
-</string>
-</strings>
diff --git a/indra/newview/skins/default/xui/ko/need_to_update.xml b/indra/newview/skins/default/xui/ko/need_to_update.xml
deleted file mode 100644
index a94271c..0000000
--- a/indra/newview/skins/default/xui/ko/need_to_update.xml
+++ /dev/null
@@ -1,621 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<strings>
-<string><a_file>alerts.xml</a_file>
-<b_path>//ClickPublishHelpAvatar/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Selecting "Show in Search" will show:
- - my profile in search results
- - a link to my profile in public group pages
- </d_old>
-<e_new>
-Selecting "Show in Search" will show:
-- my profile in search results
-- a link to my profile in public group pages
- </e_new>
-<f_translation>
-"검색 보기" 옵션을 선택하면
-- 내 프로필 검색 결과
-- 공개 그룹 내 프로필 페이지로 링크 연결 보기를 할 수 있습니다.
- </f_translation>
-<f_old_trans>
- 검색 보기
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//ClickWebProfileHelpAvatar/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- If this resident has a web profile URL set then you can:
- * Click Load to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
-
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
- </d_old>
-<e_new>
- If this resident has set a web profile URL then you can:
- * Click "Load" to load the page with the embedded web browser.
- * Click Load->"Open in external browser" to view externally.
- * Click Load->"Home URL" to return to resident's web profile if you've navigated away.
-
-When viewing your own profile you can enter any URL as your web profile and click OK to set it.
-Other residents can visit the URL you set when they view your profile.
- </e_new>
-<f_translation>
- 이 주민이 웹 프로필 URL을 가지고 있으면 다음을 할 수 있습니다:
- * "불러오기"를 클릭하여 웹 브라우저에서 페이지를 불러옵니다.
- * 불러오기->"외부 브라우저에서 열기"를 클릭하면 외부 웹 브라우저에서 웹 프로필을 볼 수 있습니다.
- * 주민이 사이트를 탐색할 때 불러오기->"홈 URL"을 클릭하면 주민의 웹 프로필로 되돌아옵니다.
-
-내 프로필을 볼 때는 웹 프로필과 같이 URL을 입력할 수 있으며, '확인'을 클릭해서 해당 URL을 설정할 수 있습니다.
-다른 주민들이 내 프로필을 볼 경우, 주민들은 내가 설정한 URL을 방문할 수 있습니다.
- </f_translation>
-<f_old_trans>
- 웹 프로필 URL이 있으면 다음을 할 수 있음:
- * 불러오기를 클릭하여 세컨드라이프 상의 웹 브라우저에서 웹프로필을 불러옵니다.
- *열기를 클릭하여 외부 웹 브라우저에서 웹 프로필을 볼 수 있습니다.
-
-내 프로필을 볼 때는 웹 프로필과 같이 URL을 입력할 수 있습니다.
-주민들이 내 프로필을 볼 경우내가 지정한 URL의 웹 프로필을 볼 수 있습니다.
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//PromptMissingSubjMsg/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Send postcard with the default subject or message?
- </d_old>
-<e_new>
- Email snapshot with the default subject or message?
- </e_new>
-<f_translation>
- 기본 제목과 메시지로 만들어진 스냅샷을 이메일로 보내시겠습니까?
- </f_translation>
-<f_old_trans>
- 만들어진 제목과 메시지를 엽서로 보내시겠습니까?
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//ErrorUploadingPostcard/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- There was a problem uploading a postcard due to the following reason: [REASON]
- </d_old>
-<e_new>
- There was a problem sending a snapshot due to the following reason: [REASON]
- </e_new>
-<f_translation>
- 다음의 이유로 인해 스냅샷을 보내는 데 문제가 발생했습니다: [REASON]
- </f_translation>
-<f_old_trans>
- 다음의 이유로 인해 포스트카드를 업로드하는 데 문제가 발생했습니다: [REASON]
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//MustHaveAccountToLogIn/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- You must have an account to connect to [SECOND_LIFE].
-Go to www.secondlife.com to create an account?
- </d_old>
-<e_new>
-Oops! Something was left blank.
-You need to enter both the First and Last name of your avatar.
-
-You need an account to enter [SECOND_LIFE]. Would you like to create one now?
-</e_new>
-<f_translation>
-죄송합니다. 일부 항목이 비어 있습니다.
-아바타의 성과 이름을 모두 입력해야 합니다.
-
-[SECOND_LIFE]에 연결하려면 계정을 갖고 있어야 합니다. 지금 새로운 계정을 만드시겠습니까?
-</f_translation>
-<f_old_trans>
- [SECOND_LIFE]에 연결하려면 계정을 갖고 있어야 합니다.
-www.secondlife.com으로 이동하여 새로운 계정을 만드시겠습니까?
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//MustHaveAccountToLogIn/OK</b_path>
-<c_attribute></c_attribute>
-<d_old>
- OK
- </d_old>
-<e_new>
- Create a new account
- </e_new>
-<f_translation>
- 새 계정 만들기
- </f_translation>
-<f_old_trans>
- 확인
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//MustHaveAccountToLogIn/Cancel</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Cancel
- </d_old>
-<e_new>
- Try again
- </e_new>
-<f_translation>
- 다시 시도
- </f_translation>
-<f_old_trans>
- 취소
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//ChangeSkin/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- New skin will appear after you restart [SECOND_LIFE].
- </d_old>
-<e_new>
- The new skin will appear after you restart [SECOND_LIFE].
- </e_new>
-<f_translation>
- 새로운 스킨은 [SECOND_LIFE]를 재시동한 후 적용됩니다.
- </f_translation>
-<f_old_trans>
- 새로운 스킨은 [SECOND_LIFE]를 재시동후 적용 됩니다.
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//CannotGiveCategory/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- You do not have permission to transfer
- the selected folder.
- </d_old>
-<e_new>
- You do not have permission to transfer
-the selected folder.
- </e_new>
-<f_translation>
- 선택한 아이템을 전송할 수 있는 권한이
-없습니다.
- </f_translation>
-<f_old_trans>
- 아이템 카테고리를 제공할 수 없습니다.
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//CannotBuyLandNoRegion/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Unable to buy land:
- Cannot find the region this land is in.
- </d_old>
-<e_new>
- Unable to buy land:
-Cannot find the region this land is in.
- </e_new>
-<f_translation>
- 토지를 구매하지 못했습니다:
-이 토지가 소속된 지역을 찾을 수 없습니다.
- </f_translation>
-<f_old_trans>
- 토지를 구매하지 못했습니다:
- 이 토지가 소속된 지역을 찾을 수 없습니다.
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//YouHaveBeenLoggedOut/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- You have been logged out of [SECOND_LIFE]:
-[MESSAGE]
-
-Click Continue to look at existing IM and chat.
-You will not be able to perform any other operations.
-Click Quit to exit [SECOND_LIFE] immediately.
- </d_old>
-<e_new>
-You have been logged out of [SECOND_LIFE]:
- [MESSAGE]
-You can still look at existing IM and chat by clicking 'View IM & Chat'. Otherwise, click 'Quit' to exit [SECOND_LIFE] immediately.
- </e_new>
-<f_translation>
-[SECOND_LIFE]에서 로그아웃하셨습니다:
- [MESSAGE]
-기존의 메신저와 채팅을 보려면 '메신저 및 채팅 보기'를 클릭하십시오. 그렇지 않고 [SECOND_LIFE]를 즉시 끝내려면 '종료'를 클릭하십시오.
- </f_translation>
-<f_old_trans>
- [SECOND_LIFE]에서 로그아웃하셨습니다:
-[MESSAGE]
-
-기존의 메신저와 채팅을 보려면 '계속'을 클릭하십시오.
-다른 작업은 수행할 수 없습니다.
-[SECOND_LIFE]를 즉시 끝내려면 '종료'를 클릭하십시오.
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//YouHaveBeenLoggedOut/Continue</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Continue
- </d_old>
-<e_new>
- View IM & Chat
- </e_new>
-<f_translation>
- 메신저 및 채팅 보기
- </f_translation>
-<f_old_trans>
- 계속
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//AddFriend/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Friends can give permissions to
-track each other on the map and
-receive online status updates.
-
-Offer friendship to [NAME]?
- </d_old>
-<e_new>
- Friends can give permissions to track each
-other on the map and receive online status updates.
-
-Offer friendship to [NAME]?
- </e_new>
-<f_translation>
- 친구들은 지도에서 서로의 위치를
-추적할 수 있으며 온라인 상태 업데이트도 받을 수 있습니다.
-
-[NAME]에게 친구 추가를 요청하시겠습니까?
- </f_translation>
-<f_old_trans>
- 친구들은
-지도에서 서로의 위치를 추적할 수 있으며
-온라인 상태 업데이트도 받을 수 있습니다.
-
-[NAME]에게 친구 추가를 요청하시겠습니까?
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//ConfirmClearCookies/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Are you sure you want to clear
-your cookies?
- </d_old>
-<e_new>
- Are you sure you want to clear your cookies?
- </e_new>
-<f_translation>
- 쿠키를 전부 삭제하시겠습니까?
- </f_translation>
-<f_old_trans>
- 쿠키를 전부 삭제 하시겠습니까?
- </f_old_trans>
-</string><string><a_file>alerts.xml</a_file>
-<b_path>//Cannot_Purchase_an_Attachment/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Items may not be purchased while
- they are part of an attachment.
- </d_old>
-<e_new>
- Items may not be purchased while
-they are part of an attachment.
- </e_new>
-<f_translation>
- 착용 중인 아이템은
-구매가 불가능합니다.
- </f_translation>
-<f_old_trans>
- 착용중인 아이템은 구매 불가능 합니다.
- </f_old_trans>
-</string><string><a_file>floater_about_land.xml</a_file>
-<b_path>/floaterland/landtab/land_access_panel/estate_override</b_path>
-<c_attribute></c_attribute>
-<d_old>
- One ore more of these options is set at the estate level
- </d_old>
-<e_new>
- One or more of these options is set at the estate level
- </e_new>
-<f_translation>
- 이러한 옵션 중 하나 이상이 사유지 레벨에 설정되어 있습니다.
- </f_translation>
-<f_old_trans>
- 이러한 옵션 중 하나 이상이 사유지 레벨에 설정되어 있습니다.
- </f_old_trans>
-</string><string><a_file>floater_im.xml</a_file>
-<b_path>/im_floater/muted_message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- [FIRST] [LAST] is muted.
- </d_old>
-<e_new>
- You have muted this resident. Sending a message will automatically unmute them.
- </e_new>
-<f_translation>
- 이 주민이 음소거되었습니다. 이 주민에게 메시지를 보내면 음소거가 자동으로 해제됩니다.
- </f_translation>
-<f_old_trans>
- 주민님이 음소거되었습니다.
- </f_old_trans>
-</string><string><a_file>floater_postcard.xml</a_file>
-<b_path>/Postcard</b_path>
-<c_attribute>title</c_attribute>
-<d_old>Send Postcard</d_old>
-<e_new>Email Snapshot</e_new>
-<f_translation>이메일로 스냅샷 보내기</f_translation>
-<f_old_trans>엽서 보내기</f_old_trans>
-</string><string><a_file>floater_postcard.xml</a_file>
-<b_path>/Postcard/fine_print</b_path>
-<c_attribute></c_attribute>
-<d_old>
- If your postcard recipient joins SL, you'll get a referral bonus.
- </d_old>
-<e_new>
- If your recipient joins SL, you'll get a referral bonus.
- </e_new>
-<f_translation>
- 수령인이 세컨드라이프에 가입을 하면 추천 보너스를 얻게 됩니다.
- </f_translation>
-<f_old_trans>
- 엽서 수령인이 세컨드라이프에 가입 할 경우 추천 보너스를 얻게 됩니다.
- </f_old_trans>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Intolerance</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Intolerance
- </d_old>
-<e_new>
-Intolerance
-</e_new>
-<f_translation>
-참을 수 없는 행위
-</f_translation>
-<f_old_trans>
- 굴욕
- </f_old_trans>
-</string><string><a_file>floater_report_abuse.xml</a_file>
-<b_path>/floater_report_abuse/category_combo/Other</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Other
- </d_old>
-<e_new>
-Other
-</e_new>
-<f_translation>
-기타
-</f_translation>
-<f_old_trans>
- 기타
- </f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/type_label</b_path>
-<c_attribute></c_attribute>
-<d_old>
- What would you like to do?
- </d_old>
-<e_new>
- Snapshot destination
- </e_new>
-<f_translation>
- 스냅샷 대상
- </f_translation>
-<f_old_trans>
- 스냅샷 용도
- </f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/snapshot_type_radio/postcard</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Send a postcard
- </d_old>
-<e_new>
- Send via email
- </e_new>
-<f_translation>
- 이메일로 보내기
- </f_translation>
-<f_old_trans>
- 엽서 보내기
- </f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/snapshot_type_radio/texture</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Upload a snapshot
- </d_old>
-<e_new>
- Save to your inventory (L$10)
- </e_new>
-<f_translation>
- 인벤토리에 저장(L$10)
- </f_translation>
-<f_old_trans>
- 인벤토리에 저장
- </f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/snapshot_type_radio/local</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Save snapshot to hard drive
- </d_old>
-<e_new>
- Save to your hard drive
- </e_new>
-<f_translation>
- 하드 드라이브에 저장
- </f_translation>
-<f_old_trans>
- 하드 드라이브에 저장
- </f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/upload_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Upload (L$10)</d_old>
-<e_new>Save (L$10)</e_new>
-<f_translation>저장(L$10)</f_translation>
-<f_old_trans>업로드(L$10)</f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/type_label2</b_path>
-<c_attribute></c_attribute>
-<d_old>
- What size image do you need?
- </d_old>
-<e_new>
- Size
- </e_new>
-<f_translation>
- 크기
- </f_translation>
-<f_old_trans>
- 이미지 크기
- </f_old_trans>
-</string><string><a_file>floater_snapshot.xml</a_file>
-<b_path>/Snapshot/auto_snapshot_check</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Auto-snapshot</d_old>
-<e_new>Auto-refresh</e_new>
-<f_translation>자동 새로 고침</f_translation>
-<f_old_trans>자동 스냅샷</f_old_trans>
-</string><string><a_file>menu_pie_avatar.xml</a_file>
-<b_path>/Avatar Pie/Add Friend</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Add Friend</d_old>
-<e_new>Add Friend...</e_new>
-<f_translation>친구 추가...</f_translation>
-<f_old_trans>친구 추가</f_old_trans>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//OfferFriendship/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- [NAME] is offering friendship.
-
- By default, you will be able to
-see each other's online status.
- </d_old>
-<e_new>
- [NAME] is offering friendship.
-
-[MESSAGE]
-
-(By default, you will be able to see each other's online status.)
- </e_new>
-<f_translation>
- [NAME]님이 친구 사귀기를 제안합니다.
-
-[MESSAGE]
-
-(기본적으로 사용자는 서로의 온라인 상태를 확인할 수 있습니다.)
- </f_translation>
-<f_old_trans>
- [NAME]님이 우정을 제안합니다.
-
- 기본적으로 사용자는
-서로의 온라인 상태를 확인할 수 있습니다.
- </f_old_trans>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//FailedToLoadWearableUnnamed/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Failed to load [TYPE].
-Please notify the vendor from whom you purchased this item.
- </d_old>
-<e_new>
- Oops!
-You tried to wear a [TYPE] and it did not load.
-
-Don't panic.
-Try again in a minute to give things a chance to settle down.
- </e_new>
-<f_translation>
- 죄송합니다.
-[TYPE] 착용을 시도했지만 로드하지 못했습니다.
-
-당황하지 마십시오.
-몇 분 후 다시 시도해서 오브젝트를 제대로 로드하십시오.
- </f_translation>
-<f_old_trans>
- [TYPE]을(를) 로드하지 못했습니다.
-이 오브젝트의 판매자에게 알리십시오.
- </f_old_trans>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//FailedToLoadWearable/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Failed to load [TYPE] named [DESC].
-Please notify the vendor from whom you purchased this item.
- </d_old>
-<e_new>
- Oops!
-You tried to wear [TYPE] named [DESC] and it did not load.
-
-Don't panic.
-Try again in a minute to give things a chance to settle down.
- </e_new>
-<f_translation>
- 죄송합니다.
-[DESC](이)라는 [TYPE] 착용을 시도했지만 로드하지 못했습니다.
-
-당황하지 마십시오.
-몇 분 후 다시 시도해서 오브젝트를 제대로 로드하십시오.
- </f_translation>
-<f_old_trans>
- [DESC](이)라는 [TYPE]을(를) 로드하지 못했습니다.
-이 오브젝트를 구입한 판매자에게 알리십시오.
- </f_old_trans>
-</string><string><a_file>notify.xml</a_file>
-<b_path>//FirstTeleport/message</b_path>
-<c_attribute></c_attribute>
-<d_old>
- You have just teleported.
-You are at the Infohub nearest your destination.
-Your destination is marked with a tall red beacon.
- </d_old>
-<e_new>
- This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub.
-Your destination is marked with a tall beacon.
-Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
- </e_new>
-<f_translation>
- 이 지역에서는 두 지점 간 텔레포트가 허용되지 않기 때문에 가장 가까운 텔레허브로 이동되었습니다.
-목적지는 큰 표지로 표시되어 있습니다.
-표지의 빨간색 화살표를 따라가거나 표지를 무시하려면 화살표를 클릭하십시오.
- </f_translation>
-<f_old_trans>
- 방금 텔레포트되었습니다.
-목적지에서 가장 가까운 인포허브에 있습니다.
-목적지는 큰 빨간색 표지로 표시되어 있습니다.
- </f_old_trans>
-</string><string><a_file>panel_login.xml</a_file>
-<b_path>/panel_login/connect_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Connect</d_old>
-<e_new>Enter Second Life</e_new>
-<f_translation>세컨드라이프 연결</f_translation>
-<f_old_trans>연결</f_old_trans>
-</string><string><a_file>panel_preferences_chat.xml</a_file>
-<b_path>/chat/script_error</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Color</d_old>
-<e_new>Errors</e_new>
-<f_translation>오류</f_translation>
-<f_old_trans>색</f_old_trans>
-</string><string><a_file>panel_preferences_skins.xml</a_file>
-<b_path>/Skins panel/skin_selection/default</b_path>
-<c_attribute></c_attribute>
-<d_old>
- Classic
- </d_old>
-<e_new>
- Default
- </e_new>
-<f_translation>
- 기본 설정
- </f_translation>
-<f_old_trans>
- 클래식
- </f_old_trans>
-</string><string><a_file>panel_region_debug.xml</a_file>
-<b_path>/Debug/choose_avatar_btn</b_path>
-<c_attribute>label</c_attribute>
-<d_old>Choose Avatar...</d_old>
-<e_new>Choose...</e_new>
-<f_translation>선택</f_translation>
-<f_old_trans>아바타 선택</f_old_trans>
-</string>
-</strings>
diff --git a/indra/newview/skins/default/xui/pt/alerts.xml b/indra/newview/skins/default/xui/pt/alerts.xml
index 3464521..a384f60 100644
--- a/indra/newview/skins/default/xui/pt/alerts.xml
+++ b/indra/newview/skins/default/xui/pt/alerts.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<alerts>
+ <global name="skipnexttime">
+ Não exibir isso novamente
+ </global>
+ <global name="alwayschoose">
+ Sempre escolher essa opção
+ </global>
<alert name="MissingAlert">
<message name="message">
[ALERT_NAME] não encontrado no alerts.xml
@@ -16,10 +22,13 @@
OK
</option>
</alert>
- <alert name="MOTD" title="Mensagem do dia">
+ <alert name="TutorialNotFound">
<message name="message">
- [MOTD]
+ Nenhum tutorial está disponível no momento.
</message>
+ <option name="OK">
+ OK
+ </option>
</alert>
<alert name="GenericAlert">
<message name="message">
@@ -44,7 +53,10 @@
</alert>
<alert name="ConnectTimeout">
<message name="message">
- Não foi possível conectar-se ao [SECOND_LIFE]. O sistema pode estar desativado. Por favor, tente novamente em alguns minutos, ou clique em Ajuda para mais informações e exibir a situação da página da web.
+ Impossibilitado de se conectar ao [SECOND_LIFE].
+O sistema pode ter caído.
+
+Por favor, tente novamente em alguns minutos ou clique Ajuda para sugestões e um link para a página web de status do sistema.
</message>
<option name="OK">
OK
@@ -67,34 +79,6 @@
Cancelar
</option>
</alert>
- <alert name="RemoveWearableSave">
- <message name="message">
- Salvar alterações de roupas/partes do corpo atuais?
- </message>
- <option name="Save">
- Salvar
- </option>
- <option name="Don'tSave">
- Não Salvar
- </option>
- <option name="Cancel">
- Cancelar
- </option>
- </alert>
- <alert name="SetWearableSave">
- <message name="message">
- Salvar alterações de roupas/ partes do corpo atuais?
- </message>
- <option name="Save">
- Salvar
- </option>
- <option name="Don'tSave">
- Não Salvar
- </option>
- <option name="Cancel">
- Cancelar
- </option>
- </alert>
<alert name="CompileQueueSaveText">
<message name="message">
Houve um problema com o carregamento do texto para um script devido a seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
@@ -104,7 +88,6 @@
<message name="message">
Houve um problema durante o carregamento de um script compilado devido a seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
</message>
-
</alert>
<alert name="WriteAnimationFail">
<message name="message">
@@ -152,7 +135,20 @@
</alert>
<alert name="GrantModifyRights">
<message name="message">
- Permite que um outro residente modifique QUALQUER objeto que você tenha no Second Life. Seja muito cuidadoso quando lidar com essa permissão. Você deseja garantir os direitos de edição para [FIRST_NAME] [LAST_NAME]?
+ Conceder direitos de modificar a outros residentes lhes permite trocar, deletar ou pegar QUAISQUER objetos que você possa ter no mundo. Seja MUITO cuidadoso(a) quando passar esta permissão.
+Você deseja conceder direitos de modificar para [FIRST_NAME] [LAST_NAME]?
+ </message>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Não
+ </option>
+ </alert>
+ <alert name="GrantModifyRightsMultiple">
+ <message name="message">
+ Conceder direitos para modificar seus objetos a outro residente permite ele mudar QUAISQUER objetos que você possa ter no mundo. Tenha muito cuidado quando conceder essa permissão.
+Você deseja permitir que os residentes selecionados tenham direito de edição?
</message>
<option name="Yes">
Sim
@@ -172,6 +168,17 @@
Não
</option>
</alert>
+ <alert name="RevokeModifyRightsMultiple">
+ <message name="message">
+ Você quer revogar direitos para modificar dos residentes selecionados?
+ </message>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Não
+ </option>
+ </alert>
<alert name="RemoveFriend">
<message name="message">
Você quer remover [FIRST] [LAST] dos seus amigos?
@@ -253,9 +260,6 @@
<message name="message">
Você está para adicionar membros do grupo a função de [ROLE_NAME]. Membros não podem ser removidos dessa função. Os membros devem sair por si mesmos. Deseja continuar?
</message>
- <ignore>
- Quando adicionar membros do grupo a funçõa de Proprietário.
- </ignore>
<ignore name="ignore">
Quando adcionar membro ao grupo como dono.
</ignore>
@@ -295,7 +299,16 @@
</alert>
<alert name="ClickPublishHelpLand">
<message name="message">
- Selecionar a opção "Publicar na Web" nos permitirá publicar o nome, descrição, imagens e localização deste terreno no website [SECOND_LIFE]. Você é responsável por indicar se algum dos conteúdos acima for considerado Adulto de acordo com as Regras da Comunidade.
+ Selecionando "Publicar na Busca"
+Clicando neste Box, será mostrado:
+- este terreno nos resultados de busca
+- os objetos públicos deste terreno
+- este terreno na busca da web
+ </message>
+ </alert>
+ <alert name="ClickPublishHelpLandDisabled">
+ <message name="message">
+ Você não pode fazer essa parcela vista na Busca porque está localizada numa região que proíbe isso.
</message>
</alert>
<alert name="ClickPublishHelpPostcard">
@@ -305,12 +318,20 @@
</alert>
<alert name="ClickPublishHelpAvatar">
<message name="message">
- Selecionar a opção "Publicar na Web" nos permitirá publicar seu nome, imagem e textos no website [SECOND_LIFE].
+ Selecionando "Mostrar na Busca" será mostrado:
+- meu perfil nos resultados de busca
+- um link para meu perfil nas páginas de grupos públicos
</message>
</alert>
<alert name="ClickWebProfileHelpAvatar">
<message name="message">
- Se esse residente tem um perfil URL na web então você pode: *Clique em Carregar para carregar a página como um web browser encaixado. * Clique em Abrir para ver extrenamente no seu web browser padrão. Quando visualizar seu perfil você pode entrar com qualquer URL que especificar quando eles acessarem seu perfil.
+ Se este Residente definiu uma URL de perfil na web, então você pode:
+ * Clicar em 'Carregar' para ver a página na aba Web.
+ * Clicar Carregar > 'Em navegador externo' para ver a página no seu navegador de web padrão.
+ * Clicar Carregar > 'URL de Casa' para voltar ao perfil do Residente na web se você navegou adiante.
+
+Quando você está vendo seu próprio perfil, você pode entrar com qualquer URL como sendo seu perfil na web e clicar OK para defini-la.
+Outros residentes podem visitar a URL que você definiu, quando eles olharem seu perfil.
</message>
</alert>
<alert name="ClickWebProfileNoWebHelpAvatar">
@@ -378,7 +399,8 @@
</alert>
<alert name="JoinGroupCannotAfford">
<message name="message">
- Unir-se a esse grupo custa L$[COST]. Você não tem fundos suficientes para se unir a esse grupo.
+ Associar-se a este grupo custa L$[COST].
+Você não tem L$ suficientes para associar-se a este grupo.
</message>
</alert>
<alert name="LandBuyPass">
@@ -413,6 +435,20 @@
Cancelar
</option>
</alert>
+ <alert name="ConfirmLandSaleToAnyoneChange">
+ <message name="message">
+ ATENÇÃO: Ao clicar em 'vender para qualquer um' torna a sua terra disponível para toda a comunidade Second Life, mesmo aqueles que não estão nesta região.
+
+A área de [LAND_SIZE] m2 de terra selecionada está posta para venda.
+Seu preço de venda será L$ [SALE_PRICE] e está autorizado para [NAME].
+ </message>
+ <option name="Continue">
+ OK
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
+ </alert>
<alert name="ReturnObjectsDeededToGroup">
<message name="message">
Você tem certeza de que quer retornar todos os objetos compartterrenodos com o grupo '[NAME]' neste lote para o inventário do seu antigo Proprietário? *AVISO* Isso irá apagar os objetos não transferíveis para o grupo! Objetos: [N]
@@ -467,7 +503,6 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ReturnAllTopObjects">
<message name="message">
@@ -479,7 +514,6 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="DisableAllTopObjects">
<message name="message">
@@ -491,7 +525,6 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ReturnObjectsNotOwnedByGroup">
<message name="message">
@@ -503,107 +536,98 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="UnableToDisableOutsideScripts">
<message name="message">
Não é possível desabilitar scripts externos. Toda esta região possui dano habilitado. Scripts devem ser permitidos para fazer as armas funcionarem.
</message>
-
</alert>
<alert name="MustBeInParcel">
<message name="message">
Você deve permanecer dentro do lote para o Landing Point.
</message>
-
</alert>
<alert name="PromptRecipientEmail">
<message name="message">
Por favor, insira o endereço de e-mail do destinatário.
</message>
-
</alert>
<alert name="PromptSelfEmail">
<message name="message">
Por favor, insira seu endereço de e-mail.
</message>
-
+ </alert>
+ <alert name="PromptMissingSubjMsg">
+ <message name="message">
+ Enviar por email uma foto instantânea com o assunto ou mensagem padrão?
+ </message>
+ <option name="OK">
+ OK
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="ErrorProcessingSnapshot">
<message name="message">
Erro processando dados de imagem.
</message>
-
</alert>
<alert name="ErrorEncodingSnapshot">
<message name="message">
Erro encoding imagem!
</message>
-
</alert>
<alert name="ErrorUploadingPostcard">
<message name="message">
- Houve um problema ao carregar um cartão postal devido a seguinte razão: [REASON]
+ Houve um problema ao enviar a foto instantânea devido à seguinte razão: [REASON]
</message>
-
</alert>
<alert name="ErrorUploadingReportScreenshot">
<message name="message">
Houve um problema ao carregar um reporte de imagem devido a seguinte razão: [REASON]
</message>
-
</alert>
<alert name="MustAgreeToLogIn">
<message name="message">
Você deve concordar com os Termos de Serviço para continuar a entrar no [SECOND_LIFE].
</message>
-
</alert>
<alert name="CouldNotPutOnOutfit">
<message name="message">
Não foi possível inserir no visual. A pasta visual não contém roupas, partes do corpo ou acessórios.
</message>
-
</alert>
<alert name="CannotWearTrash">
<message name="message">
Não é possível usar roupas ou partes do corpo que estão no lixo.
</message>
-
</alert>
<alert name="CannotWearInfoNotComplete">
<message name="message">
Não é possível usar um item uma vez que sua configuração ainda não esteja disponível. Por favor, tente novamente em um minuto.
</message>
-
- </alert>
- <alert name="MustHaveAccountToLogInNoLinks">
- <message name="message">
- Você deve ter uma conta para conectar ao [SECOND_LIFE].
- </message>
- <option name="OK">
- OK
- </option>
- <option name="Cancel">
- Cancelar
- </option>
-
</alert>
<alert name="MustHaveAccountToLogIn">
<message name="message">
- Você deve ter uma conta para conectar ao [SECOND_LIFE]. Ir ao www.secondlife.com para criar uma nova conta?
+ Oops! Alguma coisa foi deixada em branco.
+Você precisa entrar com ambos os Nome e Sobrenome do seu avatar.
+
+Você precisa de uma conta para entrar no [SECOND_LIFE]. Você gostaria de criar uma conta agora?
</message>
<option name="OK">
- OK
+ Criar uma nova conta
</option>
<option name="Cancel">
- Cancelar
+ Tentar novamente
</option>
-
</alert>
<alert name="AddClassified">
<message name="message">
- Anúncios postados aparecem na seção "Classificados" do diretório de Busca por uma semana. Preencha seu formulário, então clique em "Publicar" para adicioná-lo ao diretório. Você receberá uma notificação de cobrança após clicar em Publicar. Pagar mais fará seu anúncio aparecer mais ao topo da lista e também quando as pessoas procurarem por palavras chave.
+ Anúncios classificados aparecem na seção 'Classificados' do diretório de Busca e no www.secondlife.com por uma semana.
+Preencha seu anúncio e então clique 'Publicar...' para adicioná-lo ao diretório.
+Será solicitado a você um preço a ser pago, quando você clicar Publicar.
+Pagando mais, faz com que seu anúncio apareça em posição mais alta na lista e também em posição mais alta, quando as pessoas buscarem por palavras-chave.
</message>
<option name="OK">
OK
@@ -611,10 +635,9 @@
<option name="Cancel">
Cancelar
</option>
- <ignore>
- Quando adicionar um anúncio
+ <ignore name="ignore">
+ Quando adicionando um Classificado novo
</ignore>
-
</alert>
<alert name="DeleteClassified">
<message name="message">
@@ -626,7 +649,20 @@
<option name="Cancel">
Cancelar
</option>
-
+ </alert>
+ <alert name="ClassifiedSave">
+ <message name="message">
+ Salvar as mudanças no classificado [NAME]?
+ </message>
+ <option name="Save">
+ Salvar
+ </option>
+ <option name="Don'tSave">
+ Não Salvar
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="DeleteAvatarPick">
<message name="message">
@@ -638,7 +674,6 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="DisplayChangeRestart">
<message name="message">
@@ -650,7 +685,6 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="PromptGoToEventsPage">
<message name="message">
@@ -662,35 +696,41 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="MustSelectCandidate">
<message name="message">
Você deve selecionar um candidato antes de votar.
</message>
-
</alert>
<alert name="SelectItemToView">
<message name="message">
Por favor, selecione um item para visualizar.
</message>
-
</alert>
<alert name="SelectProposalToView">
<message name="message">
Por favor, selecione uma proposta para votar.
</message>
-
</alert>
<alert name="SelectHistoryItemToView">
<message name="message">
Por favor, selecione o histórico de itens para exibí-lo.
</message>
-
</alert>
<alert name="ResetShowNextTimeDialogs">
<message name="message">
- Resetar tudo. Reset all 'Show next time' dialogs?
+ Você gostaria de reabilitar todas estas popups que você indicou previamente como 'Não mostrar-me novamente'?
+ </message>
+ <option name="OK">
+ OK
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
+ </alert>
+ <alert name="SkipShowNextTimeDialogs">
+ <message name="message">
+ Você gostaria de desabilitar todas as popups que podem ser puladas?
</message>
<option name="OK">
OK
@@ -698,13 +738,11 @@
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="CacheWillClear">
<message name="message">
O cache será limpo uma vez resetada.
</message>
-
</alert>
<alert name="CacheWillBeMoved">
<message name="message">
@@ -717,6 +755,11 @@ Nota: Isto limpará o cache.
Configuração de porta terá efeito após reiniciar [SECOND_LIFE].
</message>
</alert>
+ <alert name="ChangeSkin">
+ <message name="message">
+ A nova pele será exibida após reiniciar [SECOND_LIFE].
+ </message>
+ </alert>
<alert name="GoToAuctionPage">
<message name="message">
Ir para a página do [SECOND_LIFE] para ver os detalhes do leilão ou fazer um lance?
@@ -727,7 +770,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="SaveChanges">
<message name="message">
@@ -742,43 +784,36 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="GestureSaveFailedTooManySteps">
<message name="message">
Falha ao salvar Gesto. Este gesto possui muitos passos.Tente remover alguns passos e salve-o novamente.
</message>
-
</alert>
<alert name="GestureSaveFailedTryAgain">
<message name="message">
Falha ao salvar Gesto. Por favor, tente em uma minuto.Gesture save failed.
</message>
-
</alert>
<alert name="GestureSaveFailedObjectNotFound">
<message name="message">
Não foi possível salvar um Gesto pois o objeto ou o objeto associado ao inventário não foi encontrado. O objeto pode estar fora de alcance. Objeto pode estar fora de alcance ou estar deletado.
</message>
-
</alert>
<alert name="GestureSaveFailedReason">
<message name="message">
Houve um problema em salvar um gesto devido a seguinte razão: [REASON]. Por favor, tente salvar o Gesto depois.
</message>
-
</alert>
<alert name="SaveNotecardFailObjectNotFound">
<message name="message">
Não foi possível salvar uma nota pois o objeto ou o objeto associado ao inventário não pôde ser encontrado.
</message>
-
</alert>
<alert name="SaveNotecardFailReason">
<message name="message">
Houve um problema em salvar uma nota devido a seguinte razão: [REASON]. Por favor, tente re-salvar a nota mais tarde.
</message>
-
</alert>
<alert name="ScriptCannotUndo">
<message name="message">
@@ -790,55 +825,46 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="SaveScriptFailReason">
<message name="message">
Houve um problema em salvar um script devido a seguinte razão: [REASON]. Por favor, tente salvar novamente o script.
</message>
-
</alert>
<alert name="SaveScriptFailObjectNotFound">
<message name="message">
Não foi possível salvar o script pois o objeto ativo não pôde ser encontrado. O objeto pode estar fora de alcance ou ter sido deletado.
</message>
-
</alert>
<alert name="SaveBytecodeFailReason">
<message name="message">
Houve um problema em salvar uma compilação de script devido a seguinte razão: [REASON]. Por favor, tente salvar novamente o script.
</message>
-
</alert>
<alert name="CouldNotStartStopScript">
<message name="message">
Não foi possível iniciar o script pois o objeto ativo não pôde ser encontrado. O objeto pode estar fora de alcance ou ter sido deletado.
</message>
-
</alert>
<alert name="CannotDownloadFile">
<message name="message">
Não foi possível baixar o arquivo.
</message>
-
</alert>
<alert name="CannotWriteEncode">
<message name="message">
Não foi possível encoder o arquivo [[FILE]]
</message>
-
</alert>
<alert name="CannotWriteFile">
<message name="message">
Não foi possível escrever o arquivo [[FILE]]
</message>
-
</alert>
<alert name="CannotLoadWearable">
<message name="message">
Desculpe, não foi possível carregar o arquivo utilizado.
</message>
-
</alert>
<alert name="ConfirmDeleteComplicated">
<message name="message">
@@ -850,13 +876,70 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="DisplaySettingsSafe">
<message name="message">
Os ajustes de display foram configurados para os níveis de segurança, porque você especificou - opção salvar.
</message>
+ </alert>
+ <alert name="UnsupportedGLRequirements">
+ <message name="message">
+ Você não parece ter requisitos de hardware recomendados para Second Life. Second Life exige uma placa gráfica OpenGL que tem apoio a multi- texturas. Se este for o caso, você pode se certificar de que tem os drivers mais recentes para sua placa gráfica, e os patches e pacotes de serviços para seu sistema operacional.
+Se continuar com problemas, por favor visite: http://www.secondlife.com/support
+ </message>
+ </alert>
+ <alert name="UnsupportedHardware">
+ <message name="message">
+ Aviso: Seu sistema não é compatível com os requisitos mínimos exigidos pelo Second Life. Se você continuar usando o Second Life pode experimentar uma performance ruim. Infelizmente não podemos oferecer suporte técnico para configurações de sistema não suportado.
+
+MINSPECS
+Do you wish to visit [_URL] for more information?
+ </message>
+ <ignore name="ignore">
+ Ao detectar hardware não suportado
+ </ignore>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Não
+ </option>
+ </alert>
+ <alert name="UnsupportedGPU">
+ <message name="message">
+ - A sua placa de vídeo parece não atender os requisitos mínimos exigidos.
+ </message>
+ </alert>
+ <alert name="UnsupportedCPU">
+ <message name="message">
+ - A velocidade da sua CPU não suporta os requisitos mínimos exigidos.
+ </message>
+ </alert>
+ <alert name="UnsupportedCPUAmount">
+ <message name="message">
+ 796
+ </message>
+ </alert>
+ <alert name="UnsupportedRAM">
+ <message name="message">
+ - A memória do seu sistema não suporta os requisitos mínimos exigidos.
+ </message>
+ </alert>
+ <alert name="UnsupportedRAMAmount">
+ <message name="message">
+ 510
+ </message>
+ </alert>
+ <alert name="UnknownGPU">
+ <message name="message">
+ Seu sistema possui uma placa gráfica que nos é desconhecido neste momento.
+Freqüentemente neste caso com um novo hardware, não tivemos a chance de testar. Second Life vai muito provavelmente executar corretamente, mas talvez seja necessária ajustar suas configurações de gráficos para algo mais apropriado.
+(Menu Editar > Preferências > Gráficos).
+ </message>
+ <ignore name="ignore">
+ Ao detectar uma placa de vídeo desconhecida
+ </ignore>
</alert>
<alert name="DisplaySettingsRecommended">
<message name="message">
@@ -865,21 +948,20 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="DisplaySettingsNoShaders">
<message name="message">
- [SECOND_LIFE] teve uma falha tentando inicializar os drivers gráficos.
- As sombras serão desabilitadas para evitar erros de drivers
- Recomendamos que você atualize seu drive de vídeo.
- A sombras poderam ser abilitadas novamente nas Preferências.
+ [SECOND_LIFE] travou quando inicializava os drivers gráficos.
+A Qualidade Gráfica será ajustada para baixa, para evitar alguns erros comuns de drivers.
+Isto irá desabilitar alguns atributos gráficos.
+Nós recomendamos a atualização dos drivers de sua placa gráfica.
+A Qualidade Gráfica pode ser aumentada no Preferências > Gráficos.
</message>
</alert>
<alert name="CannotRequestDomain">
<message name="message">
Não foi possível conectar ao servidor. Requisição do domínio [HOST] impossível.
</message>
-
</alert>
<alert name="CannotFindDomain">
<message name="message">
@@ -891,49 +973,41 @@ Nota: Isto limpará o cache.
<option name="Help">
Ajuda
</option>
-
</alert>
<alert name="PromptSelectServer">
<message name="message">
Por favor, selecione um servidor. Não foi possível se conectar ao [SERVER]
</message>
-
</alert>
<alert name="CannotConnectDNSError">
<message name="message">
Não foi possível conectar-se ao [SECOND_LIFE]. DNS por não encontrar o nome do host. Por favor, verifique se você pode conectar-se ao www.secondlife.com. Caso consiga, mas continue a receber esse erro, por favor entre em contato com o suporte e relate este problema.
</message>
-
</alert>
<alert name="CannotConnectSecurityError">
<message name="message">
Não foi possível estabelecer uma conexão segura com o servidor de entrada. Geralmente isso significa que o relógio de seu computador está configurado incorretamente. Por favor, vá até ao Painel de Controle e certifique-se que a data/hora estejam corretas. Se continuar a receber esse erro, por favor informe a Equipe de Suporte.
</message>
-
</alert>
<alert name="CannotConnectVerificationError">
<message name="message">
Não foi possível conectar-se ao [SECOND_LIFE]. O servidor de entrada não pôde verificá-lo via SSL. Caso você continue a receber este erro, por favor informar a Equipe de Suporte.
</message>
-
</alert>
<alert name="CannotConnectUnknownErrorWindows">
<message name="message">
Não foi possível conectar-se ao [SECOND_LIFE]. Apesar dos nossos esforços, algo inesperado aconteceu. Por favor, vá a seção de Suporte e reporte este problema a Equipe de Suporte. Se possível, inclua seu arquivo de log do SL (C:\Documents and Settings\(name)\Application Data\SecondLife\logs. Obrigado.
</message>
-
</alert>
<alert name="CannotConnectUnknownErrorDarwin">
<message name="message">
Não foi possível conectar-se ao [SECOND_LIFE]. Apesar dos nossos esforços, algo inesperado aconteceu. Por favor, vá a seção de Suporte e reporte este problema a Equipe de Suporte. Se possível, inclua seu arquivo de log (~/Library/Application Support/SecondLife/logs). Obrigado.
</message>
-
</alert>
<alert name="CannotResolveLoginToken">
<message name="message">
Houve um problema ao realizar a autenticação de seu login. Por favor, tente entrar novamente. Caso continue a receber esse erro, por favor vá a seção de Suporte e reporte esse problema a Equipe de Suporte.
</message>
-
</alert>
<alert name="CannotConnectNoMessage">
<message name="message">
@@ -945,7 +1019,6 @@ Nota: Isto limpará o cache.
<option name="Help">
Ajuda
</option>
-
</alert>
<alert name="CannotConnectNoReplyFromLogin">
<message name="message">
@@ -957,13 +1030,11 @@ Nota: Isto limpará o cache.
<option name="Help">
Ajuda
</option>
-
</alert>
<alert name="CannotConnectLoginTimeout">
<message name="message">
Login terminado por aguardar por sua localização dentro do mundo. Por favor, tente novamente.
</message>
-
</alert>
<alert name="FirstRunDialog">
<message name="message">
@@ -975,31 +1046,16 @@ Nota: Isto limpará o cache.
<option name="Continue">
Continuar
</option>
-
</alert>
<alert name="ClothingStillDownloading">
<message name="message">
Suas roupas ainda estão carregando. Você pode explorar o mundo normalmente, e os outros residentes irão vê-lo corretamente.
</message>
-
</alert>
<alert name="CannotResolveDomain">
<message name="message">
Não foi possível conectar-se ao servidor. Não encontrado o nome do domínio: [DOMAIN]. Por favor, confira sua conexão de rede.
</message>
-
- </alert>
- <alert name="CannotConnectLoginPacket">
- <message name="message">
- Não foi possível conectar-se. O pacote de entrada não fi recebido pelo servidor de entrada. Por favor, tente novamente em poucos minutos ou clique em Ajuda para maiores informações sobre o status do sistema.
- </message>
- <option name="OK">
- OK
- </option>
- <option name="Help">
- Ajuda
- </option>
-
</alert>
<alert name="WelcomeToSecondLife">
<message name="message">
@@ -1011,7 +1067,6 @@ Nota: Isto limpará o cache.
<option name="Female">
Feminino
</option>
-
</alert>
<alert name="WelcomeToSecondLifeSimple">
<message name="message">
@@ -1023,25 +1078,11 @@ Nota: Isto limpará o cache.
<option name="Female">
Feminino
</option>
-
- </alert>
- <alert name="ConfirmQuit">
- <message name="message">
- Deseja sair?
- </message>
- <option name="Yes">
- Sim
- </option>
- <option name="No">
- Não
- </option>
-
</alert>
<alert name="RegionNoTerraforming">
<message name="message">
A região [REGION] não permite ser plainada. Você precisará comprar um lote em outra parte do mundo para fazê-lo.
</message>
-
</alert>
<alert name="CannotCopyWarning">
<message name="message">
@@ -1053,31 +1094,26 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="CannotGiveItem">
<message name="message">
Não foi possível entregar o item.
</message>
-
</alert>
<alert name="TransactionCancelled">
<message name="message">
Transação cancelada.
</message>
-
</alert>
<alert name="TooManyItems">
<message name="message">
Não é possível passar muitos itens entre inventários em uma transação simples.
</message>
-
</alert>
<alert name="NoItems">
<message name="message">
- Você não pode dar itens.
+ Você não tem permissão para transferir os itens selecionados.
</message>
-
</alert>
<alert name="CannotCopyCountItems">
<message name="message">
@@ -1089,13 +1125,11 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="CannotGiveCategory">
<message name="message">
- Não foi possível entregar esta categoria de item.
+ Você não tem permissão para transferir a pasta selecionada.
</message>
-
</alert>
<alert name="FreezeAvatar">
<message name="message">
@@ -1110,7 +1144,21 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
+ </alert>
+ <alert name="FreezeAvatarFullname">
+ <message name="message">
+ Congelar [AVATAR_NAME]?
+Ele ou ela vai ficar temporariamente incapaz de se mover,
usar o bate-papo, ou interagir com o mundo.
+ </message>
+ <option name="Freeze">
+ Congelar
+ </option>
+ <option name="Unfreeze">
+ Descongelar
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="EjectAvatar">
<message name="message">
@@ -1125,25 +1173,35 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
+ </alert>
+ <alert name="EjectAvatarFullname">
+ <message name="message">
+ Ejetar [AVATAR_NAME] das suas terras?
+ </message>
+ <option name="Eject">
+ Ejetar
+ </option>
+ <option name="EjectandBan">
+ Ejetar e Banir
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="InvalidUUID">
<message name="message">
UUID inválido
</message>
-
</alert>
<alert name="AcquireErrorTooManyObjects">
<message name="message">
ACQUIRE ERROR: Muitos objetos selecionados.
</message>
-
</alert>
<alert name="AcquireErrorObjectSpan">
<message name="message">
ACQUIRE ERROR: Objetos criados em mais de uma região. Por favor, mova todos os objetos para serem adquiridos em uma mesma região.
</message>
-
</alert>
<alert name="TakeLockedOrNotOwnedBy">
<message name="message">
@@ -1155,11 +1213,12 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="PromptGoToCurrencyPage">
<message name="message">
- [EXTRA] Ir para [URL] para informações sobre adquirir moeda?
+ [EXTRA]
+
+Vá para [URL] para informação sobre compra de dinheiro.
</message>
<option name="GotoPage">
Ir até a página
@@ -1167,37 +1226,37 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="UnableToLinkObjects">
<message name="message">
Não é possível unir estes [COUNT] objetos. Você pode unir um máximo de [MAX] objetos. Tente selecionar menos objetos.
</message>
-
</alert>
<alert name="CannotLinkIncompleteSet">
<message name="message">
Você pode unir apenas conjuntos de objetos, e deve selecionar mais que um objeto.
</message>
-
</alert>
<alert name="CannotLinkModify">
<message name="message">
- Não é possível unir, pois você não tem permissão para alterar todos os objetos. Certifique-se de que nenhum deles esteja trancado e que todos objetos sejam de sua posse.
- </message>
+ Impossibilitado de unir, porque você não tem permissão para modificar todos os objetos.
+Por favor, certifique-se de que nenhum deles está travado e que você é dono de todos eles.
+ </message>
</alert>
<alert name="CannotLinkDifferentOwners">
<message name="message">
- Não é possível unir, pois os objetos não têm o mesmo proprietário. Certifique-se de possuir todos os objetos.
- </message>
+ Impossibilitado de unir porque nem todos os objetos são do mesmo dono.
+Por favor, certifique-se de que você é o dono de todos os objetos selecionados.
+ </message>
</alert>
<alert name="NoFileExtension">
<message name="message">
- Sem arquivos de extensão para o arquivo '[FILE]' Por favor, certifique-se de que o arquivo tenha a extensão correta.
- </message>
+ Nenhuma extensão para o arquivo: '[FILE]'
+Por favor, certifique-se de que o arquivo tem uma extensão de arquivo correta.
+ </message>
</alert>
<alert name="InvalidFileExtension">
<message name="message">
@@ -1206,235 +1265,218 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="CannotUploadSoundFile">
<message name="message">
Não é possível ler o arquivo de som para leitura: [FILE]
</message>
-
</alert>
<alert name="SoundFileNotRIFF">
<message name="message">
O arquivo não aparenta ser um arquivo do tipo RIFF WAVE: [FILE]
</message>
-
</alert>
<alert name="SoundFileNotPCM">
<message name="message">
O arquivo não aparenta ser um arquivo de áudio PCM WAVE: [FILE]
</message>
-
</alert>
<alert name="SoundFileInvalidChannelCount">
<message name="message">
O arquivo possui um número de canais inválidos (deve ser mono ou stereo): [FILE]
</message>
-
</alert>
<alert name="SoundFileInvalidSampleRate">
<message name="message">
O arquivo não aparenta ser um exemplo de freqüência suportada (deve ser 44.1k): [FILE]
</message>
-
</alert>
<alert name="SoundFileInvalidWordSize">
<message name="message">
O arquivo não aparenta ser um tamanho de palavra suportada (deve ser 8 ou 16 bit): [FILE]
</message>
-
</alert>
<alert name="SoundFileInvalidHeader">
<message name="message">
Não pode ser encontrado dado, bloco em cabeçalho WAV: [FILE]
</message>
-
</alert>
<alert name="SoundFileInvalidTooLong">
<message name="message">
Arquivo de áudio é muito longo (no máximo 10 segundos): [FILE]
</message>
-
</alert>
<alert name="ProblemWithFile">
<message name="message">
Problemas com o arquivo [FILE]: [ERROR]
</message>
-
</alert>
<alert name="CannotOpenTemporarySoundFile">
<message name="message">
Não pode abrir o arquivo de som comprimido para inscrição: [FILE]
</message>
-
</alert>
<alert name="UnknownVorbisEncodeFailure">
<message name="message">
Falha desconhecida de codificação vorbis: [FILE]
</message>
-
</alert>
<alert name="CorruptResourceFile">
<message name="message">
Fonte do arquivo corrompida: [FILE]
</message>
-
</alert>
<alert name="UnknownResourceFileVersion">
<message name="message">
Arquivo de recurso de versão Linden desconhecido: [FILE]
</message>
-
</alert>
<alert name="UnableToCreateOutputFile">
<message name="message">
Incapaz de criar arquivo de saída: [FILE]
</message>
-
</alert>
<alert name="DoNotSupportBulkAnimationUpload">
<message name="message">
Atualmente, não suportamos o envio de arquivos de animação em massa.
</message>
-
</alert>
<alert name="CannotAccessOutputFile">
<message name="message">
Incapaz de acessar o arquivo de saída: [FILE]
</message>
-
</alert>
<alert name="InsufficientFundsToUploadFile">
<message name="message">
Valor insuficiente para carregar o arquivo: O valor é L$[COST], seu saldo é L$ [BALANCE].
</message>
-
</alert>
<alert name="InsufficientFundsToFinishUpload">
<message name="message">
Valor insuficiente para terminar carregamento do arquivo [FILE]: valor é L$ [COST], o seu saldo é L$[BALANCE]:
</message>
-
</alert>
<alert name="CannotUploadReason">
<message name="message">
Incapaz de carregar [FILE] devido ao seguinte motivo: [REASON] Por favor tente novamente.
</message>
-
</alert>
<alert name="CannotCreateLandmarkNotOwner">
<message name="message">
Você não pode criar um ponto de referência porque o proprietário do terreno não permite. Tente novamente a alguns metros de distância.
</message>
-
</alert>
<alert name="CannotRecompileSelectObjectsNoScripts">
<message name="message">
Não é possível realizar compilação. Selecione os objetos com scripts válidos.
</message>
-
</alert>
<alert name="CannotRecompileSelectObjectsNoPermission">
<message name="message">
- Não é possível realizar compilação. Selecione objetos com scripts que você tenha permissão de modificar.
- </message>
+ Impossibilitado de executar 'recompilação'.
+Selecione objetos com scripts que você tem permissão para modificar.
+ </message>
</alert>
<alert name="CannotResetSelectObjectsNoScripts">
<message name="message">
- Não é possível recomeçar. Selecione objetos com script que possam ser modificados.
- </message>
+ Impossibilitado de executar 'redefinir'.
+Selecione objetos com scripts.
+ </message>
</alert>
<alert name="CannotResetSelectObjectsNoPermission">
<message name="message">
- Não é possível recomeçar. Selecione objetos com script que você tenha permissão de modificar.
- </message>
+ Impossibilitado de executar 'redefinir'.
+Selecione objetos com scripts que você tem permissão para modificar.
+ </message>
</alert>
<alert name="CannotSetRunningSelectObjectsNoScripts">
<message name="message">
- Não é possível usar scripts de corrida. Selecione objetos com scripts válidos.
- </message>
+ Impossibilitado de definir quaisquer scripts para 'rodando'.
+Selecione objetos com scripts.
+ </message>
</alert>
<alert name="CannotSetRunningSelectObjectsNoPermission">
<message name="message">
Não é possível usar scripts de corrida. Selecione objetos com scripts que você tenha a permissão de modificar.
</message>
-
</alert>
<alert name="CannotSetRunningNotSelectObjectsNoScripts">
<message name="message">
- Não é possível usar scripts não funcionais. Selecione objetos com scripts válidos.
- </message>
+ Impossibilitado de definir quaisquer scripts para 'não rodando'.
+Selecione objetos com scripts.
+ </message>
</alert>
<alert name="CannotSetRunningNotSelectObjectsNoPermission">
<message name="message">
Não é possível usar scripts não funcionais. Selecione objetos com scripts que você tem permissão de modificar.
</message>
-
</alert>
<alert name="NoFrontmostFloater">
<message name="message">
No frontmost floater to save>
</message>
+ </alert>
+ <alert name="SeachFilteredOnShortWords">
+ <message name="message">
+ Sua pesquisa foi alterada e os Palavras que eram demasiado curtas foram removidas.
+Pesquisava por: [FINALQUERY]
+ </message>
+ </alert>
+ <alert name="SeachFilteredOnShortWordsEmpty">
+ <message name="message">
+ Os termos de sua pesquisa eram muito curtos então nenhuma pesquisa foi feita.
+ </message>
</alert>
<alert name="ColladaExportFailedUnknownServerError">
<message name="message">
Falha na exportação Collada: Falha desconhecida no servidor.
</message>
-
</alert>
<alert name="ColladaExportFailedInvalidPermissions">
<message name="message">
Falha na exportação Collada: Permissão inválida ou objeto bloqueado!
</message>
-
</alert>
<alert name="ColladaExportFailedUnknownError">
<message name="message">
Falha na exportação Collada: Erro desconhecido.
</message>
-
</alert>
<alert name="ObjectImportFailedTransfer">
<message name="message">
Falha na importação do objeto. Não é possível a transferência de arquivos.
</message>
-
</alert>
<alert name="ObjectImportFailedBadFormat">
<message name="message">
Falha na importação do objeto. O arquivo não é compatível com o formato SL Object.
</message>
-
</alert>
<alert name="ObjectImportFailedUnknownError">
<message name="message">
Falha na importação do objeto. Erro desconhecido.
</message>
-
</alert>
<alert name="CouldNotTeleportReason">
<message name="message">
Não é possível teletransportar-se. [REASON]
</message>
-
</alert>
<alert name="CannotSetLandOwnerNothingSelected">
<message name="message">
Incapaz de estabelecer o proprietário do terreno: Nada selecionado.
</message>
-
</alert>
<alert name="CannotSetLandOwnerMultipleRegions">
<message name="message">
Não é possível exigir a posse do terreno porque a seleção alcançou múltiplas regiões. Por favor, selecione uma área menor e tente novamente.
</message>
-
</alert>
<alert name="ForceOwnerAuctionWarning">
<message name="message">
@@ -1446,107 +1488,76 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="CannotContentifyNothingSelected">
<message name="message">
Conteúdo não encontrado: Nada selecionado.
</message>
-
</alert>
<alert name="CannotContentifyNoRegion">
<message name="message">
Conteúdo não encontrado: Sem região.
</message>
-
</alert>
<alert name="CannotReleaseLandNothingSelected">
<message name="message">
Não é possível abandonar terreno: Nada selecionado.
</message>
-
</alert>
<alert name="CannotReleaseLandNoRegion">
<message name="message">
Não é possível abandonar terreno: Não é possível encontrar região.
</message>
-
</alert>
<alert name="CannotBuyLandNothingSelected">
<message name="message">
Não é possível comprar terreno: Nada selecionado.
</message>
-
</alert>
<alert name="CannotBuyLandNoRegion">
<message name="message">
Não é possível comprar terreno: O terreno não pode ser encontrado nesta região.
</message>
-
+ </alert>
+ <alert name="CannotCloseFloaterBuyLand">
+ <message name="message">
+ Você não pode fechar a janela de Compra de Terreno até que o Second Life calcule o preço dessa transação.
+ </message>
</alert>
<alert name="CannotDeedLandNothingSelected">
<message name="message">
Não é possível transferir posse do terreno: Nada selecionado.
</message>
-
</alert>
<alert name="CannotDeedLandNoGroup">
<message name="message">
Não é possível transferir posse do terreno: Sem grupo.
</message>
-
</alert>
<alert name="CannotDeedLandNoRegion">
<message name="message">
Não é possível transferir posse do terreno: O terreno não pode encontrado nesta região. Por favor, use a Ferramenta: Reporte de Bug para corrigir isso.
</message>
-
- </alert>
- <alert name="CannotSetLandOwnerNothingSelected">
- <message name="message">
- Não é possível identificar proprietário: Nada selecionado.
- </message>
-
- </alert>
- <alert name="CannotBuyLandMultipleRegions">
- <message name="message">
- Não é possível comprar terreno porque a seleção alcançou múltiplas regiões. Por favor selecione uma área menor e tente novamente.
- </message>
-
- </alert>
- <alert name="CannotBuyLandMultipleSelected">
- <message name="message">
- Não é possível comprar terreno: Partes múltiplas foram selecionadas. Tente selecionar uma área menor.
- </message>
-
</alert>
<alert name="CannotDeedLandMultipleSelected">
<message name="message">
- Não é possível transferir posse do terreno: Partes múltiplas foram selecionadas. Tente selecionar uma área menor.
+ Impossibilitado de passar a propriedade da terra:
+Selecionados vários terrenos.
+Tente selecionar um único terreno.
</message>
-
</alert>
<alert name="RegionNotFound">
<message name="message">
Região não encontrada.
</message>
-
- </alert>
- <alert name="ParcelCanPlayMusic">
- <message name="message">
- Esta região pode tocar música por streaming. Tocar música requer um conexão de 768 kbps ou superior. Tocar música quando disponível?
- </message>
- <option name="PlayMusic">
- Tocar música
- </option>
- <option name="Disable">
- Desabilitar
- </option>
-
</alert>
<alert name="ParcelCanPlayMedia">
<message name="message">
- Esta região pode exibir vídeos por streaming. Para exibir vídeos requer um conexão de 768 kbps ou superior. Exibir quando disponível?
+ Esta localidade pode executar fluxo de mídia.
+Fluxo de mídia necessita de uma conexão de Internet rápida.
+
+Executar fluxo de mídia quando disponível?
+(Você pode mudar esta opção mais tarde no Preferências > Áudio & Vídeo.)
</message>
<option name="PlayMedia">
Exibir vídeo
@@ -1554,107 +1565,70 @@ Nota: Isto limpará o cache.
<option name="Disable">
Desabilitar
</option>
-
- </alert>
- <alert name="CannotBuyLandWaitingForServer">
- <message name="message">
- Não é possível comprar terreno: Espere o servidor demonstrar o valor. Tente novamente em alguns segundos.
- </message>
-
</alert>
<alert name="CannotDeedLandWaitingForServer">
<message name="message">
- Não é possível transferir posse do terreno: Espere o servidor demonstrar o proprietário. Tente novamente em alguns segundos.
- </message>
-
- </alert>
- <alert name="CannotBuyLandNoPublic">
- <message name="message">
- Não é possível comprar terreno: A seleção não contém qualquer terreno público.
- </message>
-
- </alert>
- <alert name="CannotBuyLandLandOwned">
- <message name="message">
- Não é possível comprar terreno: O terreno selecionado é de outro proprietário. Tente selecionar uma área menor.
- </message>
-
- </alert>
- <alert name="CannotButLandRegionNotFound">
- <message name="message">
- Não é possível comprar terreno: O terreno não pode ser encontrado nesta região. Por favor, use a Ferramenta: Reporte de Bug para corrigir isso.
- </message>
+ Impossibilitado de passar a propriedade da terra:
+Esperando pelo servidor informar de quem é a propriedade.
- </alert>
- <alert name="CannotBuyLandNoTransfer">
- <message name="message">
- Não é possível comprar terreno: A região [REGION] não permite transferência do terreno.
+Por favor, tente novamente.
</message>
-
</alert>
<alert name="CannotDeedLandNoTransfer">
<message name="message">
Não é possível transferir posse do terreno: A região [REGION] não permite transferência do terreno.
</message>
-
- </alert>
- <alert name="CannotBuyLandForGroupNotOfficer">
- <message name="message">
- Não é possível comprar o terreno de um grupo: Você não é um dos supervisores do grupo atual. Por favor, ative outro grupo usando Editar Grupos.
- </message>
-
- </alert>
- <alert name="CannotBuyLandInsufficientFunds">
- <message name="message">
- Comprar esta [AREA] por metros quadrados custará L$[PRICE]. Você tem somente L$ [BALANCE].
- </message>
-
- </alert>
- <alert name="CannotReleaseLandNothingSelected">
- <message name="message">
- Não é possível abandonar terreno: Nada selecionado.
- </message>
-
</alert>
<alert name="CannotReleaseLandWatingForServer">
<message name="message">
- Não é possível abandonar terreno: Espere o servidor demonstrar o valor. Tente novamente em alguns segundos.
- </message>
+ Impossibilitado de abandonar a terra:
+Esperando o servidor atualizar as informações do terreno.
+Tente novamente em alguns segundos.
+ </message>
</alert>
<alert name="CannotReleaseLandSelected">
<message name="message">
- Não é possível abandonar terreno: Partes múltiplas foram selecionadas. Tente selecionar uma área menor.
- </message>
+ Impossibilitado de abandonar a terra:
+Você não é dono de todos os terrenos selecionados.
+Por favor, selecione um único terreno.
+ </message>
</alert>
<alert name="CannotReleaseLandDontOwn">
<message name="message">
Não é possível abandonar terreno: Você não tem permissão de renunciar esse lote. Aqueles que você possui estão em verde.
</message>
-
</alert>
<alert name="CannotReleaseLandRegionNotFound">
<message name="message">
- Não é possível abandonar terreno: O terreno não pode ser encontrado nesta região. Por favor, use a opção Ferramenta, Reporar Bug para corrigir isso.
- </message>
+ Impossibilitado de abandonar a terra:
+Não consegue achar a região em que esta terra se encontra.
+Por favor, usar Ferramentas > Reportar Bug, para reportar este erro.
+ </message>
</alert>
<alert name="CannotReleaseLandNoTransfer">
<message name="message">
Não é possível abandonar terreno: A região [REGION] não permite transferência de terreno.
</message>
-
</alert>
<alert name="CannotReleaseLandPartialSelection">
<message name="message">
- Não é possível abandonar terreno: Você deve selecionar um lote inteiro para renunciá-lo. Tente dar um clique duplo para selecionar um lote inteiro ou primeiramente faça a divisão.
- </message>
+ Impossibilitado de abandonar a terra:
+Você deve selecionar um terreno inteiro para liberá-lo.
+
+Selecione um terreno inteiro ou primeiro divida seu terreno.
+ </message>
</alert>
<alert name="ReleaseLandWarning">
<message name="message">
- Você está preste a renunciar [AREA] metros do seu terreno. Ao renunciar esse lote, haverá a perda do controle sobre ele, mas isso não irá creditar nenhum L$. Renunciar este terreno?
+ Você está para liberar [AREA] m2 de terra.
+Liberando este terreno, o liberará de suas posses,
+ mas não lhe concederá quaisquer L$.
+
+Liberar esta terra?
</message>
<option name="Release">
Renunciar
@@ -1662,19 +1636,21 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="CannotDivideLandNothingSelected">
<message name="message">
- Não é possivel dividir terreno: Nada selecionado.
- </message>
+ Impossibilitado de dividir a terra:
+Nenhum terreno selecionado.
+ </message>
</alert>
<alert name="CannotDivideLandPartialSelection">
<message name="message">
- Não é possivel dividir terreno: Você tem um lote inteiro selecionado. Tente selecionar uma área menor ao clicar e arrastar.
- </message>
+ Impossibilitado de dividir a terra:
+Você selecionou um terreno inteiro.
+Tente selecionar uma parte do terreno.
+ </message>
</alert>
<alert name="LandDivideWarning">
<message name="message">
@@ -1686,41 +1662,50 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="CannotDivideLandNoRegion">
<message name="message">
- Não é possivel dividir terreno: O terreno não pode ser encontrado nesta região. Por favor, use a opção Ferramenta, Reporar Bug para corrigir isso.
- </message>
+ Impossibilitado de dividir a terra:
+Não consegue achar a região em que esta terra se encontra.
+Por favor, usar Ferramentas > Reportar Bug, para reportar este erro.
+ </message>
</alert>
<alert name="CannotJoinLandNoRegion">
<message name="message">
- Não é possível unir terreno: O terreno não pode ser encontrado nesta região. Por favor, use a opção Ferramenta, Reporar Bug para corrigir isso.
- </message>
+ Impossibilitado de unir a terra:
+Não consegue achar a região em que esta terra se encontra.
+Por favor, usar Ferramentas > Reportar Bug, para reportar este erro.
+ </message>
</alert>
<alert name="CannotJoinLandNothingSelected">
<message name="message">
Não é possível unir terreno: Nada selecionado.
</message>
-
</alert>
<alert name="CannotJoinLandEntireParcelSelected">
<message name="message">
- Não é possível unir terreno: Você selecionou um lote inteiro. Tente seleciona uma área maior quando clicar e arrastar.
- </message>
+ Impossibilitado de unir a terra:
+Você selecionou apenas um terreno.
+Selecione a terra através de ambos os terrenos.
+ </message>
</alert>
<alert name="CannotJoinLandSelection">
<message name="message">
- Não é possível unir terreno: Você deve selecionar mais um lote. Tente seleciona uma área maior quando clicar e arrastar.
- </message>
+ Impossibilitado de unir a terra:
+Você deve selecionar mais de um terreno.
+Selecione a terra através de ambos os terrenos.
+ </message>
</alert>
<alert name="JoinLandWarning">
<message name="message">
- A união deste terreno criará um lote maior que pode cruzar com a área retangular selecionada. Você vai precisar colocar os novos nomes e opções dos lotes. Deseja unir o terreno?
+ Aderir esta terra vai criar uma grande parcela fora de todas as parcelas que intersectam o retângulo selecionado.
+Você vai ter de repor o nome e as opções de
nova parcela.
+
+Aderir a terra?
</message>
<option name="Join">
Unir
@@ -1728,7 +1713,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ConfirmNotecardSave">
<message name="message">
@@ -1740,7 +1724,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ConfirmLandmarkCopy">
<message name="message">
@@ -1752,7 +1735,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ConfirmItemCopy">
<message name="message">
@@ -1764,37 +1746,34 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ResolutionSwitchFail">
<message name="message">
Falha ao trocar a resolução para [RESX] por [RESY]
</message>
-
</alert>
<alert name="ErrorUndefinedGrasses">
<message name="message">
Erro: Gramado indefinido; [SPECIES]
</message>
-
</alert>
<alert name="ErrorUndefinedTrees">
<message name="message">
Erro: Árvores indefinidas: [SPECIES]
</message>
-
</alert>
<alert name="CannotSaveWearableOutOfSpace">
<message name="message">
Não é possível salvar '[NAME]' para um arquivo implantado. Você precisa liberar algum espaço no seu computador e salvar o arquivo novamente.
</message>
-
</alert>
<alert name="CannotSaveToAssetStore">
<message name="message">
- Não é possível salvar [NAME] na ASSET STORE principal. Este é uma falha temporária. Por favor personalize e salve o implantado(wearable) novamente em alguns minutos. Se o problema persistir, por favor clique em Ferramentas – Reporte de Bug. Encontre o menu e informe sobre os detalhes da configuração da sua rede.
- </message>
+ Impossibilitado de salvar [NAME] e armazenar na central ativa.
+Isso é geralmente uma falha temporária. Por favor personalize e salve novamente a vestimenta em poucos minutos.
+Se o problema persistir, por favor clicar sobre 'Ferramentas > Bug Report' menu superior e fornecer detalhes sobre a configuração de sua rede.
+ </message>
</alert>
<alert name="AppEarlyExit">
<message name="message">
@@ -1803,38 +1782,30 @@ Nota: Isto limpará o cache.
<option name="Quit">
Sair
</option>
-
</alert>
<alert name="YouHaveBeenLoggedOut">
<message name="message">
- Você se desconectou do [SECOND_LIFE]: [MESSAGE]. Clique em Continuar para observar mensagens existentes ou bate-papo. Você não será capaz de realizar nenhuma operação. Clique em Sair para fechar [SECOND_LIFE] imediatamente.
+ Você foi deslogado do [SECOND_LIFE]:
+ [MESSAGE]
+Você ainda pode olhar para o bate-papo e mensagens instantâneas existentes, clicando em 'Exibir IM & bate-papo'. Caso contrário, clique em 'Sair' para sair do [SECOND_LIFE] imediatamente.
</message>
<option name="Continue">
- Continuar
+ Ver Mensagem Instantânea & Bate- Papo
</option>
<option name="Quit">
Sair
</option>
-
- </alert>
- <alert name="SelectSingleRate">
- <message name="message">
- Selecionar um único objeto para avaliação.
- </message>
- <option name="OK">
- OK
- </option>
-
</alert>
<alert name="OnlyOfficerCanBuyLand">
<message name="message">
Não é possível comprar o terreno para o grupo: Você não tem permissão para comprar o terreno para o seu grupo ativado. Por favor ative outro grupo usando Editar ->
</message>
-
</alert>
<alert name="AddFriend" title="Adicionar amigo">
<message name="message">
- Amigos podem dar permissão para se encontrarem no mapa e receber informações de status online. Oferecer amizade para [NAME]?
+ Amigos podem dar permissões de rastrear um ao outro pelo mapa e receber atualizações de status online.
+
+Oferecer amizade para [NAME]?
</message>
<option name="Offer">
Oferecer
@@ -1842,7 +1813,22 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
+ </alert>
+ <alert modal="true" name="AddFriendWithMessage" title="Add Friend">
+ <message name="message">
+ Amigos podem dar permissões de rastrear um ao outro pelo mapa e receber atualizações de status online.
+Oferecer amizade para [NAME]?
+ </message>
+ <editline name="editline">
+ Quer ser meu amigo?
+ </editline>
+ <option name="Offer">
+ Oferecer
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="RemoveFromFriends">
<message name="message">
@@ -1854,7 +1840,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="RemoveMultipleFromFriends">
<message name="message">
@@ -1866,11 +1851,12 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="GodDeleteAllScriptedPublicObjectsByUser">
<message name="message">
- Está certo que deseja apagar todos os objetos com scripts possuídos pelo **[AVATAR_NAME]** em todos as outros terrenos neste SIM?
+ Você tem certeza que deseja excluir todos os objetos scriptados de propriedade de
+** [AVATAR_NAME] **
+sobre todos os outros terrenos deste sim?
</message>
<option name="DELETE!!">
APAGAR!!
@@ -1878,11 +1864,12 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar Cancel
</option>
-
</alert>
<alert name="GodDeleteAllScriptedObjectsByUser">
<message name="message">
- Está certo de que deseja APAGAR TODOS os objetos programados (scripted) possuídos pelo ** [AVATAR_NAME] ** em TODAS os TERRENOS deste setor?
+ Você tem certeza que deseja excluir todos os objetos scriptados de propriedade de
+** [AVATAR_NAME] **
+sobre TODOS OS TERRENOS deste sim?
</message>
<option name="!!DELETEALL!!">
!!APAGAR TUDO!!
@@ -1890,11 +1877,13 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="GodDeleteAllObjectsByUser">
<message name="message">
- Está certo de que deseja APAGAR TODOS os objetos programados (scripted) ou não, possuídos pelo ** [AVATAR_NAME] ** em TODAS as TERRENOS deste setor?
+ Você tem certeza que deseja excluir TODOS os objetos (Scriptados ou não)
+De propriedade de
+** [AVATAR_NAME] **
+sobre TODOS OS TERRENOS deste sim?
</message>
<option name="!!DELETEALL!!">
!!APAGAR TUDO!!
@@ -1902,37 +1891,26 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="PublishGroupInfoToWeb">
<message name="message">
Selecionando a opção "Publicar na Web" nos permitirá publicar o nome do grupo, símbolo, cartas, títulos e fundador no website [SECOND_LIFE]. Você é responsável por informar se algum dos conteúdos acima conter tema Adulto de acordo com as Regras da Comunidade.
</message>
-
- </alert>
- <alert name="ErrorEncodingSnapshot">
- <message name="message">
- Erro de codificação da imagem.
- </message>
-
</alert>
<alert name="BlankClassifiedName">
<message name="message">
Você deve especificar um título qualquer para seu anúncio.
</message>
-
</alert>
<alert name="MinClassifiedPrice">
<message name="message">
Preço mínimo a pagar para incluir na listagem de L$[MIN_PRICE]. Por favor, insira um valor maior.
</message>
-
</alert>
<alert name="CantLoadVertexShaders">
<message name="message">
Incapaz de carregar Vertex Shaders.
</message>
-
</alert>
<alert name="ConfirmObjectDeleteLock">
<message name="message">
@@ -1944,7 +1922,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectDeleteNoCopy">
<message name="message">
@@ -1956,7 +1933,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectDeleteNoOwn">
<message name="message">
@@ -1968,7 +1944,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectDeleteLockNoCopy">
<message name="message">
@@ -1980,7 +1955,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectDeleteLockNoOwn">
<message name="message">
@@ -1992,7 +1966,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectDeleteNoCopyNoOwn">
<message name="message">
@@ -2004,7 +1977,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectDeleteLockNoCopyNoOwn">
<message name="message">
@@ -2016,7 +1988,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectTakeLock">
<message name="message">
@@ -2028,7 +1999,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectTakeNoOwn">
<message name="message">
@@ -2040,11 +2010,14 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="ConfirmObjectTakeLockNoOwn">
<message name="message">
- Pelo menos um objeto está trancado ou você não possui todos os objetos que está manipulando. Caso continue, as permissões do próximo proprietário serão aplicadas aos objetos e há possibilidade de restringir sua habilidade em modificá-lo ou copiá-lo no futuro. Contudo, você pode utilizar a seleção. Deseja continuar?
+ Pelo menos um objeto está bloqueado.
Você não possui todos os objetos que você está pegando.
+Se continuar, as permissões do proprietário serão eventualmente aplicadas e restringirão a capacidade de modificar ou copiá-las.
+No entanto, pode pegar a seleção atual.
+
+Tem certeza de que deseja pegar estes itens?
</message>
<option name="Yes">
Sim
@@ -2052,17 +2025,20 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="CantBuyLandAcrossMultipleRegions">
<message name="message">
- Não foi possível adquirir o lote devido ao várias seleções de regiões múltiplas. Por favor, selecione uma área menor e tente novamente.
- </message>
+ Não foi possível comprar terrenos, pois a seleção abrange várias regiões.
+Por favor, selecione uma área menor e tente novamente.
+ </message>
</alert>
<alert name="DeedLandToGroup">
<message name="message">
- Por tornar este lote uma ação, o grupo será consultado a ter e manter fundos suficientes. O preço de aquisição do lote não será reembolsado ao proprietário. Caso um lote acionado for vendido, o preço de venda será dividido entre os membros do grupo. Acionar estes [AREA] metros quadrados de terra para o grupo '[GROUP_NAME]'?
+ Na transferência de propriedade desta parcela, será exigido do grupo créditos suficientes para manter seu uso.
+O preço de aquisição dos terrenos não é restituído ao o proprietário. Se uma parcela transferida é vendida, o preço de venda dividido igualmente entre os membros do grupo.
+
+Transferir propriedade de [AREA] m2 do terreno ao grupo '[GROUP_NAME]'?
</message>
<option name="Deed">
Acionar
@@ -2070,11 +2046,15 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="DeedLandToGroupWithContribution">
<message name="message">
- Por tornar este lote uma ação, o grupo será consultado a ter e manter fundos suficientes. A ação incluirá contribuições de terra simultâneas para o grupo do '[FIRST_NAME] [LAST_NAME]'. O preço de aquisição do lote não será reembolsado ao proprietário. Caso um lote acionado for vendido, o preço de venda será dividido entre os membros do grupo. Acionar estes [AREA] metros quadrados de terra para o grupo '[GROUP_NAME]'?
+ Transferindo Propriedade desta parcela, será exigido do grupo créditos suficientes para manter seu uso.
+A Transferência incluirá simultaneamente Terreno e contribuição de '[FIRST_NAME] [LAST_NAME]' para o grupo.
+O preço da compra não será restituído ao proprietário. Se uma parcela da Transferência for vendida, o preço da venda será eventualmente dividido entre os membros do grupo.
+
+Transferir propriedade destes [AREA] m2 de terreno para o grupo
+'[GROUP_NAME]'?
</message>
<option name="Deed">
Acionar
@@ -2082,25 +2062,21 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="DisplaySetToSafe">
<message name="message">
Configurações de display foram ajustadas para nível de segurança porque você especificou -- opção de segurança.
</message>
-
</alert>
<alert name="DisplaySetToRecommended">
<message name="message">
Configurações de display foram ajustadas para nível recomendado basedo na configuração do seu sistema.
</message>
-
</alert>
<alert name="UnableToConnect">
<message name="message">
Incapaz de conectar ao servidor. Não foi possível encontrar o nome do domínio: [HOST_NAME]
</message>
-
</alert>
<alert name="CanNotFindServer">
<message name="message">
@@ -2112,13 +2088,11 @@ Nota: Isto limpará o cache.
<option name="Help">
Ajuda
</option>
-
</alert>
<alert name="PleaseSelectServer">
<message name="message">
Por favor, selecione um servidor. Incapaz de conectar ao [IP_ADDRESS]
</message>
-
</alert>
<alert name="SystemMayBeDown">
<message name="message">
@@ -2130,29 +2104,33 @@ Nota: Isto limpará o cache.
<option name="Help">
Ajuda
</option>
-
</alert>
<alert name="ErrorMessage">
<message name="message">
[ERROR_MESSAGE]
</message>
-
</alert>
<alert name="AvatarMoved">
<message name="message">
- Sua [TYPE] localização atual é inválida. [HELP] Você será movido a uma região próxima.
+ Sua [TYPE] localização não está disponível no momento. [HELP]
+Você foi movido para uma região vizinha.
</message>
-
</alert>
<alert name="ClothingLoading">
<message name="message">
- Suas roupas ainda estão carregando. Você pode explorar o mundo normalmente e os outros residentes irão vê-lo corretamente.
+ Sua vestimenta ainda está baixando.
+Você pode usar o [SECOND_LIFE] normalmente e os outros o visualizarão corretamente.
</message>
-
+ <ignore name="ignore">
+ Quando o vestuário está levando muito tempo para fazer download
+ </ignore>
</alert>
<alert name="FirstRun">
<message name="message">
- [SECOND_LIFE] instalação completa. Caso seja sua primeira vez utilizando o [SECOND_LIFE], você precisará criar uma conta antes de ingressar. Ir até www.secondlife.com para criar uma nova conta?
+ A instalação do [SECOND_LIFE] está completa.
+
+Se esta é a primeira vez usando o[SECOND_LIFE], será necessário que você crie uma conta antes de poder se logar.
+Retornar a www.secondlife.com para criar uma nova conta?
</message>
<option name="NewAccount...">
Nova conta..
@@ -2160,17 +2138,18 @@ Nota: Isto limpará o cache.
<option name="Continue">
Continuar
</option>
-
</alert>
<alert name="SetByHostFail">
<message name="message">
Incapaz de conectar-se ao servidor. Não foi possível encontrar o nome do domínio: [HOST_NAME] Por favor, verifique sua conexão.
</message>
-
</alert>
<alert name="LoginPacketNeverReceived">
<message name="message">
- Incapaz de conectar-se. Pacote de entrada não recebido pelo servidor de entrada. Por favor, tente novamente em alguns minutos ou clique em Ajuda para maiores informações sobre a disponibilidade de sistema.
+ Estamos com problemas de conexão.
+Pode ser problema com a conexão de sua internet ou com os servidores do Second Life.
+
+Voce tanto pode checar a conexão de sua internet e tentar novamente em alguns minutos, ou clicar em Teletransporte para tentar teletransportar-se para sua casa.
</message>
<option name="OK">
OK
@@ -2178,17 +2157,26 @@ Nota: Isto limpará o cache.
<option name="Help">
Ajuda
</option>
-
+ <option name="Teleport">
+ Teleportar
+ </option>
</alert>
<alert name="WelcomeNoClothes">
<message name="message">
- Seu avatar aparecerá em alguns minutos. Utilize as setas para mover-se. Pressione F1 a qualquer momento para aprender mais sobre [SECOND_LIFE].
- </message>
+ Seu personagem irá aparecer num momento.
+Use as teclas de seta para andar.
+Pressione a tecla F1 para ajuda ou aprender mais sobre [SECOND_LIFE].
+ </message>
</alert>
<alert name="WelcomeChooseSex">
<message name="message">
- Seu avatar aparecerá em alguns minutos. Utilize as setas para mover-se. Pressione F1 a qualquer momento para aprender mais sobre [SECOND_LIFE]. Por favor, escolha um personagem masculino ou feminino. Você pode mudar de idéia depois.
+ Seu personagem irá aparecer num momento.
+
+Use as teclas de seta para andar.
+Pressione a tecla F1 para ajuda ou aprender mais sobre [SECOND_LIFE].
+Por favor, escolha se o seu avatar é feminino ou masculino.
+Você pode mudar de idéia depois.
</message>
<option name="Male">
Masculino
@@ -2196,29 +2184,27 @@ Nota: Isto limpará o cache.
<option name="Female">
Feminino
</option>
-
</alert>
<alert name="NotEnoughCurrency">
<message name="message">
- [NAME] L$ [PRICE] Você não possui fundos suficientes para isso.
+ [NAME] L$ [PRICE] Você não possui suficientes L$ para fazer isso.
</message>
-
</alert>
<alert name="GrantedModifyRights">
<message name="message">
Foi garantido à você o privilégio de alterar o(s) objeto(s) [FIRST_NAME] [LAST_NAME]'
</message>
-
</alert>
<alert name="RevokedModifyRights">
<message name="message">
Seu privilégio para alterar o(s) objeto(s) [FIRST_NAME] [LAST_NAME]'s foi removido.
</message>
-
</alert>
<alert name="FlushMapVisibilityCaches">
<message name="message">
- Isso irá descarregar os caches de mapa dessa região. Pode seu útil somente para debugar. (Em andamento, aguarde 5 minutos, então todos os mapas serão atualizados após reentrarem)
+ Isto irá descarregar os caches de mapa relativos a esta região.
+Isso é realmente útil apenas para depuração.
+(Na produção, aguarde 5 minutos e, então, o mapa de todos será atualizado depois que relogar.)
</message>
<option name="OK">
OK
@@ -2226,7 +2212,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="OnlyCopyContentsOfSingleItem">
<message name="message">
@@ -2238,7 +2223,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="KickUsersFromRegion">
<message name="message">
@@ -2250,49 +2234,38 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
- </alert>
- <alert name="ReturnScriptedOnOthersLand">
- <message name="message">
- Tem certeza de que deseja retornar todos os objetos programados (scripted) possuídos pelo(a) ** [USER_NAME] ** que estejam em terrenos de outros?
- </message>
- <option name="Return">
- Retornar
- </option>
- <option name="Cancel">
- Cancelar
- </option>
-
</alert>
- <alert name="ReturnScriptedOnAllLand">
+ <alert name="EstateObjectReturn">
<message name="message">
- Tem certeza de que deseja retornar TODOS os objetos programados (scripted) possuídos pelo(a) ** [USER_NAME] ** desta Região?
+ Você tem certeza que deseja retornar os objetos pertencentes a [USER_NAME] ?
</message>
<option name="Return">
- Retornar
+ OK
</option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="InvalidTerrainBitDepth">
<message name="message">
- Não foi possível configurar as texturas da região. Texturas de terreno [TEXTURE_NUM] possui um número inválido de profundidade de [TEXTURE_BIT_DEPTH]. Substitua a textura [TEXTURE_NUM] com 24 bit 512x512 ou menor e clique em "Set" novamente.
- </message>
+ Não foi possível definir texturas da região:
+Textura do Terreno [TEXTURE_NUM] tem uma profundidade de bits inválidos [TEXTURE_BIT_DEPTH].
+Substituir textura [TEXTURE_NUM], com uma imagem de 24-bit 512x512 ou menor e em seguida, clique em 'Aplicar' novamente.
+ </message>
</alert>
<alert name="InvalidTerrainSize">
<message name="message">
- Não foi possível configurar as texturas da região. Terrain texture [TEXTURE_NUM] é muito grande em [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. Substitua a textura [TEXTURE_NUM] com 24 bit 512x512 ou menor e clique em "Set" novamente.
- </message>
+ Não foi possível definir texturas da região:
+Textura do Terreno [TEXTURE_NUM] é muito grande em [TEXTURE_SIZE_X] x [TEXTURE_SIZE_Y].
+Substituir textura [TEXTURE_NUM], com uma imagem de 24-bit 512x512 ou menor e em seguida, clique em 'Aplicar' novamente.
+ </message>
</alert>
<alert name="RawUploadStarted">
<message name="message">
Upload iniciado. Isso pode levar uns 2 minutos, dependendo da sua velocidade de conexão.
</message>
-
</alert>
<alert name="ConfirmBakeTerrain">
<message name="message">
@@ -2304,13 +2277,22 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="MaxAllowedAgentOnRegion">
<message name="message">
Você pode ter somente [MAX_AGENTS] residentes permitidos.
</message>
-
+ </alert>
+ <alert name="MaxBannedAgentsOnRegion">
+ <message name="message">
+ Você pode ter apenas [MAX_BANNED] residentes banidos.
+ </message>
+ </alert>
+ <alert name="MaxAgentOnRegionBatch">
+ <message name="message">
+ Falha ao adicionar [NUM_ADDED] agentes:
+Ultrapassa [MAX_AGENTS] [LIST_TYPE] o limite de [NUM_EXCESS].
+ </message>
</alert>
<alert name="MaxAllowedGroupsOnRegion">
<message name="message">
@@ -2322,53 +2304,42 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
- </alert>
- <alert name="MaxBannedAgentsOnRegion">
- <message name="message">
- Você pode ter apenas [MAX_BANNED] residentes banidos.
- </message>
-
</alert>
<alert name="MaxManagersOnRegion">
<message name="message">
Você pode ter apenas [MAX_MANAGER] residentes banidos.
</message>
-
</alert>
<alert name="OwnerCanNotBeDenied">
<message name="message">
Não é possível adicionar um porprietário a região. Acesso negado à lista.
</message>
-
</alert>
<alert name="CanNotChangeAppearanceUntilLoaded">
<message name="message">
Não é possível alterar a aparência até que as roupas e formas estejam carregadas.
</message>
-
</alert>
<alert name="ClassifiedMustBeAlphanumeric">
<message name="message">
O título do seu Anúncio deve começar com uma letra entre A e Z ou número. Nenhuma pontuação é permitida.
</message>
-
</alert>
<alert name="CantSetBuyObject">
<message name="message">
Não é possível configurar Comprar Objeto, porque o objeto não está à venda. Por favor, ponha o objeto à venda e tente novamente.
</message>
-
</alert>
<alert name="FinishedRawDownload">
<message name="message">
Download do arquivo de terreno RAW concluído em: [DOWNLOAD_PATH]
</message>
-
</alert>
<alert name="DownloadWindowsMandatory">
<message name="message">
- Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Você deve atualizar sua versão para utilizar o sistema.
+ Uma nova versão do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Você deve baixar essa atualização para utilizar o [SECOND_LIFE].
</message>
<option name="Download">
Atualizar
@@ -2376,11 +2347,12 @@ Nota: Isto limpará o cache.
<option name="Quit">
Sair
</option>
-
</alert>
<alert name="DownloadWindows">
<message name="message">
- Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance.
+ Uma versão atualizada do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade.
</message>
<option name="Download">
Atualizar
@@ -2388,11 +2360,12 @@ Nota: Isto limpará o cache.
<option name="Continue">
Continuar
</option>
-
</alert>
<alert name="DownloadWindowsReleaseForDownload">
<message name="message">
- Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance.
+ Uma versão atualizada do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade.
</message>
<option name="Download">
Atualizar
@@ -2400,11 +2373,14 @@ Nota: Isto limpará o cache.
<option name="Continue">
Continuar
</option>
-
</alert>
<alert name="DownloadMacMandatory">
<message name="message">
- Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Você deve atualizar esta versão para utilizar o sistema. Atualizar para sua pasta de Aplicações?
+ Uma nova versão do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Você deve baixar esta atualização para utilizar o [SECOND_LIFE].
+
+Baixar para o seu folder de Aplicativos?
</message>
<option name="Download">
Atualizar
@@ -2412,11 +2388,14 @@ Nota: Isto limpará o cache.
<option name="Quit">
Sair
</option>
-
</alert>
<alert name="DownloadMac">
<message name="message">
- Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance. Atualizar para sua pasta de Aplicações?
+ Uma nova versão do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade.
+
+Baixar para o seu folder de Aplicativos?
</message>
<option name="Download">
Atualizar
@@ -2424,11 +2403,15 @@ Nota: Isto limpará o cache.
<option name="Continue">
Continuar
</option>
-
</alert>
<alert name="DownloadMacReleaseForDownload">
<message name="message">
- Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance. Atualizar para sua pasta de Aplicações?
+ Uma nova versão do [SECOND_LIFE] está disponível.
+
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade.
+
+Baixar para o seu folder de Aplicativos?
</message>
<option name="Download">
Atualizar
@@ -2436,14 +2419,13 @@ Nota: Isto limpará o cache.
<option name="Continue">
Continuar
</option>
-
</alert>
<alert name="DeedObjectToGroup">
<message name="message">
Acionar este objeto causará ao grupo: * Recebe o valor pago pelo objeto
</message>
- <ignore>
- Quando acionar objetos ao grupo
+ <ignore name="ignore">
+ Ao transferir propriedade de objetos aos grupos
</ignore>
<option name="Deed">
Acionar
@@ -2451,128 +2433,71 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
- <alert name="AddClassified">
+ <alert name="WebLaunchExternalTarget">
<message name="message">
- Anúncios colocados aparecem na seção 'Anúncios' no diretório de Busca por uma semana. Preencha seu anúncio e clique em 'Publicar...' para adicioná-lo ao diretório. Você será consultado a pagar um preço quando clicar em Publicar. Quanto mais pagar, mais próximo ao topo da lista ficará seu anúncio, facilitando a visualização pelos outros Residentes.
+ Abrir o Web Browser do seu sistema para ver este conteúdo?
</message>
- <ignore>
- Quando adicionar um novo Anúncio.
+ <ignore name="ignore">
+ Ao abrir o navegador do seu sistema para visualizar uma página Web
</ignore>
- <option name="OK">
+ <option name="Open">
OK
</option>
<option name="Cancel">
Cancelar
</option>
-
- </alert>
- <alert name="WebLaunchGraphicsDriver">
- <message name="message">
- Seu [VENDOR_LABLE] [CARD_NAME] driver de vídeo neste computador está desatualizado. Este é um componente software que controla sua placa de vídeo. Versões antigas podem gerar problemas nos gráficos 3D em programas como [SECOND_LIFE]. Nós recomendamos atualizar seu "[DRIVER_NAME]" driver, disponível gratuitamente pela internet.
- </message>
- <ignore>
- Quando iniciar o navegador, visualizar a página de atualizações de drivers
- </ignore>
- <option name="Gotopage">
- Ir para a página
- </option>
- <option name="Cancel">
- Cancelar
- </option>
-
- </alert>
- <alert name="WebLaunchGraphicsDriverIntelExtreme">
- <message name="message">
- Seu driver gráfico Intel Extreme está desatualizado.Este é um componente software que controla sua placa de vídeo. Versões antigas podem gerar problemas nos gráficos 3D em programas como [SECOND_LIFE]. Nós recomendamos atualizar seu "[DRIVER_NAME]" driver, disponível na página da Intel.Gostaria de ir até a página de e drivers do [SECOND_LIFE]?
- </message>
- <ignore>
- Quando iniciar o navegador, visualizar a página de atualizações de drivers Intel
- </ignore>
- <option name="Gotopage">
- Ir para a página
- </option>
- <option name="Cancel">
- Cancelar
- </option>
-
- </alert>
- <alert name="RunningInPCI">
- <message name="message">
- GL indica que o driver de vídeo neste sistema está funcioando em modo PCImode, um método mais lento de processamento de imanges. Caso você esteja usando uma placa de vídeo PCI, por favor, desconsidere esta mensagem. Caso esteja usando uma placa de vídeo AGP, você deve atualizar sua placa-mãe para melhorar a performance do sistema. Se estiver utilizando uma placa de vídeo PCI Express você pode ativar a AGP a partir do painel Preferências no [SECOND_LIFE].
- </message>
- <ignore>
- Quando funcionar em modo PCI
- </ignore>
-
</alert>
<alert name="WebLaunchJoinNow">
<message name="message">
Ir ao www.secondlife.com para gerenciar sua conta?
</message>
- <ignore>
- Quando iniciar o navegador, ir a página de gerência de conta
- </ignore>
<option name="OK">
OK
</option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="WebLaunchForums">
<message name="message">
Buscar pela Base de Conhecimento do [SECOND_LIFE] as últimas dicas e truques.
</message>
- <ignore>
- Quando iniciar o navegador, ir até a Base de Conhecimento
- </ignore>
<option name="Gotopage">
Ir para a página
</option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="WebLaunchSupport">
<message name="message">
Contactar o Suporte [SECOND_LIFE].
</message>
- <ignore>
- Quando iniciar o navegador, contactar o Suporte
- </ignore>
<option name="Gotopage">
Ir para a página
</option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="WebLaunchSupportWiki">
<message name="message">
Ir até o Blog Oficial da Linden buscar pelas últimas notícias e informações.
</message>
- <ignore>
- Quando iniciar o navegador, visualizar o Blog
- </ignore>
<option name="Gotopage">
Ir até a página
</option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="WebLaunchLSLGuide">
<message name="message">
Ir para a página guia do LSL para ajuda com script?
</message>
- <ignore>
- Quando iniciar o navegador, visualizar o guia LSL
+ <ignore name="ignore">
+ Ao executar o navegador web para visualizar o Guia de Scripts.
</ignore>
<option name="Gotopage">
Ir para a página
@@ -2580,29 +2505,26 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="WebLaunchLSLWiki">
<message name="message">
Ir para a página LSL Wiki para ajuda com script?
</message>
- <ignore>
- Quando iniciar o navegador, visualizar o LSL Wiki
- </ignore>
<option name="Gotopage">
Ir para a página
</option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ReturnToOwner">
<message name="message">
- Você tem certeza que quer devolver os objetos selecionados aos seus donos? A autoria dos objetos transferíveis retornará para os seu antigos donos. (Todos os objetos retornarão para as pastas que estavam localizados anteriormente.)* *AVISO* Nenhum objeto transferível acionado será deletado!
+ Você tem certeza que deseja retornar os objetos selecionados para seus proprietários? Objetos transferíveis doados irão retornar aos proprietários anteriores.
+
+*AVISO* Objetos doados não – transferíveis serão deletados!
</message>
- <ignore>
- Quando retornar os objetos aos seus donos.
+ <ignore name="ignore">
+ Ao retornar objetos a seus proprietários
</ignore>
<option name="Return">
Retornar
@@ -2610,7 +2532,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="GroupLeaveConfirmOfficer">
<message name="message">
@@ -2622,7 +2543,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="GroupLeaveConfirmMember">
<message name="message">
@@ -2634,13 +2554,17 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ConfirmKick">
<message name="message">
Você quer REALMENTE expulsar todos os usuários deste grid?
</message>
-
+ <option name="Kick">
+ Chutar todos os usuários
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="MuteLinden">
<message name="message">
@@ -2649,22 +2573,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
- </alert>
- <alert name="MuteByName" title="Silenciar objeto pelo nome">
- <message name="message">
- Silenciar por nome somente afetará objetos, bate-papo e MI, mas não sons. Você deve digitar o nome do objeto corretamente.
- </message>
- <editline name="editline">
- Nome do objeto
- </editline>
- <option name="OK">
- OK
- </option>
- <option name="Cancel">
- Cancelar
- </option>
-
</alert>
<alert name="MuteByNameFailed" title="Silenciar objeto pelo nome falhou">
<message name="message">
@@ -2673,7 +2581,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="RemoveItemWarn">
<message name="message">
@@ -2685,7 +2592,6 @@ Nota: Isto limpará o cache.
<option name="No">
Não
</option>
-
</alert>
<alert name="CantRateOwnedByGroup">
<message name="message">
@@ -2694,7 +2600,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="CantOfferCallingCard">
<message name="message">
@@ -2703,7 +2608,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="CantOfferFriendship">
<message name="message">
@@ -2712,7 +2616,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="CantSetHome">
<message name="message">
@@ -2721,19 +2624,18 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="BusyModeSet">
<message name="message">
- Modificado para o modo Ocupado. O bate-papo e mensagens instantâneas serão ocultadas. Mensagens instantâneas serão respondidas como ocupado. Todos os convites para teleportar-se e sobre inventário serão recusadas.
+ Definido Modo Ocupado.
+Bate-papo e mensagens instantâneas serão escondidas. Mensagens instantâneas vão mostrar modo Ocupado em resposta. Todas as ofertas de teleporte serão recusadas. Todas as ofertas de inventário irão para a sua Lixeira.
</message>
- <ignore>
- Ao alterar para Modo Ocupado.
+ <ignore name="ignore">
+ Ao definir o modo ocupado
</ignore>
<option name="OK">
OK
</option>
-
</alert>
<alert name="NoPVPDetected">
<message name="message">
@@ -2742,7 +2644,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="NotecardAttachPermFail">
<message name="message">
@@ -2751,7 +2652,6 @@ Nota: Isto limpará o cache.
<option name="OK">
OK
</option>
-
</alert>
<alert name="JoinedTooManyGroupsMember">
<message name="message">
@@ -2763,7 +2663,6 @@ Nota: Isto limpará o cache.
<option name="Decline">
Rejeitar
</option>
-
</alert>
<alert name="JoinedTooManyGroupsOfficer">
<message name="message">
@@ -2775,23 +2674,13 @@ Nota: Isto limpará o cache.
<option name="Decline">
Rejeitar
</option>
-
- </alert>
- <alert name="HandleRateOwner">
- <message name="message">
- Não é permitido fixar o preço de um objeto de outro proprietário, ele pertence a um grupo.
- </message>
- <option name="OK">
- OK
- </option>
-
</alert>
<alert name="KickUser">
<message name="message">
Expulsar este usuário com qual mensagem?
</message>
<editline name="editline">
- Um administrador o desconectou.
+ Um administrador desligou você.
</editline>
<option name="OK">
OK
@@ -2799,14 +2688,13 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar.
</option>
-
</alert>
<alert name="KickAllUsers">
<message name="message">
Expulsar todo mundo atualmente do grid com qual mensagem?
</message>
<editline name="editline">
- Um administrador te desconectou.
+ Um administrador deslogou você.
</editline>
<option name="OK">
OK
@@ -2814,14 +2702,13 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="FreezeUser">
<message name="message">
Paralise este usuário com qual mensagem?
</message>
<editline name="editline">
- Você foi paralisado. Você não pode mover-se ou conversar. Um administrador entrará em contato com você através de mensagem instantânea (MI).
+ Você foi congelado, Você não pode se mover ou conversar. Um administrador irá contatá-lo via mensagem instantânea (IM).
</editline>
<option name="OK">
OK
@@ -2829,14 +2716,13 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="UnFreezeUser">
<message name="message">
Liberar este usuário com qual mensagem?
</message>
<editline name="editline">
- Você não está mais paralisado.
+ Você não está mais congelado.
</editline>
<option name="OK">
OK
@@ -2844,7 +2730,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ExpungeUser">
<message name="message">
@@ -2862,7 +2747,7 @@ Nota: Isto limpará o cache.
Oferecer um teletransporte para uma localização com a seguinte mensagem?
</message>
<editline name="editline">
- Venha para [REGION]
+ Junte-se a mim em [REGION]
</editline>
<option name="OK">
OK
@@ -2870,14 +2755,13 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="OfferTeleportFromGod">
<message name="message">
God user convocou para a sua localização?
</message>
<editline name="editline">
- Venha para [REGION]
+ Junte-se a mim em [REGION]
</editline>
<option name="OK">
OK
@@ -2885,7 +2769,20 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
+ </alert>
+ <alert name="TeleportFromLandmark">
+ <message name="message">
+ Você tem certeza que quer teleportar?
+ </message>
+ <ignore name="ignore">
+ Ao teleportar de uma Landmark no inventário
+ </ignore>
+ <option name="Teleport">
+ Teleportar
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="MessageEstate" title="Mensagem para todos do Estado">
<message name="message">
@@ -2900,7 +2797,11 @@ Nota: Isto limpará o cache.
</alert>
<alert name="ChangeLindenEstate" title="Mudar propriedade Linden">
<message name="message">
- Você não é capaz de modificar um Estado pertencente a Linden (mainland, grid adolescente, orientação, etc.). Isso é EXTREMAMENTE PERIGOSO porque pode afetar profundamente a experiência do usuário. Na mainland, isso irá mudar milhares de regiões e fazer o espaço do servidor travar. Proceder?
+ Você está prestes a mudar um Terreno pertencente a Linden (continente, teen grid, orientação, etc.)
+
+Isto é EXTREMAMENTE PERIGOSO porque pode fundamentalmente
afetar a experiência do usuário. No continente, vai mudar milhares de regiões e fazer o spaceserver soluçar.
+
+Proceder?
</message>
<option name="ChangeEstate">
Mudar Estado
@@ -2908,11 +2809,13 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ChangeLindenAccess" title="Mudar a propriedade de Linden OK">
<message name="message">
- Você é capaz de modificar um Estado pertencente a Linden (mainland, grid adolescente, orientação, etc.). Isso é EXTREMAMENTE PERIGOSO porque pode afetar profundamente a experiência do usuário. Na mainland, isso irá mudar milhares de regiões e fazer o espaço do servidor travar. Continuar?
+ Você está prestes a mudar uma lista de acessos de um Terreno pertencente a Linden (continente, teen grid, orientação, etc.)
+
+Isto é perigoso e deveria ser feito apenas para utilizar uma brecha que permita que objetos/L$ sejam transferidos para dentro/fora da grade.
+Isto mudará milhares de regiões e fará o spaceserver soluçar.
</message>
<option name="ChangeEstate">
Trocar Estado
@@ -2920,7 +2823,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateAllowedAgentAdd" title="Seleção de Estado">
<message name="message">
@@ -2968,10 +2870,15 @@ Nota: Isto limpará o cache.
<message name="message">
Remover da lista de grupos permitidos somente esta Região ou [ALL_ESTATES]?
</message>
+ <option name="ThisEstate">
+ Este Estado
+ </option>
+ <option name="AllEstates">
+ Todos os Estados
+ </option>
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateBannedAgentAdd" title="Seleção de Estado">
<message name="message">
@@ -2986,7 +2893,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateBannedAgentRemove" title="Seleção de Estado">
<message name="message">
@@ -3001,7 +2907,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateManagerAdd" title="Seleção de Estado">
<message name="message">
@@ -3016,7 +2921,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateManagerRemove" title="Seleção de Estado">
<message name="message">
@@ -3031,7 +2935,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateCovenantChange" title="Seleção de Estado">
<message name="message">
@@ -3046,10 +2949,6 @@ Nota: Isto limpará o cache.
<option name="Cancel">
Cancelar
</option>
-
-
-
-s
</alert>
<alert name="EstateKickUser" title="Confirmar Kick">
<message name="message">
@@ -3061,7 +2960,6 @@ s
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="EstateChangeCovenant">
<message name="message">
@@ -3073,7 +2971,6 @@ s
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="ProblemImportingEstateCovenant">
<message name="message">
@@ -3082,7 +2979,16 @@ s
<option name="OK">
OK
</option>
-
+ </alert>
+ <alert name="ProblemAddingEstateManager">
+ <message name="message">
+ Problemas em adicionar um novo gestor do terreno. Uma ou mais propriedades podem ter uma lista completa de gerenciamento.
+ </message>
+ </alert>
+ <alert name="ProblemAddingEstateGeneric">
+ <message name="message">
+ Problemas em adicionar esse terreno à lista. Um ou mais terrenos podem ter a lista completa.
+ </message>
</alert>
<alert name="UnableToLoadNotecard">
<message name="message">
@@ -3091,7 +2997,6 @@ s
<option name="OK">
OK
</option>
-
</alert>
<alert name="NotAllowedToViewNotecard">
<message name="message">
@@ -3100,7 +3005,6 @@ s
<option name="OK">
OK
</option>
-
</alert>
<alert name="MissingNotecardAssetID">
<message name="message">
@@ -3109,11 +3013,12 @@ s
<option name="OK">
OK
</option>
-
</alert>
<alert name="PublishClassified">
<message name="message">
- Lembre-se: A taxa dos Classificados não são devolvidas. Publicar esse classificado agora por L$[AMOUNT]?
+ Lembre-se: Taxas de Anúncios de Classificados não são reembolsáveis.
+
+Publicar este classificado agora por L$ [AMOUNT]?
</message>
<option name="Publish">
Publicar
@@ -3121,7 +3026,34 @@ s
<option name="Cancel">
Cancelar
</option>
-
+ </alert>
+ <alert name="SetClassifiedMature">
+ <message name="message">
+ Este classificado possui conteúdo adulto?
+ </message>
+ <option name="Mature">
+ Sim
+ </option>
+ <option name="Not Mature">
+ Não
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
+ </alert>
+ <alert name="SetGroupMature">
+ <message name="message">
+ Este Grupo possui conteúdo adulto?
+ </message>
+ <option name="Mature">
+ Sim
+ </option>
+ <option name="Not Mature">
+ Não
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
</alert>
<alert name="ConfirmRestart" title="Confirmar restart">
<message name="message">
@@ -3133,7 +3065,6 @@ s
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="MessageRegion" title="Mensagem para todos desta Região">
<message name="message">
@@ -3148,7 +3079,9 @@ s
</alert>
<alert name="HelpRegionBlockTerraform" title="Bloquear Terraform">
<message name="message">
- Se esta caixa estiver marcada, os proprietários do terreno não poderão modelá-lo independente das opções de 'Editar Terreno' por lote. Padrão: desligado.
+ Se esta opção for assinalada, donos de Terrenos não serão capazes de terraformar independentemente da configuração 'Editar Terreno' de suas terras por parcela.
+
+Padrão: desligado
</message>
</alert>
<alert name="HelpRegionBlockFly" title="Bloquear Vôo">
@@ -3165,11 +3098,15 @@ s
<message name="message">
Define o número máximo de residentes permitidos nessa região. Lembre-se que quanto mais residentes existir em sua região, pior pode ser a performance. Padrão: 30
</message>
-
</alert>
<alert name="HelpRegionObjectBonus" title="Objeto Bonus">
<message name="message">
- O Bônus de Objeto é um multiplicador de primitivas permitidas em qualquer lote. São permitidos valores entre 1 e 10. Definido como '1' a cada 512m2;, seriam permitidos 117 objetos; como '2' a cada 512m2;, seriam permitidos 234; e assim sucessivamente. O número máximo de objetos permitidos por região é 15.000 não importando qual o valor definido para o Bônus de Objeto. Uma vez colocado esse valor, ele não pode ser diminuído até você ter certeza de que a mudança não forçará o retorno ou a exclusão de objetos atuais no lote. Padrão: 1.0
+ O Bônus de objetos é um multiplicador para primitivas permitidas em qualquer parcela. O intervalo permitido é de 1 a 10.
+Se fiixada em '1 ', 512m2 de cada parcela permite 117 objetos.
+Fixado em '2 ', 512m2 cada parcela permite 234, ou o dobro, e assim por diante.
+O número máximo de objetos permitidos por região permanece 15000 não importa qual seja o Bônus de objeto. Uma vez estabelecido, esteja ciente de que a redução do Bônus de objeto pode retornar objetos ou apagá-los.
+
+Padrão: 1,0
</message>
</alert>
<alert name="HelpRegionMaturity" title="Adulto">
@@ -3187,9 +3124,16 @@ s
Configura se os lotes que não pertencem ao proprietário do Estado podem ser mesclados ou subdivididos. Se esta opção estiver desmarcada: * Apenas os donos ou gerenciadores de Estado podem mesclar ou dividir lotes; *Eles podem mesclar ou subdividir lotes pertencentes ao dono ou para o grupo onde eles tem os poderes apropriados. Se esta opção estiver marcada: * Todos os donos de lotes podem unir ou subdividir os lotes que eles possuem. *Para lotes pertencentes a grupos, aqueles com os poderes apropriados podem unir ou subdividir lotes. Padrão: Marcado.
</message>
</alert>
+ <alert name="HelpRegionSearch" title="Não Mostrar na Pesquisa">
+ <message name="message">
+ Ao marcar esta caixa irá bloquear a parcela listando os seus proprietários a partir de pesquisa em parcelas
+Padrão: off
+ </message>
+ </alert>
<alert name="RegionMaturityChange" title="Modificar para adulto">
<message name="message">
- A avaliação de maturidade para esta região foi atualizada. O mapa-mundi, entretanto, levará aproximadamente 5 minutos para atualizar, pois o sistema apenas atualiza as informações de mapa periodicamente.
+ A taxa de maturidade para esta região foi atualizada.
+Pode levar algum tempo para que a mudança seja refletida no mapa.
</message>
</alert>
<alert name="HelpRegionLandResell" title="Revender Terreno">
@@ -3209,7 +3153,16 @@ s
</alert>
<alert name="HelpRegionDisableCollisions" title="Desabilitar Colisões">
<message name="message">
- Quando a performance de simulação está ruim, objetos Físicos podem ser os culpados. Abra a Barra de Estatísticas (Ctrl-Shift-1). Olhe no Simulador de Física FPS. Se estiver abaixo de 45, então abra o painel 'Tempo' localizado na parte de baixo da Barra de Estatísticas. Se o Tempo de Simulação (Física) for igual ou maior a 20 ms, clique no botão 'Get Top Colliders'. Você poderá ver o nome e localização de objetos físicos que podem estar causando a baixa performance. Marcar a caixa de opção 'Desabilitar Colisões' e então pressionar o botão 'Aplicar' irá desabilitar temporariamente colisões objeto-objeto. Você poderá precisar fazer isso para ir ao local de um 'top collider'. Uma vez que você chegue ao local, investigue o objeto - ele está colidindo constantemente com outros objetos? Você pode contatar o proprietário do objeto ou apagar ou retornar o objeto. Desmarque a cauxa de opção 'Desabilitar Colisões' e então clique em 'Aplicar' para reativar colisões na terreno. Default: off
+ Quando a performance do simulador é pobre, os objetos físicos podem reclamar.
+
+Abra a Barra de Estatísticas (Ctrl-Shift-1).
+Olhe a taxa de quadros por segundos (FPS) dos objetos físicos.
+Se ela estiver abaixo de 45, abra o painel de Tempo, localizado na parte inferior da Barra de Estatísticas. Se o Tempo (Físicos) do Simulador mostrar 20 ms ou mais, clique o botão 'Pegue os Maiores Colidentes'. Será fornecido a você o nome e a localidade dos objetos físicos que podem estar causando uma performance pobre.
+
+Ativando a caixa Desabilitar Colisões e então pressionando o botão Aplicar, as colisões objeto-objeto serão temporariamente desabilitadas. Você pode precisar fazer isso para que possa viajar até a localidade onde observou um 'colidente-mor'. Uma vez tendo chegado à localidade, investigue o objeto – ele está constantemente colidindo com outros objetos? Você pode desejar contatar o dono do objeto ou deletar ou retornar o objeto.
+Desative a caixa 'Desabilitar Colisões' e então use 'Aplicar' para reativar as colisões na região.
+
+Padrão: off
</message>
</alert>
<alert name="HelpRegionDisablePhysics" title="Desabilitar Física">
@@ -3289,7 +3242,9 @@ s
</alert>
<alert name="HelpEstateExternallyVisible" title="Acesso público">
<message name="message">
- Indica se os residentes que estão em outras regiões podem entrar nesta região sem estar na lista de permissões. Default: permitido
+ Esta caixa de verificação define se os Residentes que estão em outras propriedades podem entrar nesta, sem estar em uma lista de acesso.
+
+Padrão: on
</message>
</alert>
<alert name="HelpEstateAllowDirectTeleport" title="Teleporte direto">
@@ -3299,12 +3254,20 @@ s
</alert>
<alert name="HelpEstateAllowResident" title="Permitir acesso">
<message name="message">
- Se qualquer residente for listado aqui, o acesso à região será limitado aos residentes nesta lista e grupos na lista abaixo. (Se a região for visível da mainland, o acesso não pode ser limitado a uma lista de residentes ou grupos, e estes controles não são disponíveis. Somente a lista de 'acesso negado' será utilizada.)
+ Acesso a esta propriedade estará limitado aos Residentes listados aqui e em quaisquer grupos abaixo.
+Esta definição está disponível apenas quando o Acesso Público estiver não assinalado.
</message>
</alert>
<alert name="HelpEstateAllowGroup" title="Permitir acesso de grupo">
<message name="message">
- Se qualquer grupo for listado aqui, o acesso à região será limitado aos grupos nesta lista e residentes especificamente permitidos acima. (Se a região for visível da mainland, o acesso não pode ser limitado a uma lista de residentes ou grupos, e estes controles não são disponíveis. Somente a lista de 'acesso negado' será utilizada.)
+ Acesso a esta propriedade estará limitada aos grupos listados aqui e a quaisquer Residentes acima.
+Esta definição está disponível apenas quando o Acesso Público estiver não assinalado.
+ </message>
+ </alert>
+ <alert name="HelpEstateAbuseEmailAddress" title="Endereço de Email do Abuso">
+ <message name="message">
+ Configurar isso para um endereço de email válido irá causar relato de abuso sobre este terreno a ser enviada para esse endereço.
+Defini-lo em branco fará com que sejam enviados relatórios de abuso apenas a Linden Lab.
</message>
</alert>
<alert name="HelpEstateBanResident" title="Negar acesso">
@@ -3312,6 +3275,19 @@ s
Residentes desta lista estão proibidos de acessar a sua região, independentemente das permissões e grupos setados acima. Adicionar um residente a esta lista irá removê-lo da lista de permissões.
</message>
</alert>
+ <alert name="HelpEstateVoiceChat" title="Permitir Conversa por Voz">
+ <message name="message">
+ Terrenos nesta propriedade têm permissão para ter seus canais de voz próprios, nos quais os residentes
+podem ouvir e falar com os outros residentes próximos..
+
+Padrão: off
+ </message>
+ </alert>
+ <alert name="VoiceVersionMismatch" title="Discordância de Versão de Voz">
+ <message name="message">
+ Esta versão do Second Life não é compatível com as características do Canal de Voz desta região. Para que a Conversa por Voz funcione corretamente, você precisará atualizar o Second Life.
+ </message>
+ </alert>
<alert name="HelpEstateCovenant" title="Corretor do Estado">
<message name="message">
Setar um corretor da região lhe permite vender lotes nesta região. Se um corretor não foi setado, você não pode vender terras. O cartão do seu corretor pode ficar vazio se você não desejar aplicar quaisquer regras ou avisar os compradores sobre qualquer coisa em relação ao lote antes da compra. Um corretor pode ser usado para comunicar regras, orientações, informações culturais ou simplesmente suas expectativas quanto ao futuro comprador. Isto pode incluir zoneamento, regulamentos para construções, opções de pagamento ou qualquer outra informação que você julgar importante que o novo proprietário veja e concorde antes da compra. O comprador precisa concordar com o corretor marcando a check box antes de concluir a compra. Corretores são sempre visíveis na janela About Land para todos os lotes que forem setados.
@@ -3415,7 +3391,10 @@ s
</alert>
<alert name="ConfirmPurchase">
<message name="message">
- Esta transação irá: [ACTION] Tem certeza de que deseja prosseguir com esta compra?
+ Esta transação fará:
+[ACTION]
+
+Você tem certeza de que deseja prosseguir com esta compra?
</message>
<option name="Confirm">
Confirmar
@@ -3426,7 +3405,11 @@ s
</alert>
<alert name="ConfirmPurchasePassword">
<message name="message">
- Esta transação irá: [ACTION] Tem certeza de que deseja prosseguir com esta compra? Por favor, digite sua senha e clique Confirmar.
+ Esta transação fará:
+[ACTION]
+
+Você tem certeza de que deseja prosseguir com esta compra?
+Por favor, re-insira sua senha e clique OK.
</message>
<option name="ConfirmPurchase">
Confirmar Compra
@@ -3434,7 +3417,6 @@ s
<option name="Cancel">
Cancelar
</option>
-
</alert>
<alert name="SetPickLocation">
<message name="message">
@@ -3448,8 +3430,8 @@ s
<message name="message">
Você selecionou itens 'no copy' do inventário. Estes itens serão movidos para o seu inventário, não copiados. Mover os itens do inventário?
</message>
- <ignore>
- Ao mover itens no-copy do inventário
+ <ignore name="ignore">
+ Quando estiver movendo objetos não copiáveis para o inventário
</ignore>
<option name="Move">
Mover
@@ -3460,10 +3442,13 @@ s
</alert>
<alert name="MoveInventoryFromScriptedObject">
<message name="message">
- Você selecionou itens 'no copy' do inventário. Estes itens serão movidos para o seu inventário, não copiados. Como este objeto contém script, mover estes itens para o seu inventário pode causar mal funcionamento do script. Mover os itens do inventário?
+ Você selecionou itens de inventário não copiáveis.
+Estes itens serão movidos para seu inventário, não copiados. Pelo fato de o objeto ter scripts, mover estes itens ao inventário pode provocar um mal funcionamento do script.
+
+Mover para o inventário o(s) iten(s)?
</message>
- <ignore>
- Ao mover objetos no-copy com script do invnetário
+ <ignore name="ignore">
+ Quando movendo objetos com scripts não copiáveis ao inventário
</ignore>
<option name="Move">
Mover
@@ -3476,8 +3461,8 @@ s
<message name="message">
Aviso: A ação executada ao clicar o objeto Pay já foi setada, mas funcionará apenas se um script for adicionado com o evento money(). Isto se dá porque os residentes geralmente esperam que os objetos terão alguma reação quando o dinheiro é pago a eles.
</message>
- <ignore>
- Ao setar 'Pay' em objetos sem eventos money()
+ <ignore name="ignore">
+ Quando Definindo 'Pagar' objetos sem eventos money()
</ignore>
</alert>
<alert name="OpenObjectCannotCopy">
@@ -3485,73 +3470,151 @@ s
Não há itens neste objeto que você está autorizado a copiar.
</message>
</alert>
- <alert name="LoadAccountTransactions">
+ <alert name="ClickOpenF1Help">
<message name="message">
- Ir para [URL] para ver detalhes da transação?
+ Visitar o website de Suporte do Second Life?
</message>
- <ignore>
- Ao carregar a página de transações
+ <ignore name="ignore">
+ Quando visitando o website de Suporte do Second Life
</ignore>
- <option name="OK">
- OK
+ <option name="Gotopage">
+ Ir
+ </option>
+ <option name="Cancel">
+ Cancelar
+ </option>
+ </alert>
+ <alert name="RetryFetchInventoryDescendents">
+ <message name="message">
+ O tempo de trazer o inventário do servidor expirou. Repetir?
+ </message>
+ <ignore name="ignore">
+ Repetir trazer inventário descendente
+ </ignore>
+ <option name="Retry">
+ Repetir
</option>
<option name="Cancel">
Cancelar
</option>
</alert>
+ <alert name="ConfirmQuit">
+ <message name="message">
+ Deseja sair?
+ </message>
+ <ignore name="ignore">
+ Quando Saindo do Second Life.
+ </ignore>
+ <option name="Quit">
+ Sair
+ </option>
+ <option name="Continue">
+ Continuar
+ </option>
+ </alert>
<alert name="HelpReportAbuseEmailLL">
<message name="message">
- Use esta ferramenta para reportar violações dos Termos de Serviço e Padrões da Comunidade. Veja: -http://secondlife.com/corporate/tos.php http://secondlife.com/corporate/cs.php - Todos os abusos reportados dos Termos de Serviço e Padrões da Comunidade são investigados e resolvidos. Você receberá um e-mail informando-lhe da resolução quando esta ocorrer. Você também pode ver a resolução do incidente no Incident Report em:- http://secondlife.com/support/incidentreport.php
+ Use esta ferramenta para reportar violações aos Termos de Serviço e aos Padrões da Comunidade. Veja:
+
+http://secondlife.com/corporate/tos.php
+http://secondlife.com/corporate/cs.php
+
+Todos os abusos aos Termos de Serviço e aos Padrões da Comunidade reportados, são investigados e resolvidos. Você pode ver a resolução do incidente na Reportagem de Incidentes em:
+
+http://secondlife.com/support/incidentreport.php
</message>
</alert>
<alert name="HelpReportAbuseEmailEO">
<message name="message">
- IMPORTANTE: Este report será enviado ao proprietário da região em que você está e não à Linden Lab. - Como prestador de serviço aos residentes e visitantes, o proprietário da região em que você está escolheu receber e resolver todos os reports originados nesta região. Linden Lab não investigará os reports que você postar deste local. O proprietário da região resolverá os reports baseados nas regras locais desta região como definido pelo corretor da região. (Veja os corretores no menu World e selecione About Land.) - A resolução deste report se aplica apenas a esta região; outras áreas do Second Life não serão afetadas pelo resultado deste report. Somente a Linden Lab pode restringir o acesso a todo o Second Life.
+ IMPORTANTE: Esta reportagem irá para o dono da região em que você se encontra atualmente e não para a Linden Lab.
+
+Como um serviço aos residentes e visitantes, o dono da região em que você se encontra foi eleito para receber e resolver todas as reportagens originadas nesta região. A Linden Lab não irá investigar reportagens que você envia desta localidade.
+
+O dono da região resolverá as reportagens baseado nas regras locais desta região, como definido na Declaração da propriedade.
+(Veja as declarações indo ao menu Mundo e selecionando Sobre a Terra.)
+
+A resolução desta reportagem se aplica apenas a esta região; o acesso de Residentes às outras áreas do Second Life não será afetado pelas decisões desta reportagem.
+Apenas a Linden Lab pode restringir acesso a todo o Second Life.
</message>
</alert>
<alert name="HelpReportBug">
<message name="message">
- Use esta ferramenta *somente* para reportar ferramentas técnicas que não se comportam como descrito ou esperado. Por favor, forneça o máximo possível de detalhes. Você pode responder ao e-mail que você recebeu para adicionar mais detalhes ao seu report. Todos os bugs reportados são investigados e avaliados. Você não receberá nenhum e-mail de resposta. - Se você está encontrado dificuldades técnicas, contate o suporte em: http://secondlife.com/community/support.php - Nota: reports incompletos não serão investigados.
+ Use esta ferramenta para reportar “apenas” características técnicas que não atuem como descrito ou esperado.
+Por favor, forneça tantos detalhes quanto possível.
+Você pode responder ao e-mail de resposta automática para adicionar mais detalhes à sua reportagem.
+
+Todas as reportagens de bugs são investigadas e avaliadas.
+Nenhum e-mail de resposta será enviado.
+
+Se você estiver tendo uma dificuldade técnica, por favor contate o Suporte em:
+
+http://secondlife.com/community/support.php
+
+Nota: reportagens incompletas não serão investigadas
</message>
</alert>
<alert name="HelpReportAbuseSelectCategory">
<message name="message">
- Por favor, selecione uma categoria para este caso de abuso. Isto nos ajuda a processar os abusos reportados.
+ Por favor, selecione uma categoria para a reportagem deste abuso. A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de abuso.
</message>
</alert>
<alert name="HelpReportBugSelectCategory">
<message name="message">
- Por favor, selecione uma categoria para este bug. Isto nos ajuda a processar os bugs reportados.
+ Por favor, selecione uma categoria para este bug.
+A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de bugs.
</message>
</alert>
<alert name="HelpReportAbuseAbuserNameEmpty">
<message name="message">
- Por favor, informe o nome do residente que cometeu o abuso. Um valor preciso nos ajuda a processar os abusos reportados.
+ Por favor, entre com o nome do perturbador.
+Entrando com um valor preciso, nos ajuda a arquivar e processar as reportagens de abuso.
</message>
</alert>
<alert name="HelpReportAbuseAbuserLocationEmpty">
<message name="message">
- Por favor, informe o local onde o abuso aconteceu. Um valor preciso nos ajuda a processar os abusos reportados.
+ Por favor, entre com a localidade aonde o abuso aconteceu.
+Entrando com um valor preciso, nos ajuda a arquivar e processar as reportagens de abuso.
</message>
</alert>
<alert name="HelpReportAbuseSummaryEmpty">
<message name="message">
- Por favor informe um resumo do abuso acontecido. Um resumo preciso nos ajuda a processar os abusos reportados.
+ Digite um resumo de como ocorreu o abuso.
+Fazer um resumo detalhado nos ajuda a processar o arquivos e relatórios do abuso.
</message>
</alert>
<alert name="HelpReportBugSummaryEmpty">
<message name="message">
- Por favor, informe um resumo do bug. Um resumo preciso nos ajuda a processar os bugs reportados.
+ Digite um resumo do bug.
Realizar um resumo detalhado nos ajuda a processar os relatórios do bug.
</message>
</alert>
<alert name="HelpReportAbuseDetailsEmpty">
<message name="message">
- Por favor, informe uma descrição detalhada do abuso acontecido. Seja o mais específico que puder, incluindo nomes e detalhes do incidente que está reportando. Uma descrição precisa nos ajuda a processar abusos reportados.
+ Digite uma descrição detalhada do abuso que ocorreu.
+Seja tão específico quanto você puder, incluindo nomes e os detalhes do incidente que está denunciando.
+Fazer uma descrição precisa nos ajuda a processar os arquivo e relatórios.
</message>
</alert>
<alert name="HelpReportBugDetailsEmpty">
<message name="message">
- Por favor, informe uma descrição detalhada do bug. Seja o mais específico que puder, incluindo passos para reproduzir o bug, se possível. Uma descrição precisa nos ajuda a processar bugs reportados.
+ Digite uma descrição detalhada do bug.
+Seja tão específico quanto você puder, incluindo as etapas para reproduzir o bug se possível.
+Fazer uma descrição precisa nos ajuda a processar os arquivos e relatórios de bugs.
+ </message>
+ </alert>
+ <alert name="HelpReportAbuseContainsCopyright">
+ <message name="message">
+ Caro Residente,
+
+Você parece estar relatando violação de propriedade intelectual. Por favor, certifique-se de que está relatando corretamente:
+
+(1) O Processo de abuso. Você pode apresentar um relatório de abuso se você acredita que um Residente está infringindo o sistema de permissões do Second Life, por exemplo, utilizando ferramentas CopyBot para copiar ou similar, para violar os direitos de propriedade intelectual. A Equipe de Abuso investigará os problemas de comportamento adequado a ação disciplinar, que viola o Estatuto da Comunidade Second Life ou os Termos de Serviço. No entanto, a mesma não controla e não irá responder aos pedidos para remover o conteúdo do mundo Second Life.
+
+(2) O processo de remoção de conteúdo ou DMCA. Para solicitar a remoção de conteúdo do Second Life, você deve enviar uma notificação válida de infração, conforme previsto em nossa Política de DMCA em http://secondlife.com/corporate/dmca.php.
+
+Se você ainda deseja prosseguir com o processo de abuso, por favor, feche esta janela e termine de enviar seu relatório. Pode ser necessário selecionar a categoria específica 'CopyBot Infração de Permissões'.
+
+Obrigado,
+Linden Lab
</message>
</alert>
<alert name="FailedRequirementsCheck">
@@ -3563,8 +3626,8 @@ s
<message name="message">
Já existe um objeto neste ponto do seu corpo. Você deseja substituí-lo pelo objeto selecionado?
</message>
- <ignore>
- Ao substituir o objeto existente
+ <ignore name="ignore">
+ Ao substituir os anexos existentes
</ignore>
<option ignore="Replace Automatically" name="Yes">
Sim
@@ -3577,8 +3640,8 @@ s
<message name="message">
Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos por troca neste pagamento. Você gostaria de deixar o modo Ocupado antes de completar esta transação?
</message>
- <ignore>
- Ao pagar uma pessoa ou objeto em modo Ocupado
+ <ignore name="ignore">
+ Ao pagar uma pessoa ou objeto no estado ocupado
</ignore>
<option ignore="Always leave Busy Mode" name="Yes">
Sim
@@ -3591,8 +3654,8 @@ s
<message name="message">
Tem certeza de que deseja remover permanentemente o conteúdo da lixeira de seu inventório?
</message>
- <ignore>
- Ao esvaziar a lixeira de seu inventório
+ <ignore name="ignore">
+ Ao esvaziar a pasta da lixeira no seu inventário
</ignore>
<option name="Yes">
Sim
@@ -3603,8 +3666,7 @@ s
</alert>
<alert name="ConfirmClearBrowserCache">
<message name="message">
- Você tem certesa que deseja limpar
-o cache do browser?
+ Você tem certeza que deseja limpar o cache do seu navegador?
</message>
<option name="Yes">
Sim
@@ -3615,8 +3677,18 @@ o cache do browser?
</alert>
<alert name="ConfirmClearCookies">
<message name="message">
- Você tem certesa que deseja limpar
-os cookies?
+ Você tem certeza de que deseja limpar os cookies?
+ </message>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Cancelar
+ </option>
+ </alert>
+ <alert name="ConfirmClearMediaUrlList">
+ <message name="message">
+ Você tem certeza de que deseja limpar toda sua lista de URLs?
</message>
<option name="Yes">
Sim
@@ -3630,8 +3702,8 @@ os cookies?
Deseja realmente remover permanentemente
o conteúdo da pasta achados e perdidos?
</message>
- <ignore>
- Quando remover permanentemente conteúdo da pasta achados e perdidos.
+ <ignore name="ignore">
+ Ao esvaziar pasta Achados e Perdidos do seu inventário
</ignore>
<option name="Yes">
Sim
@@ -3642,56 +3714,367 @@ o conteúdo da pasta achados e perdidos?
</alert>
<alert name="CopySLURL">
<message name="message">
- A seguinte SLURL foi copiada para o seu clipboard: [SLURL] Cole-a numa página web para permitir que outros residentes a acessem facilmente ou teste-a colando na barra de endereços do seu browser.
+ A seguinte SLURL foi copiada para o seu clipboard:
+ [SLURL]
+
+Coloque-o em uma página web para dar aos outros o fácil acesso a esse local ou experimentar colá-lo na barra de endereços do seu navegador.
</message>
- <ignore>
- Ao copiar a SLURL para o seu clipboard
+ <ignore name="ignore">
+ Ao copiar a SURL para o seu clipboard
</ignore>
</alert>
- <alert name="ClickPartnerHelpAvatar">
+ <alert name="GraphicsPreferencesHelp">
<message name="message">
- You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
+ Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do Client. O Preferências > Interface Gráfica permite escolher entre quatro níveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Custom e manipulando as seguintes definições:
+
+Sombreamento: Ativar ou desativar vários tipos de pixel sombreador.
+
+Detalhes de Reflexão: Define os tipos de objetos que a água pode refletir.
+
+Renderização de Avatar: Define opções que afetam a forma como o client renderizará os avatares.
+
+Alcance: Afeta a distância do seu ponto de vista que os objetos serão renderizados na cena.
+
+Número máximo de partículas: Define o número máximo de partículas que será capaz de ver na sua tela de uma só vez.
+
+Qualidade de Post Process: Define a resolução com a qual o brilho será renderizado.
-Go to the Second Life web site for more information on partnering?
+Detalhes de malha: Ajusta a quantidade de detalhes ou número de triângulos utilizados na renderização de certos objetos. Um valor mais alto leva mais tempo para renderizar, mas torna esses objetos mais detalhados.
+
+Detalhe de Iluminação: Seleciona os tipos de luzes que você gostaria de renderizar.
+
+Detalhe de Terreno: Ajusta a quantidade de detalhes que você gostaria de ver para a textura do terreno.
</message>
- <option name="GotoPage">
- Go to Page
+ </alert>
+ <alert name="WLSavePresetAlert">
+ <message name="message">
+ Você deseja substituir a apresentação salva?
+ </message>
+ <option name="Save">
+ Sim
+ </option>
+ <option name="Cancel">
+ Não
+ </option>
+ </alert>
+ <alert name="WLDeletePresetAlert">
+ <message name="message">
+ Você deseja apagar [SKY]?
+ </message>
+ <option name="Delete">
+ Sim
+ </option>
+ <option name="Cancel">
+ Não
+ </option>
+ </alert>
+ <alert name="WLNoEditDefault">
+ <message name="message">
+ Você não pode editar ou excluir um padrão predefinido.
+ </message>
+ </alert>
+ <alert name="WLMissingSky">
+ <message name="message">
+ Este arquivo de ciclo de dia possui um arquivo de céu faltando: [SKY].
+ </message>
+ </alert>
+ <alert name="PPSaveEffectAlert">
+ <message name="message">
+ Efeito PostProcess existe. Você deseja substituí-lo?
+ </message>
+ <option name="Save">
+ Sim
+ </option>
+ <option name="Cancel">
+ Não
+ </option>
+ </alert>
+ <alert name="HelpEditSky">
+ <message name="message">
+ Editar os controles graduais do WindLight para configurar e salvar um conjunto de céus.
+ </message>
+ </alert>
+ <alert name="HelpEditDayCycle">
+ <message name="message">
+ Definir qual céu colocar durante todo o dia.
+ </message>
+ </alert>
+ <alert name="EnvSettingsHelpButton">
+ <message name="message">
+ Essas configurações ajustar a forma como o ambiente parece localmente no seu computador. Sua placa de vídeo precisa suportar o sombreador atmosférico, a fim de ter acesso a todas as definições.
+
+Ajuste o controle gradual "Hora do Dia" para alterar o dia da fase localmente sobre o espectador.
+
+Ajuste o controle gradual de "Cobertura das nuvens" para controlar quantas nuvens cobrem o céu.
+
+Pegue uma cor da paleta de cores do "Cord a Água" para mudar a cor desta.
+
+Ajuste o controle gradual de "Névoa de Água" para controlar o quão denso é a névoa dentro da água.
+
+Clique "Usar Horário do Terreno" para redefinir a hora do dia para a região para o horário atual do dia e permanecer ligados a ela.
+
+Clique "Céu Avançado " para abrir um editor com configurações mais avançadas para o céu.
+
+Clique "Água Avançada " para abrir um editor com configurações mais avançadas para a água.
+ </message>
+ </alert>
+ <alert name="HelpDayCycle">
+ <message name="message">
+ Este editor de dia dá a você o controle sobre o ciclo de dia/noite do Second Life. Este é o ciclo usado pelo editor básico de clima do controle gradual da hora do dia.
+
+O editor do ciclo de dia trabalha configurado por keyframes (quadros-chave). Estes são pontos (representados pelos ícones cinza no gráfico de horário) que possui o padrão de céu associado a eles. Conforme o dia passa, o céu de Windlight " anima " a intersecção entre esses keyframes (quadros-chave).
+
+A seta amarela acima da linha de tempo representa a sua vista atua, baseada no horário do dia. Clique e arraste para ver como o seu dia será animado. Você pode adicionar ou deletar as keyframes (quadro-chave) pressionando os botões Adicionar Chave e Deletar chave ao lado direito da linha de tempo.
+
+Você pode configurar a posição do tempo de uma keyframe (quadro-chave) arrastando-o pela linha do tempo, ou configurando manualmente no quadro de configurações do seu keyframe (quadro-chave), será possível a você associar o seu keyframe a este respectivo padrão WindLight.
+
+A duração do ciclo determina a duração geral do "dia". Configurá-la para um valor baixo (por exmplo, 2 min.) quer dizer que a linha do tempo de 24 horas será animada completamente em apenas dois minutos reais! Assim que estiveres satisfeito com a linha do tempo e o ciclo do keyframe (quadro chave), use os botões Play e Stop para uma prévia de como ficará o resultado. Lembre-se você também pode utilizar a seta amarela indicadora do tempo acima da linha do tempo par aver o ciclo animado interativamente. Usando o botão do tempo do terreno irá sincronizá-lo a duração do seu dia ao ciclo diário do terreno.
+
+Assim que estiver satisfeito com o seu ciclo diário, pode salvá-lo ou carregar no botão de teste de dia . Note que agora nós permitimos apenas um Ciclo de dia.
+ </message>
+ </alert>
+ <alert name="HelpBlueHorizon">
+ <message name="message">
+ Use os cursores Vermelho/Verde/Azul ( Red/Green/Blue -RGB) para ajustar as cores do céu. Você também pode usar o controle de Intensidade (I) para mover os três controles RGB simultaneamente.
+ </message>
+ </alert>
+ <alert name="HelpHazeHorizon">
+ <message name="message">
+ Haze Horizon é um dos parâmetros mais úteis para ajuste global de exposição de luz na cena. Ele é eficaz para simular diversas configurações de exposição, tais como configurações para super exposição do sol e escuros halos de Iris.
+ </message>
+ </alert>
+ <alert name="HelpBlueDensity">
+ <message name="message">
+ A densidade global azul afeta a saturação da cor do céu e nevoeiro. Se você mover a o controle gradual de intensidade (I) para a direita, as cores vão se tornar mais brilhantes e vibrantes. Se você movê-lo totalmente para a esquerda, as cores perdem intensidade e cor, eventualmente chegando a preto e branco. Se pretende afinar o equilíbrio de cor do céu, você pode controlar os diversos elementos da saturação, utilizando os controles graduais para vermelho / verde / azul (RGB).
+ </message>
+ </alert>
+ <alert name="HelpHazeDensity">
+ <message name="message">
+ Densidade de Poeira controla o nível de fumaça, poeira cinza na atmosfera. Eficaz para simular cenas com altos níveis de poeira e poluentes. É também efetivo em simular névoa e nevoeiro.
+ </message>
+ </alert>
+ <alert name="HelpDensityMult">
+ <message name="message">
+ O Multiplicador de Densidade pode ser usado para afetar a densidade atmosférica global. Com definições mais baixas, ele cria uma sensação de "ar rarefeito" e em definições mais altas, ele cria um efeito mais denso, mais esfumaçado.
+ </message>
+ </alert>
+ <alert name="HelpDistanceMult">
+ <message name="message">
+ Ajusta como a distância no WindLight é percebida. Um valor zero efetivamente desativa a influência do WindLight sobre terrenos e objetos. Valores superiores a 1 simula os efeitos atmosféricos mais espessos a maiores distâncias.
+ </message>
+ </alert>
+ <alert name="HelpMaxAltitude">
+ <message name="message">
+ Max Altitude ajusta os cálculos de performance de altitude do WindLight, quando computa sua iluminação atmosférica. Em períodos vespertinos do dia, é útil para ajustar a "profundidade" de como o pôr-do-sol aparece.
+ </message>
+ </alert>
+ <alert name="HelpSunlightColor">
+ <message name="message">
+ Ajustar a cor e intensidade da luz direta na cena.
+ </message>
+ </alert>
+ <alert name="HelpSunAmbient">
+ <message name="message">
+ Ajusta a cor e a intensidade da luz ambiente atmosférica na cena.
+ </message>
+ </alert>
+ <alert name="HelpSunGlow">
+ <message name="message">
+ O controle gradual de Tamanho controla o do tamanho do sol.
+O controle gradual de Foco controla o quanto o sol aparecerá desfocado no céu.
+ </message>
+ </alert>
+ <alert name="HelpSceneGamma">
+ <message name="message">
+ Ajuste a tela da distribuição de luz e escuridão.
+ </message>
+ </alert>
+ <alert name="HelpStarBrightness">
+ <message name="message">
+ Ajusta o brilho das estrelas no céu.
+ </message>
+ </alert>
+ <alert name="HelpTimeOfDay">
+ <message name="message">
+ Controla a localização do sol no céu. Semelhante a elevação.
+ </message>
+ </alert>
+ <alert name="HelpEastAngle">
+ <message name="message">
+ Controla a localização do sol no céu.
+Similar ao azimute.
+ </message>
+ </alert>
+ <alert name="HelpCloudColor">
+ <message name="message">
+ Edita as cores das nuvens, É normalmente recomendado manter o tom esbranquiçado, mas hey! Você pode se divertir se desejar.
+ </message>
+ </alert>
+ <alert name="HelpCloudDetail">
+ <message name="message">
+ Controla os detalhes da camada de imagem superior na imagem de nuvem principal. X e Y controla sua posição. D (Densidade) controla o quão cheio ou estratificada as nuvens devem aparecer.
+ </message>
+ </alert>
+ <alert name="HelpCloudDensity">
+ <message name="message">
+ Permite que você controle a posição das nuvens com os cursores X e Y e a densidade deles com o cursor D
+ </message>
+ </alert>
+ <alert name="HelpCloudCoverage">
+ <message name="message">
+ Controla o quanto as nuvens cobrem o céu.
+ </message>
+ </alert>
+ <alert name="HelpCloudScale">
+ <message name="message">
+ Controla o dimensionamento da imagem de nuvens na cúpula celeste.
+ </message>
+ </alert>
+ <alert name="HelpCloudScrollX">
+ <message name="message">
+ Controla a velocidade das nuvens que se movem na direção X.
+ </message>
+ </alert>
+ <alert name="HelpCloudScrollY">
+ <message name="message">
+ Controla a velocidade que as núvens se movem na direção Y.
+ </message>
+ </alert>
+ <alert name="HelpClassicClouds">
+ <message name="message">
+ Marque esta check box para permitir a reprodução do nas nuvens classicas mais velhas do Second Life, além das nuvens WindLight.
+ </message>
+ </alert>
+ <alert name="HelpWaterFogColor">
+ <message name="message">
+ Escolhe a cor da neblina subaquática.
+ </message>
+ </alert>
+ <alert name="HelpWaterFogDensity">
+ <message name="message">
+ Controla a densidade da neblina da água e a distância de visibilidade debaixo d'água.
+ </message>
+ </alert>
+ <alert name="HelpUnderWaterFogMod">
+ <message name="message">
+ Modifica o efeito do expoente de densidade de Neblina para controlar até onde pode ver quando o seu avatar está imerso.
+ </message>
+ </alert>
+ <alert name="HelpWaterGlow">
+ <message name="message">
+ Controla o quanto a superfície da água deve brilhar.
+ </message>
+ </alert>
+ <alert name="HelpWaterNormalScale">
+ <message name="message">
+ Controla o escalonamento das três marolas que compõem a água.
+ </message>
+ </alert>
+ <alert name="HelpWaterFresnelScale">
+ <message name="message">
+ Controla o quanto de luz será refletido por ângulos diferentes.
+ </message>
+ </alert>
+ <alert name="HelpWaterFresnelOffset">
+ <message name="message">
+ Controla o quanto da intensidade da luz é refletida.
+ </message>
+ </alert>
+ <alert name="HelpWaterScaleAbove">
+ <message name="message">
+ Controla o quanto de luz será refratado olhando acima da superfície da água.
+ </message>
+ </alert>
+ <alert name="HelpWaterScaleBelow">
+ <message name="message">
+ Controla o quanto de luz sera refratado visto debaixo da superfície da água.
+ </message>
+ </alert>
+ <alert name="HelpWaterBlurMultiplier">
+ <message name="message">
+ Controla como ondas e reflexos são misturados.
+ </message>
+ </alert>
+ <alert name="HelpWaterNormalMap">
+ <message name="message">
+ Controla o mapeamento normal em todos os níveis da água para determinar reflexões / refração.
+ </message>
+ </alert>
+ <alert name="HelpWaterWave1">
+ <message name="message">
+ Controla como e a velocidade que a versão em escala maior do mapa move nas direções X e Y .
+ </message>
+ </alert>
+ <alert name="HelpWaterWave2">
+ <message name="message">
+ Controla onde e a velocidade que o mapa em escala menor se move nas direções X e Y.
+ </message>
+ </alert>
+ <alert name="NewSkyPreset">
+ <message name="message">
+ Me dê o nome para o novo céu.
+ </message>
+ <editline name="editline">
+ Novo padrão
+ </editline>
+ <option name="OK">
+ OK
</option>
<option name="Cancel">
- Cancel
+ Cancelar
</option>
</alert>
- <alert name="IMSessionStartError">
+ <alert name="ExistsSkyPresetAlert">
+ <message name="message">
+ Este padrão já existe!
+ </message>
+ </alert>
+ <alert name="NewWaterPreset">
<message name="message">
- Erro ao tentar um nova sessão MI com [RECIPIENT].
- [REASON]
+ Dê o nome para o novo padrão de água.
</message>
+ <editline name="editline">
+ Nova Apresentação
+ </editline>
<option name="OK">
OK
</option>
+ <option name="Cancel">
+ Cancelar
+ </option>
+ </alert>
+ <alert name="ExistsWaterPresetAlert">
+ <message name="message">
+ Este padrão já existe!
+ </message>
</alert>
- <alert name="IMSessionStartNotVerified">
+ <alert name="WaterNoEditDefault">
<message name="message">
- Erro ao tentar um nova sessão MI com [RECIPIENT].
- [REASON]
+ Você não pode editar ou apagar um padrão predefinido.
+ </message>
+ </alert>
+ <alert name="ChatterBoxSessionStartError">
+ <message name="message">
+ Não foi possível iniciar uma nova sessão bate-papo com [RECIPIENT].
+[REASON]
</message>
<option name="OK">
OK
</option>
</alert>
- <alert name="IMSessionEventError">
+ <alert name="ChatterBoxSessionEventError">
<message name="message">
- Erro [EVENT] [RECIPIENT].
- [REASON]
+ [EVENT]
+[REASON]
</message>
<option name="OK">
OK
</option>
</alert>
- <alert name="ForceCloseIMSession">
- <message name="messsage">
- Sua sessão com [NAME] será fechada.
- [REASON]
+ <alert name="ForceCloseChatterBoxSession">
+ <message name="message">
+ Sua seção de bate-papo com [NAME] tem que fechar.
+[REASON]
</message>
<option name="OK">
OK
@@ -3699,8 +4082,66 @@ Go to the Second Life web site for more information on partnering?
</alert>
<alert name="Cannot_Purchase_an_Attachment">
<message name="message">
- Os artigos não podem ser comprados
- enquanto forem parte de um acessório.
+ Os itens não podem ser comprados enquanto for parte de um anexo.
+ </message>
+ </alert>
+ <alert name="DebitPermissionDetails" title="Sobre o pedido de Permissão de Débito">
+ <message name="message">
+ Conceder esse pedido dá permissão ao script para tirar Linden dólares (L$) de sua conta. Para revogar esta permissão, o proprietário do objeto deve excluir o objeto ou resetar os scripts dele.
+ </message>
+ <option name="OK">
+ OK
+ </option>
+ </alert>
+ <alert name="AutoWearNewClothing">
+ <message name="message">
+ Você gostaria de vestir automaticamente o item de vestuário que você criar?
+ </message>
+ <ignore name="ignore">
+ Automaticamente vestir novo vestuário
+ </ignore>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Não
+ </option>
+ </alert>
+ <alert name="NotAgeVerified">
+ <message name="message">
+ Você precisa ter a idade verificada para acessar essa parcela. Gostaria de visitar o site do Second Life para verificação de idade?
+
+[_URL]
+ </message>
+ <ignore name="ignore">
+ Alertar sobre a falta de verificação de idade
+ </ignore>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Não
+ </option>
+ </alert>
+ <alert name="Cannot enter parcel: no payment info on file">
+ <message name="message">
+ Esta parcela exige que você tenha informações de pagamento no arquivo antes de poder acessá-la. Gostaria de visitar o site do Second Life para configurá-lo?
+
+[_URL]
+ </message>
+ <ignore name="ignore">
+ Avisar sobre a falta de informação de pagamento.
+ </ignore>
+ <option name="Yes">
+ Sim
+ </option>
+ <option name="No">
+ Não
+ </option>
+ </alert>
+ <alert name="MissingString">
+ <message name="message">
+ A sequência [STRING_NAME] está faltando do strings.xml
</message>
</alert>
</alerts>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index e78a5a5..10cce81 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="Sobre o Second Life">
-
+ <string name="you_are_at">
+ Você está em [POSITION]
+ </string>
</floater>
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 3e88b27..679868f 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -1,227 +1,258 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floaterland" title="Sobre o Terreno">
<tab_container name="landtab">
<panel label="Geral" name="land_general_panel">
- <text type="string" length="1" name="Name:">
+ <text length="1" name="Name:" type="string">
Nome:
</text>
- <text type="string" length="1" name="Description:">
+ <text length="1" name="Description:" type="string">
Descrição:
</text>
- <text type="string" length="1" name="Owner:">
+ <text length="1" name="Owner:" type="string">
Proprietário:
</text>
- <text type="string" length="1" name="OwnerText">
+ <text length="1" name="OwnerText" type="string">
Leyla Linden
</text>
- <button label="Perfil..." label_selected="Perfil..." name="Profile..." />
- <text type="string" length="1" name="Group:">
+ <button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+ <text length="1" name="Group:" type="string">
Grupo:
</text>
- <button label="Ajustar..." label_selected="Ajustar..." name="Set..." />
- <check_box label="Permitir posse para o grupo" name="check deed"
- tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha" />
- <button label="Passar..." label_selected="Deed..." name="Deed..."
- tool_tip="Você só pode acionar esta terra se você for um gerente selecionado pelo grupo.." />
- <check_box label="Proprietário faz contribuição com acionamento" name="check contrib"
- tool_tip="Quando a terra é acionada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la." />
- <text type="string" length="1" name="For Sale:">
+ <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
+ <check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
+ <button label="Passar..." label_selected="Deed..." name="Deed..." tool_tip="Você só pode acionar esta terra se você for um gerente selecionado pelo grupo.."/>
+ <check_box label="Proprietário faz contribuição com acionamento" name="check contrib" tool_tip="Quando a terra é acionada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
+ <text length="1" name="For Sale:" type="string">
A Venda:
</text>
- <text type="string" length="1" name="Not for sale.">
+ <text length="1" name="Not for sale." type="string">
Não Está a Venda.
</text>
- <text type="string" length="1" name="For Sale: Price L$[PRICE].">
+ <text length="1" name="For Sale: Price L$[PRICE]." type="string">
Preço: L$[PRICE].
</text>
- <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..." />
- <text type="string" length="1" name="For sale to">
+ <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
+ <text length="1" name="For sale to" type="string">
A venda para: [BUYER]
</text>
- <text type="string" length="1" name="Sell with landowners objects in parcel.">
+ <text length="1" name="Sell with landowners objects in parcel." type="string">
A venda (Objetos incluídos).
</text>
- <text type="string" length="1" name="Selling with no objects in parcel.">
+ <text length="1" name="Selling with no objects in parcel." type="string">
A Venda (Objetos não Incluídos).
</text>
- <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno"
- name="Cancel Land Sale" />
- <text type="string" length="1" name="Claimed:">
+ <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" name="Cancel Land Sale"/>
+ <text length="1" name="Claimed:" type="string">
Solicitado
</text>
- <text type="string" length="1" name="DateClaimText">
+ <text length="1" name="DateClaimText" type="string">
Ter Ago 15 13:47:25 2006
</text>
- <text type="string" length="1" name="PriceLabel">
+ <text length="1" name="PriceLabel" type="string">
Área:
</text>
- <text type="string" length="1" name="PriceText">
+ <text length="1" name="PriceText" type="string">
4048 m2.
</text>
- <text type="string" length="1" name="Traffic:">
+ <text length="1" name="Traffic:" type="string">
Tráfego:
</text>
- <text type="string" length="1" name="DwellText">
+ <text length="1" name="DwellText" type="string">
0
</text>
- <button label="Comprar Terra..." label_selected="Comprar Terra..." name="Buy Land..." />
- <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..."
- name="Buy For Group..." />
- <button label="Comprar Passe..." label_selected="Comprar Passe..." name="Buy Pass..."
- tool_tip="Uma passagem concede a você acesso temporário a esta terra." />
- <button label="Abandonar Terra.." label_selected="Abandonar Terra.."
- name="Abandon Land..." />
- <button label="Reclamar Terra..." label_selected="Reclamar Terra..."
- name="Reclaim Land..." />
- <button label="Linden Sale..." label_selected="Linden Sale..." name="Linden Sale..."
- tool_tip="A terra precisa ser proprietária, estar com o conteúdo configurado e não estar pronta para leilão." />
- <text name="new users only">
+ <button label="Comprar Terra..." label_selected="Comprar Terra..." name="Buy Land..."/>
+ <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
+ <button label="Comprar Passe..." label_selected="Comprar Passe..." name="Buy Pass..." tool_tip="Uma passagem concede a você acesso temporário a esta terra."/>
+ <button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
+ <button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
+ <button label="Linden Sale..." label_selected="Linden Sale..." name="Linden Sale..." tool_tip="A terra precisa ser proprietária, estar com o conteúdo configurado e não estar pronta para leilão."/>
+ <string name="new users only">
Somente novos usuários
- </text>
- <text name="anyone">
+ </string>
+ <string name="anyone">
Qualquer um
- </text>
+ </string>
+ <string name="area_text">
+ Área
+ </string>
+ <string name="area_size_text">
+ [AREA] m2.
+ </string>
+ <string name="auction_id_text">
+ ID do Leilão: [ID]
+ </string>
+ <string name="need_tier_to_modify">
+ Você deve ter sua compra aprovada para modificar este terreno.
+ </string>
+ <string name="group_owned_text">
+ (Possuído pelo Grupo)
+ </string>
+ <string name="profile_text">
+ Perfil...
+ </string>
+ <string name="info_text">
+ Informação...
+ </string>
+ <string name="public_text">
+ (público)
+ </string>
+ <string name="none_text">
+ (nenhum)
+ </string>
+ <string name="sale_pending_text">
+ (Venda Pendente)
+ </string>
+ <string name="no_selection_text">
+ Nenhum terreno selecionado.
+Vá para o menu Mundo > Sobre a Terra ou selecione outro terreno para mostrar seus detalhes.
+ </string>
</panel>
<panel label="Corretor" name="land_covenant_panel">
- <text type="string" length="1" name="covenant_timestamp_text">
+ <text length="1" name="covenant_timestamp_text" type="string">
Última Alteração: Qua, Dez 31 16:00:00 1969
</text>
- <text type="string" length="1" name="region_name_lbl">
+ <text length="1" name="region_name_lbl" type="string">
Região:
</text>
- <text type="string" length="1" name="region_name_text">
+ <text length="1" name="region_name_text" type="string">
leyla
</text>
- <text type="string" length="1" name="estate_name_lbl">
+ <text length="1" name="estate_name_lbl" type="string">
Estado:
</text>
- <text type="string" length="1" name="estate_name_text">
+ <text length="1" name="estate_name_text" type="string">
mainland
</text>
- <text type="string" length="1" name="estate_owner_lbl">
+ <text length="1" name="estate_owner_lbl" type="string">
Proprietário do Estado:
</text>
- <text type="string" length="1" name="estate_owner_text">
+ <text length="1" name="estate_owner_text" type="string">
(nenhum)
</text>
- <text type="string" length="1" name="resellable_clause">
+ <text length="1" name="resellable_clause" type="string">
Terra comprada nesta região não pode ser revendida.
</text>
- <text type="string" length="1" name="changeable_clause">
+ <text length="1" name="changeable_clause" type="string">
Terra comrpada nesta região não poderá ser compartilhada ou sub-dividida.
</text>
- <text_editor type="string" length="1" name="covenant_editor">
+ <text_editor length="1" name="covenant_editor" type="string">
Não há corretor para este Estado.
</text_editor>
- <text name="can_resell">
+ <string name="can_resell">
Terra comprada nesta região pode ser revendida.
- </text>
- <text name="can_not_resell">
+ </string>
+ <string name="can_not_resell">
Terra comprada nesta região não pode ser revendida.
- </text>
- <text name="can_change">
- Terra comprada nesta região pode ser compartilhada ou
-sub-dividida.
- </text>
- <text name="can_not_change">
- Terra comprada nesta região não pode ser
-compartilhada ou sub-dividida..
- </text>
+ </string>
+ <string name="can_change">
+ Terra comprada nesta região pode ser compartilhada ou sub-dividida.
+ </string>
+ <string name="can_not_change">
+ Terra comprada nesta região não pode ser compartilhada ou sub-dividida..
+ </string>
</panel>
<panel label="Objetos" name="land_objects_panel">
- <text type="string" length="1" name="Simulator primitive usage:">
+ <text name="parcel_object_bonus">
+ Fator de Bonus para Objetos na Região: [BONUS]
+ </text>
+ <text length="1" name="Simulator primitive usage:" type="string">
Uso do simulador de primitivas:
</text>
- <text type="string" length="1" name="Primitives parcel supports:">
+ <text name="objects_available" left="214" width="230">
+ [COUNT] de [MAX] ([AVAILABLE] disponíveis)
+ </text>
+ <string name="objects_available_text">
+ [COUNT] de [MAX] ([AVAILABLE] disponíveis)
+ </string>
+ <string name="objects_deleted_text">
+ [COUNT] de [MAX] ([DELETED] serão deletados)
+ </string>
+ <text length="1" name="Primitives parcel supports:" type="string" width="200">
Primitivas suportadas pelo terreno:
</text>
- <text type="string" length="1" name="object_contrib_text">
+ <text length="1" name="object_contrib_text" type="string" left="214" width="152">
[COUNT]
</text>
- <text type="string" length="1" name="Primitives on parcel:">
+ <text length="1" name="Primitives on parcel:" type="string">
Primitivas no Lote:
</text>
- <text type="string" length="1" name="total_objects_text">
+ <text length="1" name="total_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <text type="string" length="1" name="Owned by parcel owner:">
+ <text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
Pertencentes ao dono:
</text>
- <text type="string" length="1" name="owner_objects_text">
+ <text length="1" name="owner_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" />
- <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..."
- tool_tip="Retorno os objetos aos seus proprietários." />
- <text type="string" length="1" name="Set to group:">
+ <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
+ <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Retorno os objetos aos seus proprietários." right="-10" width="119"/>
+ <text length="1" name="Set to group:" type="string" left="14" width="180">
Configurados ao grupo:
</text>
- <text type="string" length="1" name="group_objects_text">
+ <text length="1" name="group_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" />
- <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..."
- tool_tip="Retornar os objetos para seus proprietários." />
- <text type="string" length="1" name="Owned by others:">
+ <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" width="60" right="-135"/>
+ <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar os objetos para seus proprietários." right="-10" width="119"/>
+ <text length="1" name="Owned by others:" type="string" left="14" width="128">
Propriedade de Outros:
</text>
- <text type="string" length="1" name="other_objects_text">
+ <text length="1" name="other_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowOther" />
- <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..."
- tool_tip="Retornar os objetos aos seus proprietários." />
- <text type="string" length="1" name="Selected / sat upon:">
+ <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
+ <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar os objetos aos seus proprietários." right="-10" width="119"/>
+ <text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
Selecionado/Sentado:
</text>
- <text type="string" length="1" name="selected_objects_text">
+ <text length="1" name="selected_objects_text" type="string" left="214" width="48">
[COUNT]
</text>
- <text type="string" length="1" name="Autoreturn">
+ <text length="1" name="Autoreturn" type="string" width="412" left="4">
Auto-retornar objetos dos outros residentes (minutos):
</text>
- <text type="string" length="1" name="Object Owners:">
- Proprietários dos Objetos:
- </text>
- <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List" />
- <button label="Objetos Retornados..." label_selected="Objetos Retornados..."
- name="Return objects..." />
- <button label="" label_selected="" name="Type" tool_tip="Organizar por Tipo" />
- <button label="Nome" label_selected="Nome" name="Name" tool_tip="Organizar por Nome" />
- <button label="Quantidade" label_selected="Quantidade" name="Count"
- tool_tip="Organizar por Quantidade" />
+ <line_editor name="clean other time" right="-6" width="36" />
+ <text length="1" name="Object Owners:" type="string">
+ Proprietários:
+ </text>
+ <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List"/>
+ <button label="Objetos Retornados..." label_selected="Objetos Retornados..." name="Return objects..."/>
+ <name_list name="owner list">
+ <column label="Tipo" name="type"/>
+ <column label="Nome" name="name"/>
+ <column label="Contar" name="count"/>
+ </name_list>
</panel>
<panel label="Opções" name="land_options_panel">
- <text type="string" length="1" name="allow_label">
+ <text length="1" name="allow_label" type="string">
Permitir outros residentes a:
</text>
- <check_box label="Editar Terreno" name="edit land check" />
- <check_box label="Criar Landmarks" name="check landmark" />
- <check_box label="Voar" name="check fly" />
- <text type="string" length="1" name="allow_label2">
+ <check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
+ <check_box label="Criar Landmarks" name="check landmark"/>
+ <check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
+ <text length="1" name="allow_label2" type="string">
Criar Objetos:
</text>
- <check_box label="Residentes" name="edit objects check" />
- <check_box label="Grupo" name="edit group objects check" />
- <text type="string" length="1" name="allow_label3">
+ <check_box label="Residentes" name="edit objects check"/>
+ <check_box label="Grupo" name="edit group objects check"/>
+ <text length="1" name="allow_label3" type="string">
Entrada do Objeto:
</text>
- <check_box label="Residentes" name="all object entry check" />
- <check_box label="Grupo" name="group object entry check" />
- <text type="string" length="1" name="allow_label4">
+ <check_box label="Residentes" name="all object entry check"/>
+ <check_box label="Grupo" name="group object entry check"/>
+ <text length="1" name="allow_label4" type="string">
Executar Scripts:
</text>
- <check_box label="Residentes" name="check other scripts" />
- <check_box label="Grupo" name="check group scripts" />
- <text type="string" length="1" name="land_options_label">
+ <check_box label="Residentes" name="check other scripts"/>
+ <check_box label="Grupo" name="check group scripts"/>
+ <text length="1" name="land_options_label" type="string">
Opções de Terra:
</text>
- <check_box label="Salvo (sem dano)" name="check safe" />
- <check_box label="Restrict Pushing" name="PushRestrictCheck"
- tool_tip="llPushObject só funcionará nos scripts do proprietário do lote ou nos scripts de quem empurra." />
- <check_box label="Mostrar nos locais de Busca (L$30/semana) sobre"
- name="ShowDirectoryCheck" />
- <combo_box name="land category">
+ <check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/>
+ <check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
+ <check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
+ <combo_box name="land category" left="286" width="146" >
<combo_item name="AnyCategory">
Qualquer Categoria
</combo_item>
@@ -262,68 +293,140 @@ compartilhada ou sub-dividida..
Outros
</combo_item>
</combo_box>
- <check_box label="Publicar lista na web" name="PublishCheck"
- tool_tip="Publicar informações do seu lote na web." />
- <check_box label="Mature content" name="MatureCheck"
- tool_tip="As informações do seu lote são consideradas para Adultos." />
- <button label="?" label_selected="?" name="?" />
- <text type="string" length="1" name="Snapshot:">
+ <button label="?" label_selected="?" name="?"/>
+ <check_box label="Mature content" name="MatureCheck" tool_tip="As informações do seu lote são consideradas para Adultos."/>
+ <text length="1" name="Snapshot:" type="string">
Foto:
</text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem" />
- <text type="string" length="1" name="Landing Point: (none)">
- Landing Point: (nenhum)
+ <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
+ <text name="landing_point">
+ Ponto de Aterrissagem: [LANDING]
</text>
- <button label="Set" label_selected="Ajustar" name="Set"
- tool_tip="Ajuste o landing point para a posição do seu avatr. Ele precisa ser dentro deste lote." />
- <button label="Limpar" label_selected="Limpar" name="Clear"
- tool_tip="Limpar o landing point." />
- <text type="string" length="1" name="Teleport Routing: ">
+ <string name="landing_point_none">
+ (nenhum)
+ </string>
+ <button label="Set" label_selected="Ajustar" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define a localidade para seu avatar dentro deste terreno."/>
+ <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o landing point."/>
+ <text length="1" name="Teleport Routing: " type="string">
Rota de Tele-transporte:
</text>
- <combo_box name="landing type"
- tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote.">
- <combo_item type="string" length="1" name="Blocked">
+ <combo_box name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." left="140" width="140" >
+ <combo_item length="1" name="Blocked" type="string">
Bloqueado
</combo_item>
- <combo_item type="string" length="1" name="LandingPoint">
+ <combo_item length="1" name="LandingPoint" type="string">
Landing Point
</combo_item>
- <combo_item type="string" length="1" name="Anywhere">
+ <combo_item length="1" name="Anywhere" type="string">
Qualquer lugar
</combo_item>
</combo_box>
+ <string name="push_restrict_text">
+ Sem Empurrar
+ </string>
+ <string name="push_restrict_region_text">
+ Sem Empurrar (Imposição na Região)
+ </string>
</panel>
<panel label="Mídia" name="land_media_panel">
- <check_box label="Restringir som espacial a este lote" name="check sound local" />
- <text type="string" length="1" name="Music URL:">
- URL Música:
- </text>
- <text type="string" length="1" name="Media texture:">
- Textura de Mídia:
+ <text name="with media:" width="85">
+ Tipo de Mídia:
</text>
- <text type="string" length="1" name="Replace this texture:">
- Substituir esta Textura:
+ <combo_box name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mídia" left="97"/>
+ <text name="at URL:" width="85">
+ URL da Mídia:
</text>
- <texture_picker label="" name="media texture" tool_tip="Clique para escolher uma imagem" />
- <text type="string" length="1" name="with content from this URL:">
- com conteúdo desta URL:
+ <line_editor name="media_url" left="97"/>
+ <button label="Definir..." label_selected="Ajustar..." name="set_media_url"/>
+ <text name="Description:">
+ Descrição:
</text>
- <check_box label="Conteudo Auto-Ajustavel (lento e reduz a qualidade visual)"
- name="media_auto_scale"
- tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. O lote pode se tornar lento e com baixa qualidade visual nenhum outro ajuste de textura ou alinhamento será necessário." />
+ <line_editor name="url_description" tool_tip="Texto mostrado ao lado do botão reproduzir/carregar" left="97"/>
+ <text length="1" name="Media texture:" type="string">
+ Substituir
+Texture:
+ </text>
+ <texture_picker label="" name="media texture" tool_tip="Clique para escolher uma imagem" left="97"/>
+ <text name="replace_texture_help">
+ (Objetos usando esta textura, mostrarão o filme ou
+a página web depois que você clicar na seta de reproduzir.)
+ </text>
+ <text name="Options:">
+ Mídia
+Options:
+ </text>
+ <check_box left="97" label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. O lote pode se tornar lento e com baixa qualidade visual nenhum outro ajuste de textura ou alinhamento será necessário."/>
+ <check_box label="Mídia em Repetição" name="media_loop" tool_tip="Executar a mídia repetidamente. Quando a mídia terminar a execução, ela reiniciará do começo."/>
+ <check_box left="97" label="Esconder a URL da Mídia" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do terreno. Notar que isto não está disponível para tipos HTML."/>
+ <check_box label="Esconder a URL de Música" name="hide_music_url" tool_tip="Ativando esta opção, a URL de música se esconderá para visualizadores não autorizados a ver esta informação do terreno"/>
+ <text name="media_size" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." width="105" left="102">
+ Tamanho da mídia:
+ </text>
+ <spinner name="media_size_width" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." left_delta="89"/>
+ <spinner name="media_size_height" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão."/>
+ <text name="pixels">
+ pixels
+ </text>
+ <text name="MusicURL:">
+ URL da Música:
+ </text>
+ <line_editor name="music_url" left="97"/>
+ <text name="Sound:">
+ Som:
+ </text>
+ <check_box label="Restringir som espacial a este lote" name="check sound local" left="97"/>
+ <text name="Voice settings:">
+ Voz:
+ </text>
+ <radio_group name="parcel_voice_channel" left="97" width="310">
+ <radio_item name="Estate">
+ Usar o canal espacial da Propriedade
+ </radio_item>
+ <radio_item name="Private">
+ Usar um canal especial privado
+ </radio_item>
+ <radio_item name="Disabled">
+ Desabilitar audio espacial neste terreno
+ </radio_item>
+ </radio_group>
</panel>
<panel label="Acesso" name="land_access_panel">
- <text type="string" length="1" name="Limit access to this parcel to:">
- Limitar acesso a este lote a:
- </text>
- <check_box label="Grupo: (nenhum)" name="GroupCheck" />
- <text name="BanCheck">Banir estes Avatares:</text>
- <button label="Incluir..." label_selected="Incluir..." name="add_banned" />
- <button label="Remover" label_selected="Remover" name="remove_banned" />
- <check_box label="Vender passes permitindo acesso temporário:" name="PassCheck" />
- <spinner label="Preço em L$:" name="PriceSpin" />
- <spinner label="Horas de Acesso:" name="HoursSpin" />
+ <text length="1" name="Limit access to this parcel to:" type="string">
+ Acesso a Este Terreno
+ </text>
+ <check_box label="Permitir Acesso Público" name="public_access"/>
+ <text name="Only Allow">
+ Bloquear Acesso por:
+ </text>
+ <check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+ <check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/>
+ <string name="estate_override">
+ Uma ou mais destas opções está definida no nível de propriedade.
+ </string>
+ <check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
+ <check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
+ <combo_box name="pass_combo">
+ <combo_item name="Anyone">
+ Qualquer um
+ </combo_item>
+ <combo_item name="Group">
+ Grupo
+ </combo_item>
+ </combo_box>
+ <spinner label="Preço em L$:" name="PriceSpin"/>
+ <spinner label="Horas de Acesso:" name="HoursSpin"/>
+ <text label="Permitir Sempre" name="AllowedText">
+ Residentes Permitidos
+ </text>
+ <name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+ <button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/>
+ <button label="Remover" label_selected="Remover" name="remove_allowed"/>
+ <text label="Banir" name="BanCheck">
+ Residentes Banidos
+ </text>
+ <name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+ <button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/>
+ <button label="Remover" label_selected="Remover" name="remove_banned"/>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_active_speakers.xml b/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
new file mode 100644
index 0000000..100e819
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="active_speakers" title="Active Speakers">
+ <panel name="active_speakers_panel">
+ <panel name="volume_container">
+ <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+ </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index de8d637..b55879b 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Animation Preview" title="">
<text name="name_label">
Nome:
@@ -6,36 +6,14 @@
<text name="description_label">
Descrição:
</text>
- <spinner label="Prioridade" name="priority"
- tool_tip="Controle com o qual umas animações podem ser sobrepostas por outras." />
- <text name="preview_label">
- Prever enquanto
- </text>
- <combo_box label="" name="preview_base_anim"
- tool_tip="Use isso para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
- <combo_item name="Standing">
- Parado
- </combo_item>
- <combo_item name="Walking">
- Andando
- </combo_item>
- <combo_item name="Sitting">
- Sentando
- </combo_item>
- <combo_item name="Flying">
- Voando
- </combo_item>
- </combo_box>
- <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente." />
- <spinner label="Dentro(%)" name="loop_in_point"
- tool_tip="Ajusta o ponto onde a repetição começa." />
- <spinner label="Fora(%)" name="loop_out_point"
- tool_tip="Ajusta o ponto onde a repetição termina." />
+ <spinner label="Prioridade" name="priority" tool_tip="Controle com o qual umas animações podem ser sobrepostas por outras."/>
+ <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
+ <spinner label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto onde a repetição começa."/>
+ <spinner label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto onde a repetição termina."/>
<text name="hand_label">
Posição Manual
</text>
- <combo_box label="" name="hand_pose_combo"
- tool_tip="Controla o que as mãos fazem durante a animação">
+ <combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
<combo_item name="Spread">
Espreguiçar
</combo_item>
@@ -79,8 +57,7 @@
<text name="emote_label">
Expressão
</text>
- <combo_box label="" name="emote_combo"
- tool_tip="Controla o que a face faz durante a animação.">
+ <combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
<combo_item name="[None]">
[None]
</combo_item>
@@ -142,16 +119,44 @@
Preocupado
</combo_item>
</combo_box>
- <spinner label="Ease In (sec)" name="ease_in_time"
- tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem." />
- <spinner label="Ease Out (sec)" name="ease_out_time"
- tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem." />
- <button label="" name="play_btn" tool_tip="Executa/pausa sua animação." />
- <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação." />
- <slider label="" name="playback_slider" />
+ <text name="preview_label">
+ Prever enquanto
+ </text>
+ <combo_box label="" name="preview_base_anim" tool_tip="Use isso para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
+ <combo_item name="Standing">
+ Parado
+ </combo_item>
+ <combo_item name="Walking">
+ Andando
+ </combo_item>
+ <combo_item name="Sitting">
+ Sentando
+ </combo_item>
+ <combo_item name="Flying">
+ Voando
+ </combo_item>
+ </combo_box>
+ <spinner label="Ease In (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
+ <spinner label="Ease Out (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
+ <button label="" name="play_btn" tool_tip="Executa/pausa sua animação."/>
+ <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
+ <slider label="" name="playback_slider"/>
<text name="bad_animation_text">
Incapaz de ler o arquivo de animação. Nós recomendamos exportar arquivos BVH do Poser 4.
</text>
- <button label="Cancelar" name="cancel_btn" />
- <button label="Carregar (L$[AMOUNT])" name="ok_btn" />
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
+ <string name="failed_to_initialize">
+ Não foi possível iniciar o movimento
+ </string>
+ <string name="anim_too_long">
+ O arquivo de animação tem [LENGTH] segundos de duração.
+
+Duração maxima de animação permitida é de [MAX_LENGTH] segundos.
+ </string>
+ <string name="failed_file_read">
+ Não foi possível ler o arquivo de animação.
+
+[STATUS]
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index a4c6c37..cc00584 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="avatarpicker" title="Escolha de pessoa">
- <text name="Type part of the resident's name:">
- Digite o nome da pessoa:
+ <text name="instruct_search_resident_name">
+ Digitar parte do nome do residente:
</text>
- <button label="Encontrar" label_selected="Encontrar" name="Find" />
+ <button label="Encontrar" label_selected="Encontrar" name="Find"/>
<text name="Or select their calling card:">
Ou selecione um cartão:
</text>
- <button label="Selecionar" label_selected="Selecionar" name="Select" />
- <button label="Fechar" label_selected="Fechar" name="Close" />
- <text name="NotFound">
+ <button label="Fechar" label_selected="Fechar" name="Close"/>
+ <button label="Selecionar" label_selected="Selecionar" name="Select"/>
+ <string name="NotFound">
'[TEXT]' não encontrado
- </text>
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 7533298..8528f67 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="avatar_texture_debug" title="Textura do Avatar">
- <text name="">
- Texturas prontas
+ <text name="baked_label">
+ Texturas sobrepostas
</text>
- <text name="">
- Texturas Compostas
+ <text name="composite_label">
+ Texturas compostas
</text>
- <texture_picker label="Cabeça" name="baked_head" />
- <texture_picker label="Maquiagem" name="head_bodypaint" />
- <texture_picker label="Cabelo" name="hair" />
- <button label="Tombar" label_selected="Tombar" name="Dump" />
- <texture_picker label="Olhos" name="baked_eyes" />
- <texture_picker label="Olho" name="eye_texture" />
- <texture_picker label="Parte de cima" name="baked_upper_body" />
- <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint" />
- <texture_picker label="Camiseta" name="undershirt" />
- <texture_picker label="Luvas" name="gloves" />
- <texture_picker label="Camisa" name="shirt" />
- <texture_picker label="Jaqueta" name="upper_jacket" />
- <texture_picker label="Parte de baixo" name="baked_lower_body" />
- <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint" />
- <texture_picker label="Roupas de baixo" name="underpants" />
- <texture_picker label="Meias" name="socks" />
- <texture_picker label="Calçados" name="shoes" />
- <texture_picker label="Calças" name="pants" />
- <texture_picker label="Jaqueta" name="jacket" />
- <texture_picker label="Saia" name="baked_skirt" />
- <texture_picker label="Saia" name="skirt_texture" />
+ <texture_picker label="Cabeça" name="baked_head"/>
+ <texture_picker label="Maquiagem" name="head_bodypaint"/>
+ <texture_picker label="Cabelo" name="hair"/>
+ <button label="Tombar" label_selected="Tombar" name="Dump"/>
+ <texture_picker label="Olhos" name="baked_eyes"/>
+ <texture_picker label="Olho" name="eye_texture"/>
+ <texture_picker label="Parte de cima" name="baked_upper_body"/>
+ <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/>
+ <texture_picker label="Camiseta" name="undershirt"/>
+ <texture_picker label="Luvas" name="gloves"/>
+ <texture_picker label="Camisa" name="shirt"/>
+ <texture_picker label="Jaqueta" name="upper_jacket"/>
+ <texture_picker label="Parte de baixo" name="baked_lower_body"/>
+ <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/>
+ <texture_picker label="Roupas de baixo" name="underpants"/>
+ <texture_picker label="Meias" name="socks"/>
+ <texture_picker label="Calçados" name="shoes"/>
+ <texture_picker label="Calças" name="pants"/>
+ <texture_picker label="Jaqueta" name="jacket"/>
+ <texture_picker label="Saia" name="baked_skirt"/>
+ <texture_picker label="Saia" name="skirt_texture"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml
new file mode 100644
index 0000000..244a7db
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balizas">
+ <panel name="beacons_panel">
+ <check_box label="Objetos escriptados com toque único" name="touch_only"/>
+ <check_box label="Objetos escriptados" name="scripted"/>
+ <check_box label="Objetos físicos" name="physical"/>
+ <check_box label="Fontes de Som" name="sounds"/>
+ <check_box label="Fontes de Partículas" name="particles"/>
+ <check_box label="Renderização de Highlights" name="highlights"/>
+ <check_box label="Renderização de Balizas" name="beacons"/>
+ <text name="beacon_width_label">
+ Largura da Baliza
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 8f23a06..c52ccad 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="build options floater" title="Opções de grade">
- <spinner label="Uni. Grade (metros)" name="GridResolution" />
- <spinner label="Ext. da Grade (metros)" name="GridDrawSize" />
- <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit" />
- <slider label="Opacidade da grade" name="GridOpacity" />
+ <spinner label="Uni. Grade (metros)" name="GridResolution"/>
+ <spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+ <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
+ <check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
+ <slider label="Opacidade da grade" name="GridOpacity"/>
</floater>
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 f68311e..78b098b 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?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:
@@ -6,7 +6,16 @@
<text name="buy_text">
Comprar por L$[AMOUNT] de(a) [NAME]?
</text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
- <button label="Comprar" label_selected="Comprar" name="buy_btn" />
- <check_box label="Vestir roupa agora" name="wear_check" />
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+ <check_box label="Vestir roupa agora" name="wear_check"/>
+ <string name="no_copy_text">
+ (sem copiar)
+ </string>
+ <string name="no_modify_text">
+ (sem modificar)
+ </string>
+ <string name="no_transfer_text">
+ (sem transferir)
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index ccc61c1..e28fcc3 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -1,10 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="buy currency" title="Adquira Lindens (L$)">
- <text name="cp">
- A partir de agora você já pode comprar seus Lindens.
-
-Para isso, siga até o menu superior e clique no item
-Seviços e em seguida selecione "Compra de Lindens".
+ <text name="info_buying">
+ Comprando Moeda:
</text>
- <button label="Fechar" name="cancel_btn" />
+ <text name="info_cannot_buy">
+ Não pode comprar agora:
+ </text>
+ <text name="info_need_more">
+ Você precisa de mais moeda:
+ </text>
+ <text name="error_message">
+ Algo não está certo.
+ </text>
+ <button label="Ir para website" name="error_web"/>
+ <text name="contacting">
+ Contatando LindeX...
+ </text>
+ <text name="buy_action_unknown">
+ Comprar L$ sobre o câmbio corrente da LindeX
+ </text>
+ <text name="buy_action">
+ [NAME] L$ [PRICE]
+ </text>
+ <text name="currency_action">
+ Comprar L$
+ </text>
+ <line_editor name="currency_amt">
+ 1234
+ </line_editor>
+ <text name="currency_est">
+ Por aproximadamente. US$ [dólares americanos]
+ </text>
+ <text name="getting_data">
+ Primeiros dados...
+ </text>
+ <text name="balance_label">
+ Você tem atualmente
+ </text>
+ <text name="balance_amount">
+ L$ [AMT]
+ </text>
+ <text name="buying_label">
+ Você está comprando
+ </text>
+ <text name="buying_amount">
+ L$ [AMT]
+ </text>
+ <text name="total_label">
+ Seu saldo será
+ </text>
+ <text name="total_amount">
+ L$ [AMT]
+ </text>
+ <text name="purchase_warning_repurchase">
+ Confirmando esta compra só compra a moeda.
Você precisará tentar novamente a operação.
+ </text>
+ <text name="purchase_warning_notenough">
+ Você não está comprando moeda suficiente
Aumente a quantidade de compra.
+ </text>
+ <button label="Fechar" name="cancel_btn"/>
+ <button label="Adquirir" name="buy_btn"/>
+ <string name="buy_currency">
+ Comprar L$ [LINDENS] por aproximadamente US$ [dólares americanos]
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 30d7193..e9f4d17 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="buy land" title="Comprar terreno">
<text name="region_name_label">
Região:
@@ -33,8 +33,7 @@
<text_editor name="covenant_editor">
Carregando...
</text_editor>
- <check_box label="Eu concordo com as definições do Corretor feitas acima."
- name="agree_covenant" />
+ <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/>
<text name="info_parcel_label">
Lote:
</text>
@@ -59,7 +58,7 @@
<text name="error_message">
Algo ainda não está correto.
</text>
- <button label="Ir para a página" name="error_web" />
+ <button label="Ir para a página" name="error_web"/>
<text name="account_action">
Evoluir sua conta para membro Premium
</text>
@@ -81,8 +80,8 @@
Aumente sua taxa de locação de lote para US$ 40/mês.
</text>
<text name="land_use_reason">
- Você possui 1,309 metros quadrados de terra.
-Este lote tem 512 metros quadrados.
+ Você possui 1.309 metros quadrados de terra.
+Este terreno tem 512 metros quadrados de terra.
</text>
<text name="purchase_action">
Pagar ao Residente Joe L$4000 pelo lote
@@ -102,125 +101,125 @@ Este lote tem 512 metros quadrados.
<text name="currency_balance">
Você tem L$2,100.
</text>
- <check_box label="Remover Contribuição do Grupo nas Aquisições"
- name="remove_contribution" />
- <button label="Adquirir" name="buy_btn" />
- <button label="Cancelar" name="cancel_btn" />
- <text name="can_resell">
+ <check_box label="Remover Contribuição do Grupo nas Aquisições" name="remove_contribution"/>
+ <button label="Adquirir" name="buy_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <string name="can_resell">
Pode ser revendida.
- </text>
- <text name="can_not_resell">
+ </string>
+ <string name="can_not_resell">
Não pode ser revendida.
- </text>
- <text name="can_change">
+ </string>
+ <string name="can_change">
Pode ser unida ou subdivida.
- </text>
- <text name="can_not_change">
+ </string>
+ <string name="can_not_change">
Não pode ser unida ou subdividida.
- </text>
- <text name="cant_buy_for_group">
+ </string>
+ <string name="cant_buy_for_group">
Você não tem permissão para comprar um lote para seu grupo ativo.
- </text>
- <text name="no_land_selected">
+ </string>
+ <string name="no_land_selected">
Nenhum lote selecionado.
- </text>
- <text name="multiple_parcels_selected">
- Vários lotes diferentes selecionados.
-Tente selecionar uma área menor.
- </text>
- <text name="no_permission">
+ </string>
+ <string name="multiple_parcels_selected">
+ Múltiplos e diferentes terrenos selecionados. Tente selecionar uma área menor.
+ </string>
+ <string name="no_permission">
Você não tem permissão para comprar um lote para seu grupo ativo.
- </text>
- <text name="parcel_not_for_sale">
+ </string>
+ <string name="parcel_not_for_sale">
O lote selecionado não está a venda.
- </text>
- <text name="group_already_owns">
+ </string>
+ <string name="group_already_owns">
O grupo já possui o lote.
- </text>
- <text name="you_already_own">
+ </string>
+ <string name="you_already_own">
Você já possui o lote.
- </text>
- <text name="set_to_sell_to_other">
+ </string>
+ <string name="set_to_sell_to_other">
O lote selecionado está configurado para ser vendido para outro grupo.
- </text>
- <text name="no_public_land">
+ </string>
+ <string name="no_public_land">
A área selecionada não é um lote público.
- </text>
- <text name="not_owned_by_you">
- O lote possuído por outro proprietário está selecionado.
-Tente uma área menor.
- </text>
- <text name="processing">
+ </string>
+ <string name="not_owned_by_you">
+ Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+ </string>
+ <string name="processing">
Processando sua compra...
(Isso pode levar um minuto.)
- </text>
- <text name="fetching_error">
+ </string>
+ <string name="fetching_error">
Houve um erro ao buscar informações sobre compra de lotes.
- </text>
- <text name="buying_will">
+ </string>
+ <string name="buying_will">
Comprar este lote irá:
- </text>
- <text name="buying_for_group">
+ </string>
+ <string name="buying_for_group">
Comprar terra para o grupo:
- </text>
- <text name="cannot_buy_now">
+ </string>
+ <string name="cannot_buy_now">
Não foi possível comprar agora:
- </text>
- <text name="not_for_sale">
+ </string>
+ <string name="not_for_sale">
Não disponível para venda:
- </text>
- <text name="none_needed">
+ </string>
+ <string name="none_needed">
não necessário
- </text>
- <text name="must_upgrade">
+ </string>
+ <string name="must_upgrade">
Sua conta deve ser evoluída para adquirir um lote.
- </text>
- <text name="cant_own_land">
+ </string>
+ <string name="cant_own_land">
Sua conta pode possuir um lote.
- </text>
- <text name="first_purchase">
- Esta será sua primeira compra de lote. Será a única vez que você poderá adquirir um lote reservado para "Primeira Compra".
- </text>
- <text name="land_holdings">
+ </string>
+ <string name="land_holdings">
Você possui [BUYER] metros quadrados de terra.
- </text>
- <text name="pay_to_for_land">
+ </string>
+ <string name="pay_to_for_land">
Pagar L$ [AMOUNT] para [SELLER] por este lote
- </text>
- <text name="buy_for_US">
+ </string>
+ <string name="buy_for_US">
Comprar L$ [AMOUNT] por aproximadamente US$ [AMOUNT2] ,
- </text>
- <text name="parcel_meters">
+ </string>
+ <string name="parcel_meters">
Este lote está a [AMOUNT] metros quadrados.
- </text>
- <text name="premium_land">
+ </string>
+ <string name="premium_land">
Este lote é Premium, e irá cobrar como [AMOUNT] metros quadrados.
- </text>
- <text name="discounted_land">
+ </string>
+ <string name="discounted_land">
Este lote é promocional, e será cobrado como [AMOUNT] metros quadrados.
- </text>
- <text name="meters_supports_object">
+ </string>
+ <string name="meters_supports_object">
[AMOUNT] metros quadrados
suporta [AMOUNT2] objetos
- </text>
- <text name="sold_with_objects">
+ </string>
+ <string name="sold_with_objects">
vendido com objetos
- </text>
- <text name="insufficient_land_credits">
+ </string>
+ <string name="insufficient_land_credits">
O grupo [GROUP] precisará de fundos suficientes de terras
contribuídas para cobrir este lote antes da aquisição se completar.
- </text>
- <text name="have_enough_lindens">
+ </string>
+ <string name="have_enough_lindens">
Você tem L$ [AMOUNT], o qual é suficiente para comprar este lote.
- </text>
- <text name="not_enough_lindens">
+ </string>
+ <string name="not_enough_lindens">
Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
- </text>
- <text name="balance_left">
+ </string>
+ <string name="balance_left">
Após a compra, restará L$ [AMOUNT].
- </text>
- <text name="balance_needed">
+ </string>
+ <string name="balance_needed">
Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
- </text>
+ </string>
+ <string name="no_parcel_selected">
+ (nenhum terreno selecionado)
+ </string>
+ <string name="buy_currency">
+ Comprar L$ [LINDENS] por aproxim. US$ [USD]
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
index b8f2ba7..ccf8647 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="contents" title="Comprar cópia do objeto">
<text name="contents_text">
e isso contém:
@@ -6,6 +6,21 @@
<text name="buy_text">
Comprar por L$[AMOUNT] de(a) [NAME]?
</text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
- <button label="Comprar" label_selected="Comprar" name="buy_btn" />
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+ <string name="title_buy_text">
+ Comprar
+ </string>
+ <string name="title_buy_copy_text">
+ Comprar uma cópia de
+ </string>
+ <string name="no_copy_text">
+ (sem copiar)
+ </string>
+ <string name="no_modify_text">
+ (sem modificar)
+ </string>
+ <string name="no_transfer_text">
+ (sem transferir)
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
new file mode 100644
index 0000000..435ba62
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+ <string name="rotate_tooltip">
+ Girar a Câmera ao redor do Foco
+ </string>
+ <string name="zoom_tooltip">
+ Aproximar a Câmera in direção ao Foco
+ </string>
+ <string name="move_tooltip">
+ Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_history.xml b/indra/newview/skins/default/xui/pt/floater_chat_history.xml
index 27a0b0b..7ab474f 100644
--- a/indra/newview/skins/default/xui/pt/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/pt/floater_chat_history.xml
@@ -1,6 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="Histórico de chat">
- <button label="Chat" name="Chat" />
- <button label="Mudo" name="Mute resident" />
- <check_box label="Exibir texto silenciado" name="show mutes" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="chat floater" title="Conversa Local">
+ <string name="ringing">
+ Conectando à conversa de Voz no mundo
+ </string>
+ <string name="connected">
+ Conectado
+ </string>
+ <string name="unavailable">
+ Voz não disponível na sua localização atual
+ </string>
+ <string name="hang_up">
+ Desconectado da conversa de Voz no mundo
+ </string>
+ <string name="voice_icon">
+ icn_voice-localchat.tga
+ </string>
+ <string name="IM_logging_string">
+ -- log ativado de Mensagem Instantânea --
+ </string>
+ <string name="IM_end_log_string">
+ -- Fim do Log --
+ </string>
+ <layout_stack name="panels">
+ <layout_panel name="im_contents_panel">
+ <combo_box label="Gestos" name="Gesture">
+ <combo_item name="Gestures">
+ Gestos
+ </combo_item>
+ </combo_box>
+ <check_box label="Mostrar texto silenciado" name="show mutes"/>
+ <button label="< <" label_selected="> >" name="toggle_active_speakers_btn" tool_tip="Clique aqui para mostrar uma lista dos participantes ativos desta sessão de mensagem instantânea."/>
+ <panel name="chat_panel">
+ <string name="gesture_label">
+ Gestos
+ </string>
+ <line_editor label="Clique aqui para conversar." name="Chat Editor"/>
+ <flyout_button label="Falar" name="Say" tool_tip="(Inserir)">
+ <flyout_button_item name="shout_item">
+ Gritar
+ </flyout_button_item>
+ <flyout_button_item name="say_item">
+ Falar
+ </flyout_button_item>
+ <flyout_button_item name="whisper_item">
+ Sussurrar
+ </flyout_button_item>
+ </flyout_button>
+ </panel>
+ </layout_panel>
+ </layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml
index 417aec9..13c92a9 100644
--- a/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ b/indra/newview/skins/default/xui/pt/floater_customize.xml
@@ -1,437 +1,427 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater customize" title="Aparência">
<tab_container name="customize tab container">
- <panel label="Partes de Corpo" />
+ <panel label="Partes de corpo" name="body_parts_placeholder"/>
<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" />
+ <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 type="string" length="1" name="radio">
+ <radio_item length="1" name="radio" type="string">
Feminino
</radio_item>
- <radio_item type="string" length="1" name="radio2">
+ <radio_item length="1" name="radio2" type="string">
Masculino
</radio_item>
</radio_group>
- <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
- <text type="string" length="1" name="title">
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Coloque um novo formato arrastando um dos seus de seu inventário para seu avatar. Alternativamente, você pode criar um novo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar esta vestimenta.
</text>
- <button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New" />
- <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="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/>
+ <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"/>
</panel>
<panel label="Pele" name="Skin">
- <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color" />
- <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail" />
- <button label="Maquiagem" label_selected="Maquiagem" name="Makeup" />
- <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail" />
- <text type="string" length="1" name="title">
+ <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/>
+ <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/>
+ <button label="Maquiagem" label_selected="Maquiagem" name="Makeup"/>
+ <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/>
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando..
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizada em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Coloque uma nova pele arrastando uma de seu inventário para seu avatar. Alternativamente, você pode criar uma nova forma a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar esta vestimenta.
</text>
- <texture_picker label="Tatuagens para cabeça" name="Head Tattoos"
- tool_tip="Clique para escolher um desenho" />
- <texture_picker label="Tattoos Superiores" name="Upper Tattoos"
- tool_tip="Clique para escolher um desenho" />
- <texture_picker label="Tattoos Inferiores" name="Lower Tattoos"
- tool_tip="Clique para escolher um desenho" />
- <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
- <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New" />
- <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" />
+ <texture_picker label="Tatuagens para cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/>
+ <texture_picker label="Tattoos Superiores" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/>
+ <texture_picker label="Tattoos Inferiores" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/>
+ <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="Cabelo" name="Hair">
- <button label="Cor" label_selected="Cor" name="Color" />
- <button label="Estilo" label_selected="Estilo" name="Style" />
- <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows" />
- <button label="Rosto" label_selected="Rosto" name="Facial" />
- <text type="string" length="1" name="title">
+ <button label="Cor" label_selected="Cor" name="Color"/>
+ <button label="Estilo" label_selected="Estilo" name="Style"/>
+ <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/>
+ <button label="Rosto" label_selected="Rosto" name="Facial"/>
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Ponha um novo cabelo em seu avatar arrastando um do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não ter permissão para modificar essa vestimenta.
</text>
- <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem" />
- <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
- <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New" />
- <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" />
+ <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/>
+ <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="Olhos" name="Eyes">
- <text type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para colocar novos olhos, arraste um do seu inventário para seu avatar. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para alterar esta vestimenta.
</text>
- <texture_picker label="Iris" name="Iris" tool_tip="Clique para escolher uma imagem" />
- <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
- <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New" />
- <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" />
+ <texture_picker label="Iris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/>
+ <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" />
+ <panel label="Roupas" name="clothes_placeholder"/>
<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="Clique para pegar o conta-gotas" />
- <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New" />
- <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" />
- <text type="string" length="1" name="title">
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
+ <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"/>
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por uma nova camisa em seu avatar, arraste uma nova do seu inventário para seu avatar. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não ter permissão para modificar esta vestimenta.
</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="Clique para abrir o conta-gotas." />
- <button label="Criar Novas Calças" label_selected="Criar Novas Calças"
- name="Create New" />
- <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" />
- <text type="string" length="1" name="title">
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/>
+ <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
+ <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"/>
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestindo
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por uma nova calça em seu avatar, basta arrastar uma outra do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar esta vestimenta.
</text>
</panel>
<panel label="Calçados" name="Shoes">
- <text type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por novos calçados em seu avatar, basta arrastar um novo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar esta vestimenta.
</text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
- <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos"
- name="Create New" />
- <button label="Despir" label_selected="Despir" 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" />
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New"/>
+ <button label="Despir" label_selected="Despir" 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 type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido.
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por uma nova meia em seu avatar, basta arrastar uma nova do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar essa vestimenta.
</text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
- <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New" />
- <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" />
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
+ <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 type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: Não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar esta vestimenta.
</text>
- <texture_picker label="Tecido Superior" name="Upper Fabric"
- tool_tip="Clique para escolher uma imagem." />
- <texture_picker label="Tecido Inferior" name="Lower Fabric"
- tool_tip="Clique para escolher uma imagem." />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
- <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta"
- name="Create New" />
- <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" />
+ <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem."/>
+ <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem."/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
+ <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 type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando....
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Pra por uma nova jaqueta em seu avatar, basta arastar um novo modelo do seu inventário. Alternativamente, você pode criar uma novo modlo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar essa vestimenta.
</text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas" />
- <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New" />
- <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" />
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+ <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
+ <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 type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo de seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não ter permissão para modificar essa vestimenta.
</text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas" />
- <button label="Criar Nova Roupa de Baixo" label_selected="Criar Nova Roupa de Baixo"
- name="Create New" />
- <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" />
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+ <button label="Criar Nova Roupa de Baixo" label_selected="Criar Nova Roupa de Baixo" name="Create New"/>
+ <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 type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por novas roupas de baixo em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar essa vestimenta.
</text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
- <button label="Criar Novas Roupas de Baixo"
- label_selected="Criar Novas Roupas de Baixo" name="Create New" />
- <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" />
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New"/>
+ <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 type="string" length="1" name="title">
+ <text length="1" name="title" type="string">
[DESC]
</text>
- <text type="string" length="1" name="title_no_modify">
+ <text length="1" name="title_no_modify" type="string">
[DESC]: não foi possível modificar
</text>
- <text type="string" length="1" name="title_loading">
+ <text length="1" name="title_loading" type="string">
[DESC]: carregando...
</text>
- <text type="string" length="1" name="title_not_worn">
+ <text length="1" name="title_not_worn" type="string">
[DESC]: não vestido
</text>
- <text type="string" length="1" name="path">
+ <text length="1" name="path" type="string">
Localizado em [PATH]
</text>
- <text type="string" length="1" name="not worn instructions">
+ <text length="1" name="not worn instructions" type="string">
Para por uma nova saia em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
</text>
- <text type="string" length="1" name="no modify instructions">
+ <text length="1" name="no modify instructions" type="string">
Você não tem permissão para modificar essa vestimenta.
</text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker" />
- <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New" />
- <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" />
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
+ <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
+ <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>
</tab_container>
- <button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit" />
- <button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All" />
- <button label="Fechar" label_selected="Fechar" name="Close" />
+ <button label="Fechar" label_selected="Fechar" name="Close"/>
+ <button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All"/>
+ <button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
new file mode 100644
index 0000000..bf99231
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Day Cycle Floater" title="Editor de ciclo de dia">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="Ciclo do dia" name="Day Cycle">
+ <button label="?" name="WLDayCycleHelp"/>
+ <text name="WL12am">
+ 12:00 meia noite
+ </text>
+ <text name="WL3am">
+ 3:00 da manhã
+ </text>
+ <text name="WL6am">
+ 6:00 da manhã
+ </text>
+ <text name="WL9amHash">
+ 9:00 da manhã
+ </text>
+ <text name="WL12pmHash">
+ 12:00 meio dia
+ </text>
+ <text name="WL3pm">
+ 3:00 da tarde
+ </text>
+ <text name="WL6pm">
+ 6:00 da tarde
+ </text>
+ <text name="WL9pm">
+ 9:00 da noite
+ </text>
+ <text name="WL12am2">
+ 12:00 meia noite
+ </text>
+ <button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
+ <button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+ <text name="WLCurKeyFrameText">
+ Configurações de Key Frame:
+ </text>
+ <text name="WLCurKeyTimeText">
+ Tempo de chave:
+ </text>
+ <spinner label="Hora" name="WLCurKeyHour"/>
+ <spinner label="Minutos" name="WLCurKeyMin"/>
+ <text name="WLCurKeyTimeText2">
+ Apresentação chave:
+ </text>
+ <combo_box label="Apresentação" name="WLKeyPresets"/>
+ <text name="DayCycleText">
+ Snap:
+ </text>
+ <combo_box label="5 minutos" name="WLSnapOptions"/>
+ <text name="DayCycleText2">
+ Duração do Ciclo:
+ </text>
+ <spinner label="Hora" name="WLLengthOfDayHour"/>
+ <spinner label="Minuto" name="WLLengthOfDayMin"/>
+ <spinner label="Segundo" name="WLLengthOfDaySec"/>
+ <text name="DayCycleText3">
+ Preview:
+ </text>
+ <button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
+ <button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
+ <button label="Usar o horário do Terreno" label_selected="Ir para o horário do Terreno" name="WLUseLindenTime"/>
+ <button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
+ <button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_directory.xml b/indra/newview/skins/default/xui/pt/floater_directory.xml
index 0950d7c..c1f47e4 100644
--- a/indra/newview/skins/default/xui/pt/floater_directory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_directory.xml
@@ -1,35 +1,58 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="directory" title="Procurar">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="directory" title="Busca Second Life">
<tab_container name="Directory Tabs">
- <panel label="Tudo" name="all_panel">
- <button label="< Prev" label_selected="< Prev" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
- <text name="find">
- Encontrar:
- </text>
- <button label="Buscar" label_selected="Buscar" name="Search" />
- <check_box label="Incluir conteúdo adulto" name="incmature" />
- <scroll_list name="results">
- <column label="" name="icon" />
- <column label="Nome" name="name" />
- <column label="Preço" name="price" />
- <column label="Tempo (PDT)" name="date" />
- <column label="Tempo" name="time" />
- <column label="Tráfego" name="dwell" />
- <column label="Área" name="area" />
- <column label="L$/m²" name="per_meter" />
- <column label="Online" name="online" />
- <column label="Membros" name="members" />
- <column label="" name="score" />
- </scroll_list>
+ <panel label="Todos" name="find_all_panel">
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="voltar" name="back_btn"/>
+ <button label="Encaminhar" name="forward_btn"/>
+ <line_editor label="Busca" name="search_editor" tool_tip="Busca Second Life"/>
+ <button label="Buscar" name="search_btn"/>
+ <combo_box name="Category">
+ <combo_item name="AnyCategory">
+ Qualquer categoria
+ </combo_item>
+ <combo_item name="Events">
+ Eventos
+ </combo_item>
+ <combo_item name="Groups">
+ Grupos
+ </combo_item>
+ <combo_item name="People">
+ Pessoas
+ </combo_item>
+ <combo_item name="Places">
+ Lugares
+ </combo_item>
+ <combo_item name="Wiki">
+ Wiki
+ </combo_item>
+ </combo_box>
+ <check_box label="Incluir conteúdo adulto" name="mature_check"/>
+ <string name="loading_text">
+ Carregando...
+ </string>
+ <string name="done_text">
+ Feito
+ </string>
</panel>
<panel label="Anúncios" name="classified_panel">
- <button label="< Prev" label_selected="< Prev" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
+ <button label="Próximo >" label_selected="Próximo >" name="Next >"/>
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="< Prev" label_selected="< Prev" name="< Prev"/>
<text name="find">
Encontrar:
</text>
- <check_box label="Incluir Conteúdo Adulto" name="incmature" />
+ <check_box label="Incluir Conteúdo Adulto" name="incmature"/>
<combo_box name="Category">
<combo_item name="AnyCategory">
Qualquer Categoria
@@ -62,18 +85,24 @@
Pessoal
</combo_item>
</combo_box>
- <button label="Buscar" label_selected="Buscar" name="Search" />
- <button label="Colocar Anúncio" label_selected="Colocar Anúncio"
- name="Place an Ad..." />
- <button label="Apagar" label_selected="Apagar" name="Delete" />
+ <button label="Procura" label_selected="Procura" name="Browse"/>
+ <button label="Buscar" label_selected="Buscar" name="Search"/>
+ <button label="Colocar Anúncio" label_selected="Colocar Anúncio" name="Place an Ad..."/>
+ <button label="Apagar" label_selected="Apagar" name="Delete"/>
<scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
- <column label="Preço" name="price" />
+ <column label="" name="icon"/>
+ <column label="" name="type"/>
+ <column label="Nome" name="name"/>
+ <column label="Preço" name="price"/>
</scroll_list>
</panel>
<panel label="Eventos" name="events_panel">
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
<radio_group name="date_mode">
<radio_item name="current">
Em progresso e processando
@@ -82,15 +111,12 @@
Data
</radio_item>
</radio_group>
- <button label="<<" label_selected="<<" name="<<"
- tool_tip="Voltar um dia" />
+ <button label="<<" label_selected="<<" name="<<" tool_tip="Voltar um dia"/>
<text name="date_text">
6/6
</text>
- <button label=">>" label_selected=">>" name=">>"
- tool_tip="Avançar um dia" />
- <button label="Hoje" label_selected="Hoje" name="Today"
- tool_tip="Exibir dias dos eventos" />
+ <button label=">>" label_selected=">>" name=">>" tool_tip="Avançar um dia"/>
+ <button label="Hoje" label_selected="Hoje" name="Today" tool_tip="Exibir dias dos eventos"/>
<text name="text">
Categoria:
</text>
@@ -135,50 +161,58 @@
Variados
</combo_item>
</combo_box>
- <check_box label="Conteúdo Adulto" name="incmature" />
- <button label="Buscar" label_selected="Buscar" name="Search" tool_tip="Buscar" />
- <button label="Apagar" label_selected="Apagar" name="Delete" />
+ <check_box label="Conteúdo Adulto" name="incmature"/>
+ <button label="Buscar" label_selected="Buscar" name="Search" tool_tip="Buscar"/>
+ <button label="Apagar" label_selected="Apagar" name="Delete"/>
<scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
- <column label="Tempo (PDT)" name="date" />
- <column label="" name="event_id" />
- <column label="Tempo" name="time" />
+ <column label="" name="icon"/>
+ <column label="" name="type"/>
+ <column label="Nome" name="name"/>
+ <column label="Tempo (PDT)" name="date"/>
+ <column label="" name="event_id"/>
+ <column label="Tempo" name="time"/>
</scroll_list>
- <button label="< Prev" label_selected="< Prev" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
+ <button label="Próximo >" label_selected="Próximo >" name="Next >"/>
+ <button label="< Prev" label_selected="< Prev" name="< Prev"/>
</panel>
- <panel label="Lugares Populares" name="popular_panel">
- <button label="< Anterior" label_selected="< Anterior" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
- <check_box label="Exibir somente lugares com foto" name="incpictures" />
- <check_box label="Incluir lugares em Regiões Adultas" name="incmature" />
- <text
- name="These are the most popular places in the world, as measured by traffic, the amount of time people spend there.">
- Esses são os lugares mais populares no mundo, baseado no tráfego e no tempo
-que as pessoas permanecem lá.
- </text>
- <scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
- <column label="Tráfego" name="dwell" />
- </scroll_list>
+ <panel label="Showcase (Mostruário)" name="showcase_panel">
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="voltar" name="back_btn"/>
+ <button label="Encaminhar" name="forward_btn"/>
+ <string name="loading_text">
+ Carregando...
+ </string>
+ <string name="done_text">
+ Feito
+ </string>
</panel>
<panel label="Venda de Terrenos" name="land_sales_panel">
- <button label="< Anterior" label_selected="< Anterior" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="Próximo >" label_selected="Próximo >" name="Next >"/>
+ <button label="< Anterior" label_selected="< Anterior" name="< Prev"/>
<combo_box name="type">
<combo_item name="AllTypes">
Todos os tipos
</combo_item>
+ <combo_item name="Auction">
+ Leilão
+ </combo_item>
+ <combo_item name="MainlandSales">
+ Mainland - à venda
+ </combo_item>
<combo_item name="EstateSales">
À venda - Região
</combo_item>
- <combo_item name="FirstLand">
- Primeira Compra
- </combo_item>
</combo_box>
<combo_box name="rating">
<combo_item name="PG&Mature">
@@ -191,30 +225,36 @@ que as pessoas permanecem lá.
Adulto somente
</combo_item>
</combo_box>
- <check_box label="Preço <= L$" name="pricecheck" />
- <check_box label="Área >= m²" name="areacheck" />
- <button label="Buscar" label_selected="Buscar" name="Search" />
+ <check_box label="Preço <= L$" name="pricecheck"/>
+ <check_box label="Área >= m²" name="areacheck"/>
+ <button label="Buscar" label_selected="Buscar" name="Search"/>
<text name="land">
Lotes podem ser adquiridos diretamente através de Linden Dollares (L$) ou leilão,
ambos em L$, US$ ou R$.
Para comprar diretamente, visite o lote e clique no nome do lugar na barra título.
</text>
<scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
- <column label="L$ Preço" name="price" />
- <column label="Área" name="area" />
- <column label="L$/m²" name="per_meter" />
+ <column label="" name="icon"/>
+ <column label="" name="type"/>
+ <column label="Nome" name="name"/>
+ <column label="L$ Preço" name="price"/>
+ <column label="Área" name="area"/>
+ <column label="L$/m²" name="per_meter"/>
</scroll_list>
</panel>
<panel label="Lugares" name="places_panel">
- <button label="< Anterior" label_selected="< Anterior" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="Próximo >" label_selected="Próximo >" name="Next >"/>
+ <button label="< Anterior" label_selected="< Anterior" name="< Prev"/>
<text name="find">
Encontrar:
</text>
- <check_box label="Incluir lugares em Regiões Adultas" name="incmature" />
+ <check_box label="Incluir lugares em Regiões Adultas" name="incmature"/>
<combo_box name="Category">
<combo_item name="AnyCategory">
Qualquer Categoria
@@ -256,41 +296,51 @@ Para comprar diretamente, visite o lote e clique no nome do lugar na barra títu
Outros
</combo_item>
</combo_box>
- <button label="Buscar" label_selected="Buscar" name="Search" />
+ <button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
- <column label="Tráfego" name="dwell" />
+ <column label="" name="icon"/>
+ <column label="" name="type"/>
+ <column label="Nome" name="name"/>
+ <column label="Tráfego" name="dwell"/>
</scroll_list>
</panel>
<panel label="Pessoas" name="people_panel">
- <button label="< Anterior" label_selected="< Anterior" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
+ <string name="searching_text">
+ buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="Próximo >" label_selected="Próximo >" name="Next >"/>
+ <button label="< Anterior" label_selected="< Anterior" name="< Prev"/>
<text name="find">
Encontrar:
</text>
- <button label="Buscar" label_selected="Buscar" name="Search" />
+ <button label="Buscar" label_selected="Buscar" name="Search"/>
<scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
+ <column label="" name="icon"/>
+ <column label="" name="type"/>
+ <column label="Nome" name="name"/>
</scroll_list>
</panel>
<panel label="Grupos" name="groups_panel">
- <button label="< Anterior" label_selected="< Anterior" name="< Prev" />
- <button label="Próximo >" label_selected="Próximo >" name="Next >" />
- <text name="find">
- Encontrar:
- </text>
- <button label="Buscar" label_selected="Buscar" name="Search" />
- <check_box label="Include Mature groups" name="incmature" />
- <scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Nome" name="name" />
- <column label="Membros" name="members" />
- </scroll_list>
+ <string name="searching_text">
+ Buscando...
+ </string>
+ <string name="not_found_text">
+ Nada foi encontrado.
+ </string>
+ <button label="voltar" name="back_btn"/>
+ <button label="Encaminhar" name="forward_btn"/>
+ <line_editor label="Busca" name="search_editor" tool_tip="Busca Second Life"/>
+ <button label="Busca" name="search_btn"/>
+ <check_box label="Incluir conteúdo adulto" name="mature_check"/>
+ <string name="loading_text">
+ carregando...
+ </string>
+ <string name="done_text">
+ Feito
+ </string>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
new file mode 100644
index 0000000..afefae7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Editor do Ambiente">
+ <text name="EnvTimeText">
+ Hora do Dia
+ </text>
+ <text name="EnvTimeText2">
+ 12:00 PM
+ </text>
+ <text name="EnvCloudText">
+ Cobertura de Nuvens
+ </text>
+ <text name="EnvWaterColorText">
+ Cor da água
+ </text>
+ <color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
+ <text name="EnvWaterFogText">
+ Névoa da água
+ </text>
+ <button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
+ <button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
+ <button label="Água Avançada" name="EnvAdvancedWaterButton"/>
+ <button label="?" name="EnvSettingsHelpButton"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
index 7fd928b..ae104c6 100644
--- a/indra/newview/skins/default/xui/pt/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml
@@ -1,17 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="gestures" title="Ativar gestos">
<text name="help_label">
- Digite uma palavra-chave ou pressione uma tecla para executar um som ou animação.
+ Clicar duas vezes no gesto para executar animações e sons.
</text>
- <scroll_list name="gesture_list">
- <column label="Gatilho" name="trigger" />
- <column label="Tecla" name="shortcut" />
- <column label="" name="key" />
- <column label="Nome" name="name" />
- </scroll_list>
- <button label="Novo" name="new_gesture_btn" />
- <button label="Inventário" name="inventory_btn" />
- <button label="Editar" name="edit_btn" />
- <button label="Executar" name="play_btn" />
- <button label="Parar" name="stop_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
new file mode 100644
index 0000000..1e496a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Hardware Settings Floater" title="Ajustes de Hardware">
+ <text name="Filtering:">
+ Filtragem:
+ </text>
+ <check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>
+ <text name="Antialiasing:">
+ Suavização:
+ </text>
+ <combo_box label="Suavização" name="fsaa">
+ <combo_item name="FSAADisabled">
+ Desabilitado
+ </combo_item>
+ <combo_item name="2x">
+ 2x
+ </combo_item>
+ <combo_item name="4x">
+ 4x
+ </combo_item>
+ <combo_item name="8x">
+ 8x
+ </combo_item>
+ <combo_item name="16x">
+ 16x
+ </combo_item>
+ </combo_box>
+ <spinner label="Gama:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (brilho, quanto menor, mais brilho, 0=usar padrão)
+ </text>
+ <text name="Enable VBO:">
+ Habilitar VBO:
+ </text>
+ <check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
+ <slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a Memória da Placa de Vídeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/>
+ <spinner label="Relação de Distância de Nevoeiro:" name="fog"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_html.xml b/indra/newview/skins/default/xui/pt/floater_html.xml
index daa441e..2001b96 100644
--- a/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="htmlfloater" title="">
- <text name="f1_help_title">
- Second Life Help
- </text>
- <text name="f1_help_url">
- http://secondlife.com/app/support/index_pt.html
- </text>
+ <button label="Fechar" name="close_btn"/>
+ <button label="Voltar" name="back_btn"/>
+ <button label="Adiantar" name="forward_btn"/>
+ <button label="Ir" name="go_btn"/>
+ <string name="home_page_url">
+ http://www.secondlife.com
+ </string>
<string name="support_page_url">
- http://secondlife.com/app/support/index_pt.html
+ http://support.secondlife.com
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml
new file mode 100644
index 0000000..c758679
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_hud.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="Tutorial"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_im.xml b/indra/newview/skins/default/xui/pt/floater_im.xml
index f79a172..81090d5 100644
--- a/indra/newview/skins/default/xui/pt/floater_im.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im.xml
@@ -1,21 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<multi_floater name="im_floater" title="Mensagem Instantânea">
- <text name="only_user_message">
+ <string name="only_user_message">
Você é o único usuário desta sessão.
- </text>
- <text name="offline_message">
+ </string>
+ <string name="offline_message">
[FIRST] [LAST] está offline.
- </text>
- <text name="generic_request_error">
+ </string>
+ <string name="invite_message">
+ Clique no botão [BUTTON NAME] para aceitar/ conectar para esse pate- papo em voz.
+ </string>
+ <string name="muted_message">
+ Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente .
+ </string>
+ <string name="generic_request_error">
Erro na requisição, por favor, tente novamente.
- </text>
- <text name="insufficient_perms_error">
+ </string>
+ <string name="insufficient_perms_error">
Você não tem permissões suficientes.
- </text>
- <text name="user_no_help">
- O usuário requisitado não está mais nessa sessão de ajuda.
- </text>
- <text name="removed_from_group">
+ </string>
+ <string name="session_does_not_exist_error">
+ A sessão deixou de existir
+ </string>
+ <string name="no_ability_error">
+ Você não possui esta habilidade.
+ </string>
+ <string name="not_a_mod_error">
+ Você não é um moderador de sessão.
+ </string>
+ <string name="muted_error">
+ Moderador do grupo desabilitou seu bate-papo em texto.
+ </string>
+ <string name="add_session_event">
+ Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
Você foi removido do grupo.
- </text>
+ </string>
+ <string name="close_on_no_ability">
+ Você não possui mais a habilidade de estar na sessão de bate- papo.
+ </string>
</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 94285ee..a9f270c 100644
--- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Image Preview" title="">
<text name="name_label">
Nome:
@@ -44,6 +44,7 @@
<text name="bad_image_text">
Incapaz de ler a imagem.Tente salvar a imagem como 24 bit Targa (.tga).
</text>
- <button label="Cancelar" name="cancel_btn" />
- <button label="Upload (L$[AMOUNT])" name="ok_btn" />
+ <check_box label="Usar compressão com menor perda" name="lossless_check"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Upload (L$[AMOUNT])" name="ok_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 76c8cbe..83dcf2c 100644
--- a/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -1,14 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater label="(desconhecido)" name="im_floater" title="(unknown)">
- <string name="default_text_label">
- Clique aqui para mensagens instantâneas.
+ <string name="ringing">
+ Chamando...
</string>
- <button label="Perfil..." name="profile_callee_btn" />
- <panel name="speaker_controls" />
- <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor" />
- <button label="Perfil..." label_selected="Perfil..." name="profile_btn" />
- <string name="live_help_dialog">
- *** Bem Vindo a Solicitação de Ajuda *** Por favor, cheque primeiro suas páginas de Ajuda do Second Life precionando F1 ou acessando a Base de Conhecimento em http://secondlife.com/knowledgebase/ Se suas respostas não estiverem ali, or favor entre com sua pergunta e aguarde alguns minutos para que algum Ajudante responsa.-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+ <string name="answering">
+ Conectando...
+ </string>
+ <string name="connected">
+ Conectado, clique Finalizar Chamada para deixar em espera
+ </string>
+ <string name="hang_up">
+ Chamada encerrada
+ </string>
+ <string name="inventory_item_offered">
+ Oferecido um item de Inventário
+ </string>
+ <string name="voice_icon">
+ icn_voice-pvtfocus.tga
</string>
<string name="title_string">
Mensagem Instantânea com [NAME]
@@ -19,4 +27,18 @@
<string name="session_start_string">
Iniciando uma sessaão com [NAME] por favor aguarde.
</string>
+ <string name="default_text_label">
+ Clique aqui para uma mensagem instantânea.
+ </string>
+ <button label="Perfil..." name="profile_callee_btn"/>
+ <button label="Chamar" name="start_call_btn"/>
+ <button label="Terminar Chamada" name="end_call_btn"/>
+ <panel name="speaker_controls">
+ <button label="" name="mute_btn" tool_tip="Emudecer voz"/>
+ </panel>
+ <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
+ <button label="Enviar" name="send_btn"/>
+ <string name="live_help_dialog">
+ *** Bem Vindo a Solicitação de Ajuda *** Por favor, cheque primeiro suas páginas de Ajuda do Second Life precionando F1 ou acessando a Base de Conhecimento em http://secondlife.com/knowledgebase/ Se suas respostas não estiverem ali, or favor entre com sua pergunta e aguarde alguns minutos para que algum Ajudante responsa.-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml b/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
index 46ada4e..c9e307f 100644
--- a/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
+++ b/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="(desconhecido)" name="im_floater">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+ <string name="ringing">
+ Juntar-se à Conversa por Voz...
+ </string>
+ <string name="connected">
+ Conectado, clique Encerrar Chamada para deixar em espera
+ </string>
+ <string name="hang_up">
+ Deixar a Conversa por Voz
+ </string>
+ <string name="voice_icon">
+ icn_voice-groupfocus.tga
+ </string>
<string name="title_string">
Mensagem Instantânea com [NAME]
</string>
@@ -10,11 +22,15 @@
Iniciando uma sessaão com [NAME] por favor aguarde.
</string>
<string name="default_text_label">
- Clique aqui para mensagens instantâneas.
+ Clique aqui para mensagem instantânea.
</string>
<layout_stack name="panels">
<layout_panel name="im_contents_panel">
- <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor" />
+ <button label="Chamar" name="start_call_btn"/>
+ <button label="Encerrar Chamada" name="end_call_btn"/>
+ <button label="< <" label_selected="> >" name="toggle_active_speakers_btn" tool_tip="Clique aqui para trocar uma lista de participantes ativos nesta sessão de MI."/>
+ <line_editor label="Clique aqui para mensagem instantânea" name="chat_editor"/>
+ <button label="Enviar" name="send_btn"/>
</layout_panel>
</layout_stack>
<string name="live_help_dialog">
diff --git a/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml b/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
new file mode 100644
index 0000000..86ba779
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(unknown)" name="im_floater" title="(unknown)">
+ <string name="title_string">
+ Mensagem Instantânea com [NAME]
+ </string>
+ <string name="typing_start_string">
+ [NAME] está digitando...
+ </string>
+ <string name="session_start_string">
+ Iniciando sessão com [NAME], por favor aguarde.
+ </string>
+ <string name="moderated_chat_label">
+ (Moderado: Vozes desligada por default)
+ </string>
+ <string name="default_text_label">
+ Clique aqui para mensagem instantânea.
+ </string>
+ <string name="muted_text_label">
+ Sua conversa de texto foi desabilitada por um Moderador do Grupo.
+ </string>
+ <layout_stack name="panels">
+ <layout_panel name="im_contents_panel">
+ <button label="Informação do Grupo" name="group_info_btn"/>
+ <button label="Entrar numa chamada" name="start_call_btn"/>
+ <button label="Encerrar Chamada" name="end_call_btn"/>
+ <button label="< <" label_selected="> >" name="toggle_active_speakers_btn" tool_tip="Clique aqui para alternar a lista dos participantes ativos nesta sessão de IM ."/>
+ <button label="Enviar" name="send_btn"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
index b34895f..a57573b 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml
@@ -1,49 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Inventory" title="Inventário">
+ <search_editor label="Escreva aqui para busca" name="inventory search editor"/>
<tab_container name="inventory filter tabs">
- <inventory_panel label="Todos os Itens" name="All Items" />
- <inventory_panel label="Itens Recentes" name="Recent Items" />
+ <inventory_panel label="Todos os Itens" name="All Items"/>
+ <inventory_panel label="Itens Recentes" name="Recent Items"/>
</tab_container>
<menu_bar name="Inventory Menu">
<menu label="Arquivo" name="File">
- <menu_item_call label="Abrir" name="Open" />
- <menu_item_call label="Nova Janela" name="New Window" />
- <menu_item_call label="Mostrar Filtros" name="Show Filters" />
- <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders" />
- <menu_item_call label="Limpar Lixeira" name="Empty Trash" />
+ <menu_item_call label="Abrir" name="Open"/>
+ <menu_item_call label="Nova Janela" name="New Window"/>
+ <menu_item_call label="Mostrar Filtros" name="Show Filters"/>
+ <menu_item_call label="Redefinir Filtros" name="Reset Current"/>
+ <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/>
+ <menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
</menu>
<menu label="Criar" name="Create">
- <menu_item_call label="Nova Pasta" name="New Folder" />
- <menu_item_call label="Novo Script" name="New Script" />
- <menu_item_call label="Nova Nota" name="New Note" />
- <menu_item_call label="Novo Gesto" name="New Gesture" />
+ <menu_item_call label="Nova Pasta" name="New Folder"/>
+ <menu_item_call label="Novo Script" name="New Script"/>
+ <menu_item_call label="Nova Nota" name="New Note"/>
+ <menu_item_call label="Novo Gesto" name="New Gesture"/>
<menu label="Nova Roupa" name="New Clothes">
- <menu_item_call label="Nova Camisa" name="New Shirt" />
- <menu_item_call label="Nova Calça" name="New Pants" />
- <menu_item_call label="Novos Sapatos" name="New Shoes" />
- <menu_item_call label="Novas Meias" name="New Socks" />
- <menu_item_call label="Nova Jaqueta" name="New Jacket" />
- <menu_item_call label="Nova Saia" name="New Skirt" />
- <menu_item_call label="Novas Luvas" name="New Gloves" />
- <menu_item_call label="Nova Anágua" name="New Undershirt" />
- <menu_item_call label="Novas Roupas de Baixo" name="New Underpants" />
+ <menu_item_call label="Nova Camisa" name="New Shirt"/>
+ <menu_item_call label="Nova Calça" name="New Pants"/>
+ <menu_item_call label="Novos Sapatos" name="New Shoes"/>
+ <menu_item_call label="Novas Meias" name="New Socks"/>
+ <menu_item_call label="Nova Jaqueta" name="New Jacket"/>
+ <menu_item_call label="Nova Saia" name="New Skirt"/>
+ <menu_item_call label="Novas Luvas" name="New Gloves"/>
+ <menu_item_call label="Nova Anágua" name="New Undershirt"/>
+ <menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/>
</menu>
<menu label="Parte do corpo" name="New Body Parts">
- <menu_item_call label="Nova Forma" name="New Shape" />
- <menu_item_call label="Nova Pele" name="New Skin" />
- <menu_item_call label="Novo Cabelo" name="New Hair" />
- <menu_item_call label="Novos Olhos" name="New Eyes" />
+ <menu_item_call label="Nova Forma" name="New Shape"/>
+ <menu_item_call label="Nova Pele" name="New Skin"/>
+ <menu_item_call label="Novo Cabelo" name="New Hair"/>
+ <menu_item_call label="Novos Olhos" name="New Eyes"/>
</menu>
</menu>
<menu label="Organizar" name="Sort">
- <menu_item_check label="Por Nome" name="By Name" />
- <menu_item_check label="Por Data" name="By Date" />
- <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name" />
- <menu_item_check label="Pastas em primeiro" name="System Folders To Top" />
- </menu>
- <menu label="Filtros" name="Filters">
- <menu_item_check label="Modificar Conteúdo" name="Modify Current" />
- <menu_item_call label="Reiniciar Atual" name="Reset Current" />
+ <menu_item_check label="Por Nome" name="By Name"/>
+ <menu_item_check label="Por Data" name="By Date"/>
+ <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/>
+ <menu_item_check label="Pastas em primeiro" name="System Folders To Top"/>
</menu>
</menu_bar>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 4cc6797..e73d15f 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="item properties" title="Propriedades">
<text name="LabelItemNameTitle">
Nome:
@@ -12,14 +12,14 @@
<text name="LabelCreatorName">
Nicole Linden
</text>
- <button label="Perfil..." label_selected="" name="BtnCreator" />
+ <button label="Perfil..." label_selected="" name="BtnCreator"/>
<text name="LabelOwnerTitle">
Dono:
</text>
<text name="LabelOwnerName">
Thrax Linden
</text>
- <button label="Perfil..." label_selected="" name="BtnOwner" />
+ <button label="Perfil..." label_selected="" name="BtnOwner"/>
<text name="LabelAcquiredTitle">
Adquirido:
</text>
@@ -29,9 +29,9 @@
<text name="OwnerLabel">
Você pode:
</text>
- <check_box label="Modificar" name="CheckOwnerModify" />
- <check_box label="Copiar" name="CheckOwnerCopy" />
- <check_box label="Revender/Doar" name="CheckOwnerTransfer" />
+ <check_box label="Modificar" name="CheckOwnerModify"/>
+ <check_box label="Copiar" name="CheckOwnerCopy"/>
+ <check_box label="Revender/Doar" name="CheckOwnerTransfer"/>
<text name="BaseMaskDebug">
B:
</text>
@@ -47,18 +47,18 @@
<text name="NextMaskDebug">
N:
</text>
- <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup" />
- <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy" />
+ <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
+ <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
<text name="NextOwnerLabel">
Próximo dono pode:
</text>
- <check_box label="Modificar" name="CheckNextOwnerModify" />
- <check_box label="Copiar" name="CheckNextOwnerCopy" />
- <check_box label="Revender/Doar" name="CheckNextOwnerTransfer" />
+ <check_box label="Modificar" name="CheckNextOwnerModify"/>
+ <check_box label="Copiar" name="CheckNextOwnerCopy"/>
+ <check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/>
<text name="SaleLabel">
Marcar Item:
</text>
- <check_box label="A venda" name="CheckPurchase" />
+ <check_box label="A venda" name="CheckPurchase"/>
<radio_group name="RadioSaleType">
<radio_item name="radio">
Original
@@ -70,4 +70,16 @@
<text name="TextPrice">
Price: L$
</text>
+ <string name="unknown">
+ (desconhecido)
+ </string>
+ <string name="public">
+ (público)
+ </string>
+ <string name="you_can">
+ Você pode:
+ </string>
+ <string name="owner_can">
+ Proprietário pode :
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 136c4a8..5291a96 100644
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -1,3 +1,84 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Joystick" title="Joystick Configuration">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuração do Joystick">
+ <check_box name="enable_joystick">
+ Habilitar Joystick:
+ </check_box>
+ <spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
+ <spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
+ <spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
+ <spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
+ <spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
+ <spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
+ <spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
+ <check_box label="Zoom Direto" name="ZoomDirect"/>
+ <check_box label="Cursor 3D" name="Cursor3D"/>
+ <check_box label="Nível Automático" name="AutoLeveling"/>
+ <text name="Control Modes:">
+ Modos de Controle:
+ </text>
+ <check_box name="JoystickAvatarEnabled">
+ Avatar
+ </check_box>
+ <check_box name="JoystickBuildEnabled">
+ Construir
+ </check_box>
+ <check_box name="JoystickFlycamEnabled">
+ Camera aérea
+ </check_box>
+ <text name="XScale">
+ Escala X
+ </text>
+ <text name="YScale">
+ Escala Y
+ </text>
+ <text name="ZScale">
+ Escala Z
+ </text>
+ <text name="PitchScale">
+ Escala de Elevação
+ </text>
+ <text name="YawScale">
+ Escala da Guinada
+ </text>
+ <text name="RollScale">
+ Escala de Rolagem
+ </text>
+ <text name="XDeadZone">
+ Zona Morta X
+ </text>
+ <text name="YDeadZone">
+ Zona Morta Y
+ </text>
+ <text name="ZDeadZone">
+ Zona Morta Z
+ </text>
+ <text name="PitchDeadZone">
+ Zona Morta da Elevação
+ </text>
+ <text name="YawDeadZone">
+ Zona Morta da Guinada
+ </text>
+ <text name="RollDeadZone">
+ Zona Morta de Rolagem
+ </text>
+ <text name="Feathering">
+ Alisar
+ </text>
+ <slider label="" name="FlycamFeathering"/>
+ <text name="ZoomScale2">
+ Escala de Zoom
+ </text>
+ <text name="ZoomDeadZone">
+ Zona Morta de Zoom
+ </text>
+ <button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
+ <string name="JoystickMonitor">
+ Monitor do Joystick
+ </string>
+ <string name="Axis">
+ Eixo [NUM]
+ </string>
+ <string name="NoDevice">
+ nenhum dispositivo detectado
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
new file mode 100644
index 0000000..d0f0d40
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Medidor de Atraso">
+ <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+ <text name="client">
+ Cliente:
+ </text>
+ <text name="client_text">
+ Normal
+ </text>
+ <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
+ <text name="network">
+ Rede:
+ </text>
+ <text name="network_text">
+ Normal
+ </text>
+ <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
+ <text name="server">
+ Servidor:
+ </text>
+ <text name="server_text">
+ Normal
+ </text>
+ <button label="?" name="server_help"/>
+ <button label=">>" name="minimize"/>
+ <string name="max_title_msg">
+ Medidor de Atraso
+ </string>
+ <string name="max_width_px">
+ 360
+ </string>
+ <string name="min_title_msg">
+ Atraso
+ </string>
+ <string name="min_width_px">
+ 90
+ </string>
+ <string name="client_text_msg">
+ Cliente
+ </string>
+ <string name="client_frame_rate_critical_fps">
+ 10
+ </string>
+ <string name="client_frame_rate_warning_fps">
+ 15
+ </string>
+ <string name="client_frame_time_window_bg_msg">
+ Normal, janela por baixo
+ </string>
+ <string name="client_frame_time_critical_msg">
+ Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="client_frame_time_warning_msg">
+ Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+ </string>
+ <string name="client_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="client_draw_distance_cause_msg">
+ Causa possível: Distância do desenho ajustada muito alta
+ </string>
+ <string name="client_texture_loading_cause_msg">
+ Causa possível: Carregamento de Imagens
+ </string>
+ <string name="client_texture_memory_cause_msg">
+ Causa possível: Muitas imagens na memoria
+ </string>
+ <string name="client_complex_objects_cause_msg">
+ Causa possível: Muitos objetos complexos na cena
+ </string>
+ <string name="network_text_msg">
+ Rede
+ </string>
+ <string name="network_packet_loss_critical_pct">
+ 10
+ </string>
+ <string name="network_packet_loss_warning_pct">
+ 5
+ </string>
+ <string name="network_packet_loss_critical_msg">
+ Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+ </string>
+ <string name="network_packet_loss_warning_msg">
+ Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+ </string>
+ <string name="network_performance_normal_msg">
+ Normal
+ </string>
+ <string name="network_ping_critical_ms">
+ 600
+ </string>
+ <string name="network_ping_warning_ms">
+ 300
+ </string>
+ <string name="network_ping_critical_msg">
+ Tempo de conexão de ping é cerca de [NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_ping_warning_msg">
+ Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_packet_loss_cause_msg">
+ Possível conexão ruim ou 'Largura de Banda' escolhida muito alta.
+ </string>
+ <string name="network_ping_cause_msg">
+ Possível conexão ruim ou aplic. compartilhando arquivos.
+ </string>
+ <string name="server_text_msg">
+ Servidor
+ </string>
+ <string name="server_frame_rate_critical_fps">
+ 20
+ </string>
+ <string name="server_frame_rate_warning_fps">
+ 30
+ </string>
+ <string name="server_single_process_max_time_ms">
+ 20
+ </string>
+ <string name="server_frame_time_critical_msg">
+ Taxa de quadros do simulador abaixo de [SERVER_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="server_frame_time_warning_msg">
+ Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+ </string>
+ <string name="server_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="server_physics_cause_msg">
+ Causa possível: Muitos objetos físicos
+ </string>
+ <string name="server_scripts_cause_msg">
+ Causa possível: Muitos objetos com scripts
+ </string>
+ <string name="server_net_cause_msg">
+ Causa possível: Muito tráfego na rede
+ </string>
+ <string name="server_agent_cause_msg">
+ Causa possível: Muitas pessoas se movendo na região
+ </string>
+ <string name="server_images_cause_msg">
+ Causa possível: Muitos cálculos de imagem
+ </string>
+ <string name="server_generic_cause_msg">
+ Causa possível: Carga no simulador muito pesada
+ </string>
+ <string name="smaller_label">
+ >>
+ </string>
+ <string name="bigger_label">
+ <<
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 6d2acca..8f0cffa 100644
--- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
@@ -1,38 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="land holdings floater" title="Meu terreno">
<scroll_list name="parcel list">
- <column label="Nome" name="name" />
- <column label="Localização" name="location" />
- <column label="Área" name="area" />
- <column label="" name="hidden" />
+ <column label="Nome" name="name"/>
+ <column label="Localização" name="location"/>
+ <column label="Área" name="area"/>
+ <column label="" name="hidden"/>
</scroll_list>
- <button label="Teleporte" label_selected="Teleporte" name="Teleport"
- tool_tip="Teleportar para o centro do terreno." />
- <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map"
- tool_tip="Mostrar esse terreno no mapa do mundo." />
+ <button label="Teleporte" label_selected="Teleporte" name="Teleport" tool_tip="Teleportar para o centro do terreno."/>
+ <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
<text name="contrib_label">
Contribuições para os seus grupos:
</text>
<scroll_list name="grant list">
- <column label="Grupo" name="group" />
- <column label="Área" name="area" />
+ <column label="Grupo" name="group"/>
+ <column label="Área" name="area"/>
</scroll_list>
<text name="allowed_label">
Permitir marcações no terreno.
</text>
<text name="allowed_text">
- 0 m²
+ [AREA] m2
</text>
<text name="current_label">
Marcações atuais:
</text>
<text name="current_text">
- 0 m²
+ [AREA] m2
</text>
<text name="available_label">
Disponivel para compra de terras:
</text>
<text name="available_text">
- 0 m²
+ [AREA] m2
</text>
+ <string name="area_string">
+ [AREA] m2
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
new file mode 100644
index 0000000..c4a036d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="landmarkpicker" title="Organize: Landmarks">
+ <check_box label="Mostrar Pastas" name="show_folders_check"/>
+ <button label="Novo" label_selected="Novo" name="New"/>
+ <button label="Renomear" label_selected="Renomear" name="Rename"/>
+ <button label="Nova Pasta" label_selected="Nova Pasta" name="NewFolder"/>
+ <button label="Editar" label_selected="Editar" name="Edit"/>
+ <button label="Apagar" label_selected="Apagar" name="Delete"/>
+ <button label="Fechar" label_selected="Fechar" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 9753b38..5bf9b6f 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -1,5 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="script ed float" title="Script: Novo Script">
- <button label="Resetar" label_selected="Resetar" name="Reset" />
- <check_box label="Correndo" name="running" />
+ <button label="Resetar" label_selected="Resetar" name="Reset"/>
+ <check_box label="Correndo" name="running"/>
+ <check_box label="Mono" name="mono"/>
+ <string name="not_allowed">
+ Você não tem permissão para visualizar este script.
+ </string>
+ <string name="script_running">
+ Executando
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
new file mode 100644
index 0000000..cc68903
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Navegador de Mídia">
+ <layout_stack name="stack1">
+ <layout_panel name="nav_controls">
+ <button label="Para trás" name="back"/>
+ <button label="Para a frente" name="forward"/>
+ <button label="Recarregar" name="reload"/>
+ <button label="Ir" name="go"/>
+ </layout_panel>
+ <layout_panel name="parcel_owner_controls">
+ <button label="Enviar a URL Atual Para o Terreno" name="assign"/>
+ </layout_panel>
+ <layout_panel name="external_controls">
+ <button label="Abrir no meu Navegador de Web" name="open_browser"/>
+ <check_box label="Sempre abrir no meu navegador de web" name="open_always"/>
+ <button label="Fechar" name="close"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
new file mode 100644
index 0000000..83f47fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MemLeak" title="Simulação de Perda de Memória">
+ <spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/>
+ <spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/>
+ <text name="total_leaked_label">
+ Memória perdida atualmente: [SIZE] KB
+ </text>
+ <button label="Iniciar" name="start_btn"/>
+ <button label="Parar" name="stop_btn"/>
+ <button label="Liberar" name="release_btn"/>
+ <button label="Fechar" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_mute.xml b/indra/newview/skins/default/xui/pt/floater_mute.xml
index bd95a7f..d5ea237 100644
--- a/indra/newview/skins/default/xui/pt/floater_mute.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mute.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Residentes e Objetos silenciados">
+<floater name="mute floater" title="Residentes e Objetos silenciados" short_title="Lista de pessoas silenciadas">
<scroll_list name="mutes" tool_tip="Lista dos residentes sílenciados." />
<button label="Silênciar residente..." label_selected="Silênciar residente..."
name="Mute resident..." tool_tip="Sílenciar residente..." />
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
new file mode 100644
index 0000000..506d518
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="Emudecer objeto pelo nome">
+ <text name="message">
+ Emudecer pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
+ </text>
+ <line_editor name="object_name">
+ Nome do objeto
+ </line_editor>
+ <button label="Ok" name="OK"/>
+ <button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
index 3418355..f6bdf5e 100644
--- a/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
@@ -1,82 +1,84 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="modal container" title=" ">
- <button label="Salvar" label_selected="Salvar" name="Save" />
- <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
- <check_box label="Forma" name="checkbox_Shape" />
- <check_box label="Pele" name="checkbox_Skin" />
- <check_box label="Cabelo" name="checkbox_Hair" />
- <check_box label="Olhos" name="checkbox_Eyes" />
- <check_box label="Renomear Roupas para Nome da Pasta" name="rename" />
- <check_box label="Camisa" name="checkbox_Shirt" />
- <check_box label="Calças" name="checkbox_Pants" />
- <check_box label="Sapatos" name="checkbox_Shoes" />
- <check_box label="Meias" name="checkbox_Socks" />
- <check_box label="Jaqueta" name="checkbox_Jacket" />
- <check_box label="Luvas" name="checkbox_Gloves" />
- <check_box label="Anágua" name="checkbox_Undershirt" />
- <check_box label="Roupas de Baixo" name="checkbox_Underpants" />
- <check_box label="Saia" name="checkbox_Skirt" />
- <check_box label="Peito" name="checkbox_Chest" />
- <check_box label="Crânio" name="checkbox_Skull" />
- <check_box label="Ombro Esquerdo" name="checkbox_Left Shoulder" />
- <check_box label="Ombro Direito" name="checkbox_Right Shoulder" />
- <check_box label="Mão Esquerda" name="checkbox_Left Hand" />
- <check_box label="Mão Direita" name="checkbox_Right Hand" />
- <check_box label="Pé Esquerdo" name="checkbox_Left Foot" />
- <check_box label="Pé Direito" name="checkbox_Right Foot" />
- <check_box label="Espinha" name="checkbox_Spine" />
- <check_box label="Pelvis" name="checkbox_Pelvis" />
- <check_box label="Boca" name="checkbox_Mouth" />
- <check_box label="Queixo" name="checkbox_Chin" />
- <check_box label="Orelha Esquerda" name="checkbox_Left Ear" />
- <check_box label="Orelha Direita" name="checkbox_Right Ear" />
- <check_box label="Olho Esquerdo" name="checkbox_Left Eyeball" />
- <check_box label="Olho Direito" name="checkbox_Right Eyeball" />
- <check_box label="Nariz" name="checkbox_Nose" />
- <check_box label="Antebraço Direito" name="checkbox_R Upper Arm" />
- <check_box label="Braço Direito" name="checkbox_R Forearm" />
- <check_box label="Antebraço Esquerdo" name="checkbox_L Upper Arm" />
- <check_box label="Braço Esquerdo" name="checkbox_L Forearm" />
- <check_box label="Nádega Direita" name="checkbox_Right Hip" />
- <check_box label="Coxa Direita" name="checkbox_R Upper Leg" />
- <check_box label="Canela Direita" name="checkbox_R Lower Leg" />
- <check_box label="Nádega Esquerda" name="checkbox_Left Hip" />
- <check_box label="Coxa Esquerda" name="checkbox_L Upper Leg" />
- <check_box label="Canela Esquerda" name="checkbox_L Lower Leg" />
- <check_box label="Estomago" name="checkbox_Stomach" />
- <check_box label="Peito Esquerdo" name="checkbox_Left Pec" />
- <check_box label="Peito Direito" name="checkbox_Right Pec" />
- <check_box label="Centro 2" name="checkbox_Center 2" />
- <check_box label="Superior Direita" name="checkbox_Top Right" />
- <check_box label="Superior" name="checkbox_Top" />
- <check_box label="Superior Esquerda" name="checkbox_Top Left" />
- <check_box label="Centro" name="checkbox_Center" />
- <check_box label="Inferior Esquerda" name="checkbox_Bottom Left" />
- <check_box label="Inferior" name="checkbox_Bottom" />
- <check_box label="Inferior Direita" name="checkbox_Bottom Right" />
- <text type="string" length="1" name="Make New Outfit">
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <check_box label="Forma" name="checkbox_Shape"/>
+ <check_box label="Pele" name="checkbox_Skin"/>
+ <check_box label="Cabelo" name="checkbox_Hair"/>
+ <check_box label="Olhos" name="checkbox_Eyes"/>
+ <check_box label="Renomear Roupas para Nome da Pasta" name="rename"/>
+ <check_box label="Camisa" name="checkbox_Shirt"/>
+ <check_box label="Calças" name="checkbox_Pants"/>
+ <check_box label="Sapatos" name="checkbox_Shoes"/>
+ <check_box label="Meias" name="checkbox_Socks"/>
+ <check_box label="Jaqueta" name="checkbox_Jacket"/>
+ <check_box label="Luvas" name="checkbox_Gloves"/>
+ <check_box label="Anágua" name="checkbox_Undershirt"/>
+ <check_box label="Roupas de Baixo" name="checkbox_Underpants"/>
+ <check_box label="Saia" name="checkbox_Skirt"/>
+ <check_box label="Peito" name="checkbox_Chest"/>
+ <check_box label="Crânio" name="checkbox_Skull"/>
+ <check_box label="Ombro Esquerdo" name="checkbox_Left Shoulder"/>
+ <check_box label="Ombro Direito" name="checkbox_Right Shoulder"/>
+ <check_box label="Mão Esquerda" name="checkbox_Left Hand"/>
+ <check_box label="Mão Direita" name="checkbox_Right Hand"/>
+ <check_box label="Pé Esquerdo" name="checkbox_Left Foot"/>
+ <check_box label="Pé Direito" name="checkbox_Right Foot"/>
+ <check_box label="Espinha" name="checkbox_Spine"/>
+ <check_box label="Pelvis" name="checkbox_Pelvis"/>
+ <check_box label="Boca" name="checkbox_Mouth"/>
+ <check_box label="Queixo" name="checkbox_Chin"/>
+ <check_box label="Orelha Esquerda" name="checkbox_Left Ear"/>
+ <check_box label="Orelha Direita" name="checkbox_Right Ear"/>
+ <check_box label="Olho Esquerdo" name="checkbox_Left Eyeball"/>
+ <check_box label="Olho Direito" name="checkbox_Right Eyeball"/>
+ <check_box label="Nariz" name="checkbox_Nose"/>
+ <check_box label="Antebraço Direito" name="checkbox_R Upper Arm"/>
+ <check_box label="Braço Direito" name="checkbox_R Forearm"/>
+ <check_box label="Antebraço Esquerdo" name="checkbox_L Upper Arm"/>
+ <check_box label="Braço Esquerdo" name="checkbox_L Forearm"/>
+ <check_box label="Nádega Direita" name="checkbox_Right Hip"/>
+ <check_box label="Coxa Direita" name="checkbox_R Upper Leg"/>
+ <check_box label="Canela Direita" name="checkbox_R Lower Leg"/>
+ <check_box label="Nádega Esquerda" name="checkbox_Left Hip"/>
+ <check_box label="Coxa Esquerda" name="checkbox_L Upper Leg"/>
+ <check_box label="Canela Esquerda" name="checkbox_L Lower Leg"/>
+ <check_box label="Estomago" name="checkbox_Stomach"/>
+ <check_box label="Peito Esquerdo" name="checkbox_Left Pec"/>
+ <check_box label="Peito Direito" name="checkbox_Right Pec"/>
+ <check_box label="Centro 2" name="checkbox_Center 2"/>
+ <check_box label="Superior Direita" name="checkbox_Top Right"/>
+ <check_box label="Superior" name="checkbox_Top"/>
+ <check_box label="Superior Esquerda" name="checkbox_Top Left"/>
+ <check_box label="Centro" name="checkbox_Center"/>
+ <check_box label="Inferior Esquerda" name="checkbox_Bottom Left"/>
+ <check_box label="Inferior" name="checkbox_Bottom"/>
+ <check_box label="Inferior Direita" name="checkbox_Bottom Right"/>
+ <text length="1" name="Make New Outfit" type="string">
Fazer Nova Aparencia
</text>
- <text type="string" length="1"
- name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. "Make New Outfit" makes a new folder and saves copies of the items you are now wearing into it.">
+ <text length="1" name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. "Make New Outfit" makes a new folder and saves copies of the items you are now wearing into it." type="string">
Aparencias são pastas que contem roupas e partes do corpo. Arraste uma Aparencia até seu avatar para vestí-la. Fazer Nova Aparencia cria uma nova pasta e salva cópias dos itens que você está vestindo no momento.
</text>
- <text type="string" length="1" name="Folder name:">
+ <text length="1" name="Folder name:" type="string">
Nome da Pasta:
</text>
- <text type="string" length="1" name="Items to include in outfit:">
+ <text length="1" name="Items to include in outfit:" type="string">
Itens que compõem a Aparência:
</text>
- <text type="string" length="1" name="Body Parts:">
+ <text length="1" name="Body Parts:" type="string">
Partes do Corpo:
</text>
- <text type="string" length="1" name="Clothes:">
+ <text length="1" name="Clothes:" type="string">
Roupas:
</text>
- <text type="string" length="1" name="Attachments:">
+ <text length="1" name="Attachments:" type="string">
Acessórios:
</text>
- <text type="string" length="1" name="Options:">
+ <text length="1" name="Options:" type="string">
Opções:
</text>
+ <line_editor name="name ed">
+ Nova Vestimenta
+ </line_editor>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
index deb5d0c..5c07ce6 100644
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_postcard.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="Enviar cartão postal">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Instantâneo por email">
<text name="to_label">
Email do Destinatário:
</text>
@@ -12,17 +12,25 @@
<text name="subject_label">
Assunto:
</text>
+ <line_editor label="Digite seu assunto aqui." name="subject_form"/>
<text name="msg_label">
Mensagem:
</text>
- <check_box label="Publicar na Web" name="allow_publish_check"
- tool_tip="Publicar este postcard na web" />
- <check_box label="Conteúdo Adulto" name="mature_check"
- tool_tip="Este postcard possui conteúdo adulto." />
- <button label="?" name="publish_help_btn" />
+ <text_editor name="msg_form">
+ Digite sua mensagem aqui.
+ </text_editor>
<text name="fine_print">
- Se o destinatário do seu postcard é residente em SL, você receberá um bonus..
+ Se seu indicado entrar no SL, você receberá um bônus pela indicação.
</text>
- <button label="Cancelar" name="cancel_btn" />
- <button label="Enviar" name="send_btn" />
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Enviar" name="send_btn"/>
+ <string name="default_subject">
+ Cartão postal do Second Life.
+ </string>
+ <string name="default_message">
+ Dá uma olhada nisto!
+ </string>
+ <string name="upload_message">
+ "Enviando..."
+ </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
new file mode 100644
index 0000000..83af494
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="classified_preview" title="Classificar Informação"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_event.xml b/indra/newview/skins/default/xui/pt/floater_preview_event.xml
new file mode 100644
index 0000000..60f8556
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_preview_event.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="event_preview" title="Informação de Evento (testemunhos)"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 13a27d3..564a9af 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -1,32 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="gesture_preview">
+ <string name="stop_txt">
+ Parar
+ </string>
+ <string name="preview_txt">
+ Prévia
+ </string>
+ <string name="none_text">
+ -- Nenhum --
+ </string>
<text name="desc_label">
Descrição:
</text>
<text name="trigger_label">
Gatilho:
</text>
- <text name="replace_text"
- tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.">
+ <text name="replace_text" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.">
Substituir por:
</text>
- <line_editor name="replace_editor"
- tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. " />
+ <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. "/>
<text name="key_label">
Tecla de Atalho:
</text>
- <combo_box label="Nenhum" name="modifier_combo" />
- <combo_box label="Nenhum" name="key_combo" />
+ <combo_box label="Nenhum" name="modifier_combo"/>
+ <combo_box label="Nenhum" name="key_combo"/>
<text name="library_label">
Biblioteca:
</text>
<text name="steps_label">
Passos:
</text>
- <button label="Incluir" name="add_btn" />
- <button label="Mover Para Cima" name="up_btn" />
- <button label="Mover Para Baixo" name="down_btn" />
- <button label="Remover" name="delete_btn" />
+ <button label="Incluir" name="add_btn"/>
+ <button label="Mover Para Cima" name="up_btn"/>
+ <button label="Mover Para Baixo" name="down_btn"/>
+ <button label="Remover" name="delete_btn"/>
<text name="help_label">
Todos os passos acontecem simultaneamente, a menos que você inclua passos de espera.
</text>
@@ -38,10 +45,9 @@
Parar
</radio_item>
</radio_group>
- <check_box label="Até que a animação esteja concluída" name="wait_anim_check" />
- <check_box label="tempo em segundos" name="wait_time_check" />
- <check_box label="Ativar" name="active_check"
- tool_tip="Gesto ativos pode ser engatilhados escrevendo suas frases gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho." />
- <button label="Preview" name="preview_btn" />
- <button label="Salvar" name="save_btn" />
+ <check_box label="Até que a animação esteja concluída" name="wait_anim_check"/>
+ <check_box label="tempo em segundos" name="wait_time_check"/>
+ <check_box label="Ativar" name="active_check" tool_tip="Gesto ativos pode ser engatilhados escrevendo suas frases gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
+ <button label="Preview" name="preview_btn"/>
+ <button label="Salvar" name="save_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index b8d9e2d..9f48b6e 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview notecard" title="Nota:">
- <button label="Salvar" label_selected="Salvar" name="Save" />
- <text type="string" length="1" name="desc txt">
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <text length="1" name="desc txt" type="string">
Descrição:
</text>
- <text_editor type="string" length="1" name="Notecard Editor">
+ <text_editor length="1" name="Notecard Editor" type="string">
Carregando...
</text_editor>
+ <string name="no_object">
+ Não foi possível encontrar o objeto que contém esta nota.
+ </string>
+ <string name="not_allowed">
+ Você não tem permissão de visualizar esta nota.
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
index 837f9d1..c5ba6b2 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
@@ -1,11 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview_notecard">
- <text_editor type="string" length="1" name="Notecard Editor">
+ <text_editor length="1" name="Notecard Editor" type="string">
Carregando...
</text_editor>
- <text type="string" length="1" name="desc txt">
+ <text length="1" name="desc txt" type="string">
Descrição:
</text>
- <button label="Guardar" label_selected="Guardar" name="Keep" />
- <button label="Descartar" label_selected="Descartar" name="Discard" />
+ <button label="Guardar" label_selected="Guardar" name="Keep"/>
+ <button label="Descartar" label_selected="Descartar" name="Discard"/>
+ <string name="no_object">
+ Não foi possível encontrar o objeto que contem esta nota.:
+ </string>
+ <string name="not_allowed">
+ Você não tem permissão para ler esta nota.
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_url.xml b/indra/newview/skins/default/xui/pt/floater_preview_url.xml
new file mode 100644
index 0000000..16d9cc8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_preview_url.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="url_preview" title="Informação local"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml
new file mode 100644
index 0000000..b16b1a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_region_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Região/Propriedade"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 9d130b8..0a39226 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -1,59 +1,165 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_report_abuse" title="Reportar abuso">
+ <texture_picker label="" name="screenshot"/>
+ <check_box label="Incluir screenshot" name="screen_check"/>
<text name="reporter_title">
Denunciador:
</text>
+ <text name="reporter_field">
+ Loremipsum Dolorsitamut
+ </text>
<text name="sim_title">
Região:
</text>
+ <text name="sim_field">
+ Nome da Região
+ </text>
<text name="pos_title">
Posição:
</text>
- <texture_picker name="screenshot" />
- <check_box label="Incluir screenshot" name="screen_check" />
- <button label="" label_selected="" name="pick_btn"
- tool_tip="Object Picker - Identifica um objeto com assunto deste report" />
+ <text name="pos_field">
+ {128.1, 128.1, 15.4}
+ </text>
<text name="select_object_label">
Clique no botão e em seguida no objeto:
</text>
+ <button label="" label_selected="" name="pick_btn" tool_tip="Object Picker - Identifica um objeto com assunto deste report"/>
<text name="object_name_label">
Nome:
</text>
+ <text name="object_name">
+ Consetetur Sadipscing
+ </text>
<text name="owner_name_label">
Proprietário:
</text>
- <combo_box name="category_combo"
- tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
- <combo_item name="Selectcategory">
- Selecione a Categoria
+ <text name="owner_name">
+ Hendrerit Vulputate
+ </text>
+ <combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
+ <combo_item name="Select_category">
+ Selecionar categoria
+ </combo_item>
+ <combo_item name="Age__Age_play">
+ Idade > Idade no jogo
+ </combo_item>
+ <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+ Idade > Residente adulto no Second Life Jovem
+ </combo_item>
+ <combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+ Idade > Residente menor no Second Life Adulto
+ </combo_item>
+ <combo_item name="Assault__Combat_sandbox___unsafe_area">
+ Assalto > Sandbox de combate / área não segura
+ </combo_item>
+ <combo_item name="Assault__Safe_area">
+ Assalto > Área segura
+ </combo_item>
+ <combo_item name="Assault__Weapons_testing_sandbox">
+ Assalto > Testando armas em sandbox
+ </combo_item>
+ <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+ Comércio > Falha em enviar produto ou serviço
+ </combo_item>
+ <combo_item name="Disclosure__Real_world_information">
+ Revelar > Informação do mundo real
+ </combo_item>
+ <combo_item name="Disclosure__Remotely_monitoring chat">
+ Revelar > Conversa monitorada remotamente
+ </combo_item>
+ <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+ Revelar > Informação do Second Life/conversa/MIs
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+ Distúrbio da paz > Uso injusto dos recursos da região
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+ Distúrbio da paz > Objetos com excesso de scripts
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Object_littering">
+ Distúrbio da paz > Objeto despejando lixo
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Repetitive_spam">
+ Distúrbio da paz > Spam repetitivo
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+ Distúrbio da paz > Spam de anúncio indesejado
+ </combo_item>
+ <combo_item name="Fraud__L$">
+ Fraude > L$
+ </combo_item>
+ <combo_item name="Fraud__Land">
+ Fraude > Terra
+ </combo_item>
+ <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+ Fraude > Esquema de pirâmide ou cartas encadeadas
+ </combo_item>
+ <combo_item name="Fraud__US$">
+ Fraude > R$
+ </combo_item>
+ <combo_item name="Harassment__Advert_farms___visual_spam">
+ Perturbação > Fazendas de Anúncios / spam visual
+ </combo_item>
+ <combo_item name="Harassment__Defaming_individuals_or_groups">
+ Perturbação > Difamação de indivíduos ou grupos
+ </combo_item>
+ <combo_item name="Harassment__Impeding_movement">
+ Perturbação > Impedindo movimentos
+ </combo_item>
+ <combo_item name="Harassment__Sexual_harassment">
+ Perturbação > Perturbação sexual
+ </combo_item>
+ <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+ Perturbação > Solicitando/incitando outros a violarem o ToS
+ </combo_item>
+ <combo_item name="Harassment__Verbal_abuse">
+ Perturbação > Abuso verbal
+ </combo_item>
+ <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+ Indecência > Conteúdo ou conduta amplamente ofensivos
+ </combo_item>
+ <combo_item name="Indecency__Broadly_visible_mature_content">
+ Indecência > Conteúdo maduro visível de um modo geral
+ </combo_item>
+ <combo_item name="Indecency__Inappropriate_avatar_name">
+ Indecência > Nome de avatar inapropriado
+ </combo_item>
+ <combo_item name="Indecency__Mature_content_in_PG_region">
+ Indecência > Conteúdo maduro numa região PG
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_Content_Removal">
+ Violação de propriedade intelectual > Remoção de Conteúdo
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+ Violação de Propriedade intelectual > Cópia Ilegal ou Aproveitar-se de Permissões
</combo_item>
<combo_item name="Intolerance">
Intolerância
</combo_item>
- <combo_item name="Harassment">
- Assédio
+ <combo_item name="Land__Abuse_of_sandbox_resources">
+ Terra > Abuso dos recursos da sandbox
</combo_item>
- <combo_item name="Assault">
- Assalto
+ <combo_item name="Land__Encroachment__Objects_textures">
+ Terra > Invasão > Objetos/texturas
</combo_item>
- <combo_item name="Disclosure">
- Exposição
+ <combo_item name="Land__Encroachment__Particles">
+ Terra > Invasão > Partículas
</combo_item>
- <combo_item name="Indecency">
- Indecência
+ <combo_item name="Land__Encroachment__Trees_plants">
+ Terra > Violação > Árvores/plantas
</combo_item>
- <combo_item name="Age">
- Idade
+ <combo_item name="Wagering_gambling">
+ Apostas/jogos de azar
</combo_item>
- <combo_item name="Parcel">
- Lote
+ <combo_item name="Other">
+ Outro
</combo_item>
</combo_box>
<text name="abuser_name_title">
Nome do Denunciado:
</text>
- <button label="Selecione" label_selected="" name="select_abuser"
- tool_tip="Selecione o nome do Denuncionado numa lista" />
+ <button label="Escolher Residente" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denuncionado numa lista"/>
+ <check_box label="Não sei o nome do molestador" name="omit_abuser_name" tool_tip="Marque aqui se você não consegue fornecer o nome do agressor"/>
<text name="abuser_name_title2">
Local do Abuso:
</text>
@@ -64,11 +170,11 @@
Detalhes:
</text>
<text name="bug_aviso">
- Por favor, seja específico com a data, local , natureza do abuso, texto do chat ou MI relevânte e selecione o objeto se possível.
+ Por favor, seja específico(a) sobre data, localidade, natureza do abuso, texto relevante de conversa/MI e selecione o objeto, se possível.
</text>
<text name="incomplete_title">
- Nota: Reports imcompletos não serão investigados
+ Nota: Relatos incompletos não serão investigados.
</text>
- <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn" />
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_bug.xml b/indra/newview/skins/default/xui/pt/floater_report_bug.xml
index c9b37a7..648d568 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_bug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_bug.xml
@@ -1,99 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="bug_reporter" title="Reportar Bug">
- <text name="reporter_title">
- Denunciador:
- </text>
<text name="sim_title">
- Simulador:
- </text>
- <text name="pos_title">
- Local:
+ Região:
</text>
<text name="select_object_label">
- Clique no botão e em seguida no objeto:
- </text>
- <button label="" label_selected="" name="pick_btn"
- tool_tip="Selecionador de objeto - Identifica um objeto como assunto deste report" />
- <text name="object_name_label">
- Nome:
- </text>
- <text name="owner_name_label">
- Proprietário:
- </text>
- <check_box label="Incluir screenshot" name="screen_check" />
- <texture_picker label="Trabalhando..." name="screenshot" />
- <text name="category_label">
- Categoria:
- </text>
- <combo_box name="category_combo"
- tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
- <combo_item name="Selectcategory">
- Selecione a Categoria
- </combo_item>
- <combo_item name="Building">
- Construção
- </combo_item>
- <combo_item name="Character">
- Personagem
- </combo_item>
- <combo_item name="Chat/IM">
- Chat/MI
- </combo_item>
- <combo_item name="Documentation">
- Documentação
- </combo_item>
- <combo_item name="Exploit">
- Exploração
- </combo_item>
- <combo_item name="Graphics">
- Gráficos
- </combo_item>
- <combo_item name="Inventory">
- Inventário
- </combo_item>
- <combo_item name="Lag">
- Lag
- </combo_item>
- <combo_item name="MissingContent">
- Conteúdo Faltando
- </combo_item>
- <combo_item name="LindenDollars(L$)">
- Linden Dollars (L$)
- </combo_item>
- <combo_item name="Permissions">
- Permissões
- </combo_item>
- <combo_item name="Physics">
- Física
- </combo_item>
- <combo_item name="Script">
- Script
- </combo_item>
- <combo_item name="Sound">
- Sons
- </combo_item>
- <combo_item name="Stipends">
- Valor de Entrada
- </combo_item>
- <combo_item name="Userinterface">
- Interface do Usuário
- </combo_item>
- <combo_item name="Miscellaneous">
- Miscelânia
- </combo_item>
- </combo_box>
- <text name="sum_title">
- Resumo:
- </text>
- <text name="dscr_title">
- detalhes: (Por favor, forneceça o máximo de informação que puder)
- </text>
- <text_editor name="details_edit">
- Passos para reproduzir o bug: Resultados Obtido: Resultados Esperados:
- </text_editor>
- <text name="bug_aviso">
- Nota: Reports incompletos não serão investigados. Se este bug permite que você faça algo que não poderia fazer, especialmente se isso representa uma ameaça a performace ou segurança, por favor selecione a categoria Exploração. Obrigado!
+ Clique no botão e depois no objeto:
</text>
- <button label="Reportar Bug" label_selected="Reportar Bug" name="send_btn" />
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
+ <texture_picker label="" name="screenshot"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
index 877f5b8..f3b8fc5 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
@@ -1,6 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Script Errors/Warning">
- <tab_container name="Preview Tabs">
- <floater label="Script" name="all_scripts" title="[All scripts]" />
- </tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="script debug floater" title="Aviso de script/erro"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
index 1d9bec3..ee0be20 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
@@ -1,30 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="script panel">
- <text_editor type="string" length="1" name="Script Editor">
+ <text_editor length="1" name="Script Editor" type="string">
Loading...
</text_editor>
- <button label="Salvar" label_selected="Salvar" name="Save_btn" />
+ <button label="Salvar" label_selected="Salvar" name="Save_btn"/>
+ <combo_box label="Inserir..." name="Insert..."/>
<menu_bar name="script_menu">
<menu name="File">
- <menu_item_call label="Salvar" name="Save" />
- <menu_item_call label="Desfazer as Mudanças" name="Revert All Changes" />
+ <menu_item_call label="Salvar" name="Save"/>
+ <menu_item_call label="Desfazer as Mudanças" name="Revert All Changes"/>
</menu>
<menu name="Edit">
- <menu_item_call label="Desfazer" name="Undo" />
- <menu_item_call label="Desfazer" name="Redo" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Recortar" name="Cut" />
- <menu_item_call label="Copiar" name="Copy" />
- <menu_item_call label="Colar" name="Paste" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Selecionar Tudo" name="Select All" />
- <menu_item_call label="Retirar seleção" name="Deselect" />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Buscar / Substituir..." name="Search / Replace..." />
+ <menu_item_call label="Desfazer" name="Undo"/>
+ <menu_item_call label="Desfazer" name="Redo"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Recortar" name="Cut"/>
+ <menu_item_call label="Copiar" name="Copy"/>
+ <menu_item_call label="Colar" name="Paste"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Selecionar Tudo" name="Select All"/>
+ <menu_item_call label="Retirar seleção" name="Deselect"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Buscar / Substituir..." name="Search / Replace..."/>
</menu>
<menu name="Help">
- <menu_item_call label="Ajuda..." name="Help..." />
- <menu_item_call label="Ajuda LSL Wiki..." name="LSL Wiki Help..." />
+ <menu_item_call label="Ajuda..." name="Help..."/>
+ <menu_item_call label="Ajuda LSL Wiki..." name="LSL Wiki Help..."/>
</menu>
</menu_bar>
+ <string name="loading">
+ Carregando...
+ </string>
+ <string name="can_not_view">
+ Você não tem permissão de visualizar este script.
+ </string>
+ <string name="public_objects_can_not_run">
+ Objetos públicos não podem rodar scripts
+ </string>
+ <string name="script_running">
+ Funcionando
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml b/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
new file mode 100644
index 0000000..2fc2473
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterreleasemessage" title="Entrando na região">
+ <button label="fechar" name="close_btn"/>
+ <string name="in-world_help_title">
+ Ajuda no mundo
+ </string>
+ <string name="additional_help_title">
+ Ajuda adicional
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 4d30377..9180ae6 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -1,23 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Snapshot" title="Visualizar foto">
<text name="type_label">
- O que você gostaria de fazer?
+ Instantâneo do destino
</text>
<radio_group label="Tipo de Foto" name="snapshot_type_radio">
<radio_item name="postcard">
- Enviar um postcard
+ Enviar por email
</radio_item>
<radio_item name="texture">
- Upload de uma foto
+ Salvar no seu inventário (L$10)
</radio_item>
<radio_item name="local">
- Salvar foto no seu HD
+ Salvar no seu disco rígido
</radio_item>
</radio_group>
+ <text name="file_size_label">
+ Tamanho do arquivo: [SIZE] KB
+ </text>
+ <button label="Atualizar o Instantâneo" name="new_snapshot_btn"/>
+ <button label="Enviar" name="send_btn"/>
+ <button label="Salvar (L$10)" name="upload_btn"/>
+ <flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo">
+ <flyout_button_item name="save_item">
+ Salvar
+ </flyout_button_item>
+ <flyout_button_item name="saveas_item">
+ Salvar como...
+ </flyout_button_item>
+ </flyout_button>
+ <button label="Cancelar" name="discard_btn"/>
+ <button label="Mais >>" name="more_btn" tool_tip="Opções Avançadas"/>
+ <button label="<< Menos" name="less_btn" tool_tip="Opções Avançadas"/>
<text name="type_label2">
- Que tamanho de imagem você precisa?
+ Tamanho
+ </text>
+ <text name="format_label">
+ Formato
</text>
<combo_box label="Resolução" name="postcard_size_combo">
+ <combo_item name="CurrentWindow">
+ Janela Atual
+ </combo_item>
<combo_item name="640x480">
640x480
</combo_item>
@@ -27,9 +50,6 @@
<combo_item name="1024x768">
1024x768
</combo_item>
- <combo_item name="CurrentWindow">
- Janela Atual
- </combo_item>
<combo_item name="Custom">
Customizado
</combo_item>
@@ -77,9 +97,21 @@
Customizado
</combo_item>
</combo_box>
- <spinner label="Largura" name="snapshot_width" />
- <spinner label="Altura" name="snapshot_height" />
- <slider label="Qualidade da Imagem" name="image_quality_slider" />
+ <combo_box label="Formato" name="local_format_combo">
+ <combo_item name="PNG">
+ PNG
+ </combo_item>
+ <combo_item name="JPEG">
+ JPEG
+ </combo_item>
+ <combo_item name="BMP">
+ BMP
+ </combo_item>
+ </combo_box>
+ <spinner label="Largura" name="snapshot_width"/>
+ <spinner label="Altura" name="snapshot_height"/>
+ <check_box label="Restringir proporções" name="keep_aspect_check"/>
+ <slider label="Qualidade da Imagem" name="image_quality_slider"/>
<text name="layer_type_label">
Capturar:
</text>
@@ -94,18 +126,12 @@
Decoração do Objeto
</combo_item>
</combo_box>
- <text name="file_size_label">
- Tamanho do Arquivo: [SIZE]
- </text>
- <check_box label="Mostrar interface na Foto" name="ui_check" />
- <check_box label="Mostrar Objetos HUD na Foto" name="hud_check" />
- <check_box label="Manter aberto após salvar" name="keep_open_check" />
- <check_box label="Manter aparência selecionada" name="keep_aspect_check" />
- <check_box label="Quadro Congelado" name="freeze_frame_check" />
- <button label="Nova foto" name="new_snapshot_btn" />
- <check_box label="Auto-snapshot" name="auto_snapshot_check" />
- <button label="Upload (L$10)" name="upload_btn" />
- <button label="Enviar" name="send_btn" />
- <button label="Salvar" name="save_btn" />
- <button label="Descartar" name="discard_btn" />
+ <check_box label="Mostrar interface na Foto" name="ui_check"/>
+ <check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+ <check_box label="Manter aberto após salvar" name="keep_open_check"/>
+ <check_box label="Quadro Congelado" name="freeze_frame_check"/>
+ <check_box label="Auto-atualizar" name="auto_snapshot_check"/>
+ <string name="unknown">
+ desconhecido
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 013b02b..46e665d 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -1,17 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="texture picker" title="Pegar: Textura">
- <text type="string" length="1" name="Multiple">
+ <string name="choose_picture">
+ Clique para escolher uma imagem
+ </string>
+ <text length="1" name="Multiple" type="string">
Multiplo
</text>
- <text type="string" length="1" name="unknown">
- Dimenções: 512 x 512
+ <text length="1" name="unknown" type="string">
+ Dimensões: [DIMENSIONS]
</text>
- <button label="Padrão" label_selected="Padrão" name="Default" />
- <button label="Nenhum" label_selected="Nenhum" name="None" />
- <button label="Branco" label_selected="Branco" name="Blank" />
- <check_box label="Mostrar Pastas" name="show_folders_check" />
- <check_box label="Aplicar Imediatamente" name="apply_immediate_check" />
- <button label="" label_selected="" name="Pipette" />
- <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
- <button label="Selecionar" label_selected="Selecionar" name="Select" />
+ <button label="Padrão" label_selected="Padrão" name="Default"/>
+ <button label="Nenhum" label_selected="Nenhum" name="None"/>
+ <button label="Branco" label_selected="Branco" name="Blank"/>
+ <check_box label="Mostrar Pastas" name="show_folders_check"/>
+ <search_editor label="Clique aqui para buscar" name="inventory search editor"/>
+ <check_box label="Aplicar Imediatamente" name="apply_immediate_check"/>
+ <button label="" label_selected="" name="Pipette"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <button label="Selecionar" label_selected="Selecionar" name="Select"/>
+ <string name="pick title">
+ Pegar:
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 336bff0..92c2fee 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -1,46 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="toolbox floater" title="">
- <button label="" label_selected="" name="button focus" />
- <text name="tool label">
- Foco
- </text>
- <button label="" label_selected="" name="button move" />
- <text name="tool label2">
- Mover
- </text>
- <button label="" label_selected="" name="button edit" />
- <text name="tool label3">
- Editar
- </text>
- <button label="" label_selected="" name="button create" />
- <text name="tool label4">
- Criar
- </text>
- <button label="" label_selected="" name="button land" />
- <text name="tool label5">
- Terra
- </text>
- <check_box label="Zoom" name="radio zoom" />
- <check_box label="Orbita (Ctrl)" name="radio orbit" />
- <check_box label="Pan (Ctrl-Shift)" name="radio pan" />
- <check_box label="Mover" name="radio move" />
- <check_box label="Suspender (Ctrl)" name="radio lift" />
- <check_box label="Girar (Ctrl-Shift)" name="radio spin" />
- <check_box label="Posição" name="radio position" />
- <check_box label="Rotacionar (Ctrl)" name="radio rotate" />
- <check_box label="Esticar (Ctrl-Shift)" name="radio stretch" />
- <check_box label="Selecionar Textura" name="radio select face" />
- <check_box label="Editar partes linkadas" name="checkbox edit linked parts" />
- <check_box label="Grade" name="checkbox snap to grid" />
- <button label="Opções..." label_selected="Opções..." name="Options..." />
- <check_box label="Esticar ambos os lados" name="checkbox uniform" />
- <check_box label="Esticar Texturas" name="checkbox stretch textures" />
+ <button label="" label_selected="" name="button focus" tool_tip="Foco"/>
+ <button label="" label_selected="" name="button move" tool_tip="Mover"/>
+ <button label="" label_selected="" name="button edit" tool_tip="Editar"/>
+ <button label="" label_selected="" name="button create" tool_tip="Criar"/>
+ <button label="" label_selected="" name="button land" tool_tip="Terra"/>
+ <check_box label="Zoom" name="radio zoom"/>
+ <check_box label="Orbita (Ctrl)" name="radio orbit"/>
+ <check_box label="Pan (Ctrl-Shift)" name="radio pan"/>
+ <check_box label="Mover" name="radio move"/>
+ <check_box label="Suspender (Ctrl)" name="radio lift"/>
+ <check_box label="Girar (Ctrl-Shift)" name="radio spin"/>
+ <check_box label="Posição" name="radio position"/>
+ <check_box label="Rotacionar (Ctrl)" name="radio rotate"/>
+ <check_box label="Esticar (Ctrl-Shift)" name="radio stretch"/>
+ <check_box label="Selecionar Textura" name="radio select face"/>
+ <check_box label="Editar partes linkadas" name="checkbox edit linked parts"/>
<text name="text ruler mode">
Modo
</text>
- <text name="text status">
- Arraste para mover, shift+Arrastar para Copiar
- </text>
<combo_box name="combobox grid mode">
<combo_item name="World">
Mundo
@@ -52,32 +30,39 @@
Referência
</combo_item>
</combo_box>
- <button label="" label_selected="" name="ToolCube" />
- <button label="" label_selected="" name="ToolPrism" />
- <button label="" label_selected="" name="ToolPyramid" />
- <button label="" label_selected="" name="ToolTetrahedron" />
- <button label="" label_selected="" name="ToolCylinder" />
- <button label="" label_selected="" name="ToolHemiCylinder" />
- <button label="" label_selected="" name="ToolCone" />
- <button label="" label_selected="" name="ToolHemiCone" />
- <button label="" label_selected="" name="ToolSphere" />
- <button label="" label_selected="" name="ToolHemiSphere" />
- <check_box label="Copiar Seleção" name="checkbox copy selection" />
- <button label="" label_selected="" name="ToolTorus" />
- <button label="" label_selected="" name="ToolTube" />
- <button label="" label_selected="" name="ToolRing" />
- <button label="" label_selected="" name="ToolTree" />
- <button label="" label_selected="" name="ToolGrass" />
- <check_box label="Manter ferramenta selecionada" name="checkbox sticky" />
- <check_box label="Copiar Centro" name="checkbox copy centers" />
- <check_box label="Rotacionar Copia" name="checkbox copy rotates" />
- <check_box label="Selecionar Terra" name="radio select land" />
- <check_box label="Aplainar Terra" name="radio flatten" />
- <check_box label="Elevar Terra" name="radio raise" />
- <check_box label="Baixar Terra" name="radio lower" />
- <check_box label="Suavizar Terra" name="radio smooth" />
- <check_box label="Terrano Rígido" name="radio noise" />
- <check_box label="Reverter Terra" name="radio revert" />
+ <check_box label="Esticar ambos os lados" name="checkbox uniform"/>
+ <check_box label="Esticar Texturas" name="checkbox stretch textures"/>
+ <check_box label="Grade" name="checkbox snap to grid"/>
+ <button label="Opções..." label_selected="Opções..." name="Options..."/>
+ <text name="text status">
+ Arraste para mover, shift+Arrastar para Copiar
+ </text>
+ <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
+ <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+ <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/>
+ <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
+ <button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
+ <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semi-cilindro"/>
+ <button label="" label_selected="" name="ToolCone" tool_tip="Cone"/>
+ <button label="" label_selected="" name="ToolHemiCone" tool_tip="Semi-cone"/>
+ <button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
+ <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semi-esfera"/>
+ <button label="" label_selected="" name="ToolTorus" tool_tip="Toróide"/>
+ <button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
+ <button label="" label_selected="" name="ToolRing" tool_tip="Anel"/>
+ <button label="" label_selected="" name="ToolTree" tool_tip="Árvore"/>
+ <button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/>
+ <check_box label="Manter ferramenta selecionada" name="checkbox sticky"/>
+ <check_box label="Copiar Seleção" name="checkbox copy selection"/>
+ <check_box label="Copiar Centro" name="checkbox copy centers"/>
+ <check_box label="Rotacionar Copia" name="checkbox copy rotates"/>
+ <check_box label="Selecionar Terra" name="radio select land"/>
+ <check_box label="Aplainar Terra" name="radio flatten"/>
+ <check_box label="Elevar Terra" name="radio raise"/>
+ <check_box label="Baixar Terra" name="radio lower"/>
+ <check_box label="Suavizar Terra" name="radio smooth"/>
+ <check_box label="Terrano Rígido" name="radio noise"/>
+ <check_box label="Reverter Terra" name="radio revert"/>
<combo_box name="combobox brush size">
<combo_item name="Small">
Pequeno
@@ -89,11 +74,13 @@
Grande
</combo_item>
</combo_box>
- <button label="Aplicar no selecionado" label_selected="Aplicar no selecionado"
- name="button apply to selection" tool_tip="Modificar Terra Selecionada" />
- <check_box label="Mostrar Proprietários" name="checkbox show owners" />
- <button label="Mais >>" name="button more" tool_tip="Opções Avançadas" />
- <button label="<< Menos" name="button less" tool_tip="Opções Avançadas" />
+ <text name="Strength:">
+ Força:
+ </text>
+ <button label="Aplicar no selecionado" label_selected="Aplicar no selecionado" name="button apply to selection" tool_tip="Modificar Terra Selecionada"/>
+ <check_box label="Mostrar Proprietários" name="checkbox show owners"/>
+ <button label="Mais >>" name="button more" tool_tip="Opções Avançadas"/>
+ <button label="<< Menos" name="button less" tool_tip="Opções Avançadas"/>
<tab_container name="Object Info Tabs">
<panel label="Comum" name="General">
<text name="Name:">
@@ -108,21 +95,21 @@
<text name="Creator Name">
Thrax Linden
</text>
- <button label="Perfil..." label_selected="Perfil..." name="button creator profile" />
+ <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
<text name="Owner:">
Proprietário:
</text>
<text name="Owner Name">
Thrax Linden
</text>
- <button label="Perfil..." label_selected="Perfil..." name="button owner profile" />
+ <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
<text name="Group:">
Grupo:
</text>
<text name="Group Name Proxy">
Os Lindens
</text>
- <button label="Selecionar..." label_selected="Selecionar..." name="button set group" />
+ <button label="Selecionar..." label_selected="Selecionar..." name="button set group"/>
<text name="prim info">
1 Objeto, 1 Primitiva
</text>
@@ -132,20 +119,19 @@
<text name="perm_modify">
Você pode modificar este objeto.
</text>
- <check_box label="Compartilhar com o Grupo" name="checkbox share with group"
- tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem" />
- <text name="text deed continued">
+ <check_box label="Compartilhar com o Grupo" name="checkbox share with group" tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem"/>
+ <string name="text deed continued">
Acionar...
- </text>
- <text name="text deed">
+ </string>
+ <string name="text deed">
Acionar
- </text>
- <button label="Acionar..." label_selected="Acionar..." name="button deed"
- tool_tip="Objetos compartilhados do Grupo pode ser acionados pelo gerente do grupo." />
- <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move" />
- <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy" />
- <check_box label="A Venda" name="checkbox for sale" />
- <text name="Price: L$">
+ </string>
+ <button label="Acionar..." label_selected="Acionar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser acionados pelo gerente do grupo."/>
+ <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/>
+ <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/>
+ <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
+ <check_box label="A Venda" name="checkbox for sale"/>
+ <text name="Cost">
Preço: L$
</text>
<radio_group name="sale type">
@@ -162,9 +148,9 @@
<text name="Next owner can:">
Próximo Proprietário pode:
</text>
- <check_box label="Modificar" name="checkbox next owner can modify" />
- <check_box label="Copiar" name="checkbox next owner can copy" />
- <check_box label="Revender/Dar" name="checkbox next owner can transfer" />
+ <check_box label="Modificar" name="checkbox next owner can modify"/>
+ <check_box label="Copiar" name="checkbox next owner can copy"/>
+ <check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
<text name="label click action">
Quando clicado com o botão esquerdo:
</text>
@@ -184,6 +170,12 @@
<combo_item name="Open">
Abrir
</combo_item>
+ <combo_item name="Play">
+ Executar a mídia do terreno
+ </combo_item>
+ <combo_item name="Opemmedia">
+ Abrir a mídia do terreno
+ </combo_item>
</combo_box>
<text name="B:">
B:
@@ -203,21 +195,36 @@
<text name="F:">
F:
</text>
- <text name="text modify info 1">
+ <string name="text modify info 1">
Você pode modificar este objeto.
- </text>
- <text name="text modify info 2">
+ </string>
+ <string name="text modify info 2">
Você pode modificar estes objetos.
- </text>
- <text name="text modify info 3">
+ </string>
+ <string name="text modify info 3">
Você não pode modificar este objeto.
- </text>
- <text name="text modify info 4">
+ </string>
+ <string name="text modify info 4">
Você não pode modificar estes objetos.
- </text>
- <text name="text modify warning">
+ </string>
+ <string name="text modify warning">
Você precisa selecionar o objeto todo para ajustar as permissões.
- </text>
+ </string>
+ <string name="Cost Default">
+ Preço: L$
+ </string>
+ <string name="Cost Total">
+ Preço Total: L$
+ </string>
+ <string name="Cost Per Unit">
+ Preço Por: L$
+ </string>
+ <string name="Cost Mixed">
+ Preço Misturado
+ </string>
+ <string name="Sale Mixed">
+ Venda Misturada
+ </string>
</panel>
<panel label="Objeto" name="Object">
<text name="select_single">
@@ -226,32 +233,28 @@
<text name="edit_object">
Editar os parâmetros do Objeto:
</text>
- <check_box label="Travado" name="checkbox locked"
- tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção." />
- <check_box label="Física" name="Physical Checkbox Ctrl"
- tool_tip="Permite que os objetos sejam empurrados sofram efeito da gravidade" />
- <check_box label="Temporário" name="Temporary Checkbox Ctrl"
- tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado." />
- <check_box label="Fantasma" name="Phantom Checkbox Ctrl"
- tool_tip="Faz com que o objeto não colida com outros objetos ou avatares" />
+ <check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
+ <check_box label="Física" name="Physical Checkbox Ctrl" tool_tip="Permite que os objetos sejam empurrados sofram efeito da gravidade"/>
+ <check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado."/>
+ <check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Faz com que o objeto não colida com outros objetos ou avatares"/>
<text name="label position">
Posição (metros)
</text>
- <spinner label="X" name="Pos X" />
- <spinner label="Y" name="Pos Y" />
- <spinner label="Z" name="Pos Z" />
+ <spinner label="X" name="Pos X"/>
+ <spinner label="Y" name="Pos Y"/>
+ <spinner label="Z" name="Pos Z"/>
<text name="label size">
Tamanho (metros)
</text>
- <spinner label="X" name="Scale X" />
- <spinner label="Y" name="Scale Y" />
- <spinner label="Z" name="Scale Z" />
+ <spinner label="X" name="Scale X"/>
+ <spinner label="Y" name="Scale Y"/>
+ <spinner label="Z" name="Scale Z"/>
<text name="label rotation">
Rotação (graus)
</text>
- <spinner label="X" name="Rot X" />
- <spinner label="Y" name="Rot Y" />
- <spinner label="Z" name="Rot Z" />
+ <spinner label="X" name="Rot X"/>
+ <spinner label="Y" name="Rot Y"/>
+ <spinner label="Z" name="Rot Z"/>
<text name="label material">
Material
</text>
@@ -310,8 +313,8 @@
<text name="text cut">
Recorte inicial e final
</text>
- <spinner label="B" name="cut begin" />
- <spinner label="E" name="cut end" />
+ <spinner label="B" name="cut begin"/>
+ <spinner label="E" name="cut end"/>
<text name="text hollow">
Vazio
</text>
@@ -338,42 +341,63 @@
<text name="text twist">
Torcer no Inicio e final
</text>
- <spinner label="B" name="Twist Begin" />
- <spinner label="E" name="Twist End" />
+ <spinner label="B" name="Twist Begin"/>
+ <spinner label="E" name="Twist End"/>
<text name="scale_taper">
Afinar
</text>
<text name="scale_hole">
Tamanho do Buraco
</text>
- <spinner label="X" name="Taper Scale X" />
- <spinner label="Y" name="Taper Scale Y" />
+ <spinner label="X" name="Taper Scale X"/>
+ <spinner label="Y" name="Taper Scale Y"/>
<text name="text topshear">
Inclinar
</text>
- <spinner label="X" name="Shear X" />
- <spinner label="Y" name="Shear Y" />
+ <spinner label="X" name="Shear X"/>
+ <spinner label="Y" name="Shear Y"/>
<text name="advanced_cut">
Perfil Recortado no Início e Final
</text>
<text name="advanced_dimple">
Cova Inicio e Final
</text>
- <spinner label="B" name="Path Limit Begin" />
- <spinner label="E" name="Path Limit End" />
+ <spinner label="B" name="Path Limit Begin"/>
+ <spinner label="E" name="Path Limit End"/>
<text name="text taper2">
Afinar
</text>
- <spinner label="X" name="Taper X" />
- <spinner label="Y" name="Taper Y" />
+ <spinner label="X" name="Taper X"/>
+ <spinner label="Y" name="Taper Y"/>
<text name="text radius delta">
- Radius Delta
+ Raio
</text>
<text name="text revolutions">
Revoluções
</text>
- <texture_picker label="Sculpt Texture" name="sculpt texture control"
- tool_tip="Click to choose a picture" />
+ <texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="Click to choose a picture"/>
+ <check_box label="Espelho" name="sculpt mirror control" tool_tip="Inverter a primitiva esculpida ao longo do eixo X."/>
+ <check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverte as normais das primitivas esculpidas, fazendo-as parecer de dentro para fora."/>
+ <text name="label sculpt type">
+ Tipo costura
+ </text>
+ <combo_box name="sculpt type control">
+ <combo_item name="None">
+ (nenhum)
+ </combo_item>
+ <combo_item name="Sphere">
+ Esfera
+ </combo_item>
+ <combo_item name="Torus">
+ Toróide
+ </combo_item>
+ <combo_item name="Plane">
+ Plano
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cilindro
+ </combo_item>
+ </combo_box>
</panel>
<panel label="Recursos" name="Features">
<text name="select_single">
@@ -382,34 +406,34 @@
<text name="edit_object">
Editar recursos do Objeto:
</text>
- <check_box label="Flexíbilidade" name="Flexible1D Checkbox Ctrl"
- tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)" />
- <spinner label="Suavidade" name="FlexNumSections" />
- <spinner label="Gravidade" name="FlexGravity" />
- <spinner label="Arrastar" name="FlexFriction" />
- <spinner label="Vento" name="FlexWind" />
- <spinner label="Tensão" name="FlexTension" />
- <spinner label="Força X" name="FlexForceX" />
- <spinner label="Força Y" name="FlexForceY" />
- <spinner label="Força Z" name="FlexForceZ" />
- <check_box label="Luz" name="Light Checkbox Ctrl"
- tool_tip="Faz com que o objeto emita luz" />
+ <check_box label="Flexíbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)"/>
+ <spinner label="Suavidade" name="FlexNumSections"/>
+ <spinner label="Gravidade" name="FlexGravity"/>
+ <spinner label="Arrastar" name="FlexFriction"/>
+ <spinner label="Vento" name="FlexWind"/>
+ <spinner label="Tensão" name="FlexTension"/>
+ <spinner label="Força X" name="FlexForceX"/>
+ <spinner label="Força Y" name="FlexForceY"/>
+ <spinner label="Força Z" name="FlexForceZ"/>
+ <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Faz com que o objeto emita luz"/>
<text name="label color">
Cor
</text>
- <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o seletor de Cores" />
- <spinner label="Intensidade" name="Light Intensity" />
- <spinner label="Radius" name="Light Radius" />
- <spinner label="Queda" name="Light Falloff" />
+ <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o seletor de Cores"/>
+ <spinner label="Intensidade" name="Light Intensity"/>
+ <spinner label="Radius" name="Light Radius"/>
+ <spinner label="Queda" name="Light Falloff"/>
</panel>
<panel label="Textura" name="Texture">
- <texture_picker label="Textura" name="texture control"
- tool_tip="Clique para escolher uma imagem" />
- <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o seletor de cores" />
+ <texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o seletor de cores"/>
<text name="color trans">
Transparência %
</text>
- <check_box label="Claridade" name="checkbox fullbright" />
+ <text name="glow label">
+ Brilho
+ </text>
+ <check_box label="Claridade" name="checkbox fullbright"/>
<text name="tex gen">
Mapeamento
</text>
@@ -500,35 +524,35 @@
<text name="tex scale">
Repetir por Face
</text>
- <spinner label="Horizontal (U)" name="TexScaleU" />
- <check_box label="Flip" name="checkbox flip s" />
- <spinner label="Vertical (V)" name="TexScaleV" />
- <check_box label="Flip" name="checkbox flip t" />
+ <spinner label="Horizontal (U)" name="TexScaleU"/>
+ <check_box label="Flip" name="checkbox flip s"/>
+ <spinner label="Vertical (V)" name="TexScaleV"/>
+ <check_box label="Flip" name="checkbox flip t"/>
<text name="tex rotate">
Rotação (graus)
</text>
- <text name="string repeats per meter">
+ <string name="string repeats per meter">
Repetir por Metro
- </text>
- <text name="string repeats per face">
+ </string>
+ <string name="string repeats per face">
Repetir por Face
- </text>
+ </string>
<text name="rpt">
Repetir por Metro
</text>
- <button label="Aplicar" label_selected="Aplicar" name="button apply" />
+ <button label="Aplicar" label_selected="Aplicar" name="button apply"/>
<text name="tex offset">
Offset
</text>
- <spinner label="Horizontal (U)" name="TexOffsetU" />
- <spinner label="Vertical (V)" name="TexOffsetV" />
+ <spinner label="Horizontal (U)" name="TexOffsetU"/>
+ <spinner label="Vertical (V)" name="TexOffsetV"/>
<text name="textbox autofix">
Alinhar Texturas (precisa ser carregada primeiro)
</text>
- <button label="Alinhar" label_selected="Alinhar" name="button align" />
+ <button label="Alinhar" label_selected="Alinhar" name="button align"/>
</panel>
<panel label="Conteúdo" name="Contents">
- <button label="Novo Script..." label_selected="Novo Script..." name="button new script" />
+ <button label="Novo Script..." label_selected="Novo Script..." name="button new script"/>
</panel>
</tab_container>
<panel name="land info panel">
@@ -538,14 +562,49 @@
<text name="label_area">
Área: [AREA] m2.
</text>
- <button label="Comprar Terra..." label_selected="Comprar Terra.."
- name="button buy land" />
- <button label="Abandonar Terra..." label_selected="Abandonar Terra..."
- name="button abandon land" />
- <button label="Sub-Dividir..." label_selected="Subdivide..."
- name="button subdivide land" />
- <button label="Unir..." label_selected="Unir..." name="button join land" />
- <button label="Sobre a Terra..." label_selected="Sobre a Terra..."
- name="button about land" />
+ <button label="Comprar Terra..." label_selected="Comprar Terra.." name="button buy land"/>
+ <button label="Abandonar Terra..." label_selected="Abandonar Terra..." name="button abandon land"/>
+ <button label="Sub-Dividir..." label_selected="Subdivide..." name="button subdivide land"/>
+ <button label="Unir..." label_selected="Unir..." name="button join land"/>
+ <button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
</panel>
+ <string name="status_rotate">
+ Arrastar as bandas coloridas para girar o objeto
+ </string>
+ <string name="status_scale">
+ Clicar e arrastar para esticar o lado selecionado
+ </string>
+ <string name="status_move">
+ Arrastar para mover, Shift-arrastar para copiar
+ </string>
+ <string name="status_modifyland">
+ Clicar e reter para modificar a terra
+ </string>
+ <string name="status_camera">
+ Clicar e arrastar para mudar a vista
+ </string>
+ <string name="status_grab">
+ Arrastar para mover objetos, Ctrl para levantar, Ctrl-Shift para girar
+ </string>
+ <string name="status_place">
+ Clicar no mundo para criar, shift-clicar para selecionar
+ </string>
+ <string name="status_selectland">
+ Clicar e arrastar para selecionar a terra.
+ </string>
+ <string name="grid_screen_text">
+ Tela
+ </string>
+ <string name="grid_local_text">
+ Local
+ </string>
+ <string name="grid_world_text">
+ Mundo
+ </string>
+ <string name="grid_reference_text">
+ Referência
+ </string>
+ <string name="grid_attachment_text">
+ Anexo
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 6da86f5..70f6b4b 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="top_objects" title="Carregando...">
<text name="title_text">
Carregando...
</text>
<scroll_list name="objects_list">
- <column label="Placar" name="score" />
- <column label="Nome" name="name" />
- <column label="Proprietário" name="owner" />
- <column label="Local" name="location" />
+ <column label="Placar" name="score"/>
+ <column label="Nome" name="name"/>
+ <column label="Proprietário" name="owner"/>
+ <column label="Local" name="location"/>
+ <column label="Tempo" name="time"/>
</scroll_list>
<text name="id_text">
ID do Objeto:
</text>
- <button label="Mostrar Avisos" name="show_beacon_btn" />
+ <button label="Mostrar Avisos" name="show_beacon_btn"/>
<text name="obj_name_text">
Nome do Objeto:
</text>
- <button label="Filtro" name="filter_object_btn" />
+ <button label="Filtro" name="filter_object_btn"/>
<text name="owner_name_text">
Nome do Proprietário:
</text>
- <button label="Filtro" name="filter_owner_btn" />
- <button label="Retornar Selecionado" name="return_selected_btn" />
- <button label="Retornar Tudo" name="return_all_btn" />
- <button label="Desabilitar Selecionado" name="disable_selected_btn" />
- <button label="Desabilitar Tudo" name="disable_all_btn" />
- <button label="Atualizar" name="refresh_btn" />
- <text name="top_scripts_title">
+ <button label="Filtro" name="filter_owner_btn"/>
+ <button label="Retornar Selecionado" name="return_selected_btn"/>
+ <button label="Retornar Tudo" name="return_all_btn"/>
+ <button label="Desabilitar Selecionado" name="disable_selected_btn"/>
+ <button label="Desabilitar Tudo" name="disable_all_btn"/>
+ <button label="Atualizar" name="refresh_btn"/>
+ <string name="top_scripts_title">
Top Scripts
- </text>
- <text name="top_scripts_text">
+ </string>
+ <string name="top_scripts_text">
[COUNT] scripts tomando um total de [TIME] ms
- </text>
- <text name="scripts_score_label">
+ </string>
+ <string name="scripts_score_label">
Tempo
- </text>
- <text name="top_colliders_title">
+ </string>
+ <string name="top_colliders_title">
Top Colisões
- </text>
- <text name="top_colliders_text">
+ </string>
+ <string name="top_colliders_text">
Top [COUNT] objetos experimentando muitas colisções em potencial
- </text>
- <text name="colliders_score_label">
+ </string>
+ <string name="colliders_score_label">
Placar
- </text>
- <text name="none_descriptor">
+ </string>
+ <string name="none_descriptor">
Nenhum encotrado.
- </text>
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index 5e4e819..3c77bc8 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="modal container" title=" ">
- <button label="Continuar" label_selected="Continuar" name="Continue" />
- <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
- <radio_group name="tos_agreement">
- <radio_item name="radio_disagree">
- Eu não concordo com os Termos de Serviço
- </radio_item>
- <radio_item name="radio_agree">
- Eu concordo com os Termos de Serviço
- </radio_item>
- </radio_group>
- <text name="tos_title">
- Contrato dos Termos de Serviço
- </text>
+ <button label="Continuar" label_selected="Continuar" name="Continue"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
<text name="tos_heading">
Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando Second Life, você precisa aceitar o acordo.
</text>
<text_editor name="tos_text">
TOS_TEXT
</text_editor>
+ <string name="real_url">
+ http://secondlife.com/app/tos/
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
new file mode 100644
index 0000000..5a18297
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="url_entry" title="">
+ <text name="media_label">
+ Media URL:
+ </text>
+ <button label="OK" name="ok_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Limpar" name="clear_btn"/>
+ <text name="loading_label">
+ Carregando..
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
new file mode 100644
index 0000000..d6f261f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Water Floater" title="Editor de Água Avançado">
+ <text name="KeyFramePresetsText">
+ Pré-configurações da Água:
+ </text>
+ <button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
+ <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
+ <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
+ <tab_container name="Water Tabs">
+ <panel label="Configurações" name="Settings">
+ <text name="BHText">
+ Cor da névoa da Água
+ </text>
+ <button label="?" name="WaterFogColorHelp"/>
+ <color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/>
+ <text name="WaterFogDensText">
+ Expoente da Densidade de névoa
+ </text>
+ <button label="?" name="WaterFogDensityHelp"/>
+ <text name="WaterUnderWaterFogModText">
+ Modificador da névoa Subaquática
+ </text>
+ <button label="?" name="WaterUnderWaterFogModHelp"/>
+ <text name="BDensText">
+ Escala da Marola de Reflexão
+ </text>
+ <button label="?" name="WaterNormalScaleHelp"/>
+ <text name="BHText2">
+ 1
+ </text>
+ <text name="BHText3">
+ 2
+ </text>
+ <text name="BHText4">
+ 3
+ </text>
+ <text name="HDText">
+ Escala de Fresnel
+ </text>
+ <button label="?" name="WaterFresnelScaleHelp"/>
+ <text name="FresnelOffsetText">
+ Deslocamento de Fresnel
+ </text>
+ <button label="?" name="WaterFresnelOffsetHelp"/>
+ <text name="DensMultText">
+ Refratar a Escala para Cima
+ </text>
+ <button label="?" name="WaterScaleAboveHelp"/>
+ <text name="WaterScaleBelowText">
+ Refratar a Escala para Baixo
+ </text>
+ <button label="?" name="WaterScaleBelowHelp"/>
+ <text name="MaxAltText">
+ Multiplicador de Difusão
+ </text>
+ <button label="?" name="WaterBlurMultiplierHelp"/>
+ </panel>
+ <panel label="Imagem" name="Waves">
+ <text name="BHText">
+ Direção da Onda Maior
+ </text>
+ <button label="?" name="WaterWave1Help"/>
+ <text name="WaterWave1DirXText">
+ X
+ </text>
+ <text name="WaterWave1DirYText">
+ Y
+ </text>
+ <text name="BHText2">
+ Direção da Onda Pequena
+ </text>
+ <button label="?" name="WaterWave2Help"/>
+ <text name="WaterWave2DirXText">
+ X
+ </text>
+ <text name="WaterWave2DirYText">
+ Y
+ </text>
+ <text name="BHText3">
+ Mapa Normal
+ </text>
+ <button label="?" name="WaterNormalMapHelp"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
new file mode 100644
index 0000000..2c15bc5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="WindLight floater" title="Editor de Céu Avançado">
+ <text name="KeyFramePresetsText">
+ Pré-definições de Céu:
+ </text>
+ <button label="Novo" label_selected="Novo" name="WLNewPreset"/>
+ <button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
+ <button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
+ <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton"/>
+ <tab_container name="WindLight Tabs">
+ <panel label="Atmosfera" name="Atmosphere">
+ <text name="BHText">
+ Horizonte Azul
+ </text>
+ <button label="?" name="WLBlueHorizonHelp"/>
+ <text name="BHText2">
+ R
+ </text>
+ <text name="BHText3">
+ G
+ </text>
+ <text name="BHText4">
+ B
+ </text>
+ <text name="BHText5">
+ I
+ </text>
+ <text name="BDensText">
+ Horizonte da Neblina
+ </text>
+ <button label="?" name="WLHazeHorizonHelp"/>
+ <text name="BDensText2">
+ Densidade de Azul
+ </text>
+ <button label="?" name="WLBlueDensityHelp"/>
+ <text name="BHText6">
+ R
+ </text>
+ <text name="BHText7">
+ G
+ </text>
+ <text name="BHText8">
+ B
+ </text>
+ <text name="BHText9">
+ I
+ </text>
+ <text name="HDText">
+ Densidade da Neblina
+ </text>
+ <button label="?" name="WLHazeDensityHelp"/>
+ <text name="DensMultText">
+ Multiplicador de Densidade
+ </text>
+ <button label="?" name="WLDensityMultHelp"/>
+ <text name="WLDistanceMultText">
+ Multiplicador de Distância
+ </text>
+ <button label="?" name="WLDistanceMultHelp"/>
+ <text name="MaxAltText">
+ Altitude Máxima
+ </text>
+ <button label="?" name="WLMaxAltitudeHelp"/>
+ </panel>
+ <panel label="Iluminação" name="Lighting">
+ <text name="SLCText">
+ Cor do Sol/Lua
+ </text>
+ <button label="?" name="WLSunlightColorHelp"/>
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="TODText">
+ Posição do Sol/Lua
+ </text>
+ <button label="?" name="WLTimeOfDayHelp"/>
+ <text name="WLAmbientText">
+ Ambiente
+ </text>
+ <button label="?" name="WLAmbientHelp"/>
+ <text name="BHText5">
+ R
+ </text>
+ <text name="BHText6">
+ G
+ </text>
+ <text name="BHText7">
+ B
+ </text>
+ <text name="BHText8">
+ I
+ </text>
+ <text name="WLEastAngleText">
+ Angulo Leste
+ </text>
+ <button label="?" name="WLEastAngleHelp"/>
+ <text name="SunGlowText">
+ Brilho do Sol
+ </text>
+ <button label="?" name="WLSunGlowHelp"/>
+ <slider label="Foco" name="WLGlowB"/>
+ <slider label="Tamanho" name="WLGlowR"/>
+ <text name="SceneGammaText">
+ Gamma da Cena
+ </text>
+ <button label="?" name="WLSceneGammaHelp"/>
+ <text name="WLStarText">
+ Brilho da Estrêla
+ </text>
+ <button label="?" name="WLStarBrightnessHelp"/>
+ </panel>
+ <panel label="Nuvens" name="Clouds">
+ <text name="WLCloudColorText">
+ Cor da Nuvem
+ </text>
+ <button label="?" name="WLCloudColorHelp"/>
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="WLCloudColorText2">
+ Densidade/ XY da Nuvem
+ </text>
+ <button label="?" name="WLCloudDensityHelp"/>
+ <text name="BHText5">
+ X
+ </text>
+ <text name="BHText6">
+ Y
+ </text>
+ <text name="BHText7">
+ D
+ </text>
+ <text name="WLCloudCoverageText">
+ Cobertura da Nuvem
+ </text>
+ <button label="?" name="WLCloudCoverageHelp"/>
+ <text name="WLCloudScaleText">
+ Escala da Nuvem
+ </text>
+ <button label="?" name="WLCloudScaleHelp"/>
+ <text name="WLCloudDetailText">
+ Detalhe da Nuvem (XY/Densidade)
+ </text>
+ <button label="?" name="WLCloudDetailHelp"/>
+ <text name="BHText8">
+ X
+ </text>
+ <text name="BHText9">
+ Y
+ </text>
+ <text name="BHText10">
+ D
+ </text>
+ <text name="WLCloudScrollXText">
+ Rolagem X da Nuvem
+ </text>
+ <button label="?" name="WLCloudScrollXHelp"/>
+ <check_box label="Travar" name="WLCloudLockX"/>
+ <text name="WLCloudScrollYText">
+ Rolagem Y da Nuvem
+ </text>
+ <button label="?" name="WLCloudScrollYHelp"/>
+ <check_box label="Travar" name="WLCloudLockY"/>
+ <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
+ <button label="?" name="WLClassicCloudsHelp"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 5501c81..493dce3 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -50,15 +50,14 @@
Eventos (M)
</text>
<check_box label=" " name="event_mature_chk" />
- <combo_box label="Meus Amigos" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
+ <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
<combo_item name="none_selected">
- Meus Amigos
+ Amigos Conectados
</combo_item>
</combo_box>
- <combo_box label="Minhas Landmarks" name="landmark combo"
- tool_tip="Landmark para mostrar no Mapa">
+ <combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa">
<combo_item name="none_selected">
- Minhas Landmarks
+ Landmarks
</combo_item>
</combo_box>
<line_editor label="Procurar por nome de região" name="location"
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 0c9bc77..45ed66d 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -29,7 +29,7 @@
<menu_item_call label="Novo cabelo" name="New Hair" />
<menu_item_call label="Novos olhos" name="New Eyes" />
</menu>
- <menu_item_call label="Abrir" name="Landmark Open" />
+ <menu_item_call label="Teletransporte" name="Landmark Open"/>
<menu_item_call label="Abrir" name="Animation Open" />
<menu_item_call label="Abrir" name="Sound Open" />
<menu_item_call label="Remover item." name="Purge Item" />
@@ -48,7 +48,7 @@
<menu_item_call label="Contatos IM Online na pasta." name="IM Online Contacts In Folder" />
<menu_item_call label="Todos contantos MI na pasta." name="IM All Contacts In Folder" />
<menu_item_call label="Executar" name="Sound Play" />
- <menu_item_call label="Teleportar para Landmark" name="Teleport To Landmark" />
+ <menu_item_call label="Sobre as Landmarks" name="Teleport To Landmark"/>
<menu_item_call label="Executar in World" name="Animation Play" />
<menu_item_call label="Executar localmente." name="Animation Audition" />
<menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message" />
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
new file mode 100644
index 0000000..3aeb748
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Login Menu">
+ <menu label="Arquivo" name="File">
+ <menu_item_call label="Sair" name="Quit"/>
+ </menu>
+ <menu label="Editar" name="Edit">
+ <menu_item_call label="Preferências..." name="Preferences..."/>
+ </menu>
+ <menu label="Ajuda" name="Help">
+ <menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
+ <menu_item_call label="Sobre o Second Life..." name="About Second Life..."/>
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml b/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
index b2ff482..3d34eeb 100644
--- a/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<pie_menu name="Avatar Pie">
- <menu_item_call label="Perfil.." name="Profile..." />
- <menu_item_call label="Mudo" name="Avatar Mute" />
- <menu_item_call label="Ir para" name="Go To" />
- <menu_item_call label="Taxa" name="Rate" />
- <menu_item_call label="Adicionar Amigo" name="Add Friend" />
- <menu_item_call label="Pagar..." name="Pay..." />
+ <menu_item_call label="Perfil.." name="Profile..."/>
+ <menu_item_call label="Mudo" name="Avatar Mute"/>
+ <menu_item_call label="Ir para" name="Go To"/>
+ <menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+ <menu_item_call label="Pagar..." name="Pay..."/>
<pie_menu label="Mais >" name="More >">
- <menu_item_call label="Paralizar..." name="Freeze..." />
- <menu_item_call label="Dar Cartão" name="Give Card" />
- <menu_item_call label="Ejetar..." name="Eject..." />
- <menu_item_call label="Debug..." name="Debug..." />
- <menu_item_call label="Inspecionar" name="Object Inspect" />
+ <menu_item_call label="Paralizar..." name="Freeze..."/>
+ <menu_item_call label="Dar Cartão" name="Give Card"/>
+ <menu_item_call label="Convidar para o Grupo..." name="Invite..."/>
+ <menu_item_call label="Ejetar..." name="Eject..."/>
+ <menu_item_call label="Debug..." name="Debug..."/>
+ <menu_item_call label="Inspecionar" name="Object Inspect"/>
</pie_menu>
- <menu_item_call label="Enviar Mi..." name="Send IM..." />
+ <menu_item_call label="Enviar Mi..." name="Send IM..."/>
</pie_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml
new file mode 100644
index 0000000..e18e776
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_slurl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+ <menu_item_call label="Sobre a URL" name="about_url"/>
+ <menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/>
+ <menu_item_call label="Mostrar no Mapa" name="show_on_map"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 46d279e..56195b5 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -1,197 +1,201 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu_bar name="Main Menu">
<menu label="Arquivo" name="File">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image" />
- <menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound" />
- <menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation" />
- <menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Fechar janela" name="Close Window" />
- <menu_item_call label="Fechar todas as janelas" name="Close All Windows" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Salvar textura como" name="Save Texture As..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Tirar Foto" name="Take Snapshot" />
- <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu label="Ajustar o tamanho da janela" name="Set Window Size">
- <menu_item_call label="320x240" name="320x240" />
- <menu_item_call label="640x480" name="640x480" />
- <menu_item_call label="800x600" name="800x600" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
- <menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
- </menu>
- <menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="Sair" name="Quit" />
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image"/>
+ <menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound"/>
+ <menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation"/>
+ <menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Fechar janela" name="Close Window"/>
+ <menu_item_call label="Fechar todas as janelas" name="Close All Windows"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Salvar textura como" name="Save Texture As..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Tirar Foto" name="Take Snapshot"/>
+ <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Sair" name="Quit"/>
</menu>
<menu label="Editar" name="Edit">
- <menu_item_call label="Voltar" name="Undo" />
- <menu_item_call label="Avançar" name="Redo" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Cortar" name="Cut" />
- <menu_item_call label="Copiar" name="Copy" />
- <menu_item_call label="Pasta" name="Paste" />
- <menu_item_call label="Apagar" name="Delete" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Procurar..." name="Search..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Selecionar todos" name="Select All" />
- <menu_item_call label="Retirar seleção" name="Deselect" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="Duplicar" name="Duplicate" />
- <menu_item_separator label="-----------" name="separator5" />
- <menu label="Anexar objeto" name="Attach Object" />
- <menu label="Desanexar objeto" name="Detach Object" />
+ <menu_item_call label="Voltar" name="Undo"/>
+ <menu_item_call label="Avançar" name="Redo"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Cortar" name="Cut"/>
+ <menu_item_call label="Copiar" name="Copy"/>
+ <menu_item_call label="Pasta" name="Paste"/>
+ <menu_item_call label="Apagar" name="Delete"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Procurar..." name="Search..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Selecionar todos" name="Select All"/>
+ <menu_item_call label="Retirar seleção" name="Deselect"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Duplicar" name="Duplicate"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu label="Anexar objeto" name="Attach Object"/>
+ <menu label="Desanexar objeto" name="Detach Object"/>
<menu label="Tirar a roupa" name="Take Off Clothing">
- <menu_item_call label="Camiseta" name="Shirt" />
- <menu_item_call label="Calças" name="Pants" />
- <menu_item_call label="Sapatos" name="Shoes" />
- <menu_item_call label="Meias" name="Socks" />
- <menu_item_call label="Blusa" name="Jacket" />
- <menu_item_call label="Luvas" name="Gloves" />
- <menu_item_call label="Anágua" name="Menu Undershirt" />
- <menu_item_call label="Roupa de baixo" name="Menu Underpants" />
- <menu_item_call label="saia" name="Skirt" />
- <menu_item_call label="Toda a roupa" name="All Clothes" />
+ <menu_item_call label="Camiseta" name="Shirt"/>
+ <menu_item_call label="Calças" name="Pants"/>
+ <menu_item_call label="Sapatos" name="Shoes"/>
+ <menu_item_call label="Meias" name="Socks"/>
+ <menu_item_call label="Blusa" name="Jacket"/>
+ <menu_item_call label="Luvas" name="Gloves"/>
+ <menu_item_call label="Anágua" name="Menu Undershirt"/>
+ <menu_item_call label="Roupa de baixo" name="Menu Underpants"/>
+ <menu_item_call label="saia" name="Skirt"/>
+ <menu_item_call label="Toda a roupa" name="All Clothes"/>
</menu>
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Movimentos..." name="Gestures..." />
- <menu_item_call label="Perfil..." name="Profile..." />
- <menu_item_call label="Aparência..." name="Appearance..." />
- <menu_item_separator label="-----------" name="separator7" />
- <menu_item_check label="Amigos..." name="Friends..." />
- <menu_item_call label="Grupos..." name="Groups..." />
- <menu_item_separator label="-----------" name="separator8" />
- <menu_item_call label="Preferências..." name="Preferences..." />
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Movimentos..." name="Gestures..."/>
+ <menu_item_call label="Perfil..." name="Profile..."/>
+ <menu_item_call label="Aparência..." name="Appearance..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_check label="Amigos..." name="Friends..."/>
+ <menu_item_call label="Grupos..." name="Groups..."/>
+ <menu_item_separator label="-----------" name="separator8"/>
+ <menu_item_call label="Preferências..." name="Preferences..."/>
</menu>
<menu label="Exibir" name="View">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_call label="Visão do mouse" name="Mouselook" />
- <menu_item_check label="Construção" name="Build" />
- <menu_item_call label="Resetar visão" name="Reset View" />
- <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Barra de ferramentas" name="Toolbar" />
- <menu_item_check label="Histórico de chat" name="Chat History" />
- <menu_item_check label="Mensagem instantânea" name="Instant Message" />
- <menu_item_call label="Inventário" name="Inventory" />
- <menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_check label="Controle de câmeras" name="Camera Controls" />
- <menu_item_check label="Controle de movimentos" name="Movement Controls" />
- <menu_item_check label="Mapa do mundo" name="World Map" />
- <menu_item_check label="Mini-Mapa" name="Mini-Map" />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_check label="Barra de estatísticas" name="Statistics Bar" />
- <menu_item_check label="Linhas de propriedades" name="Property Lines" />
- <menu_item_check label="Dono de terrenos" name="Land Owners" />
- <menu_item_separator label="-----------" name="separator4" />
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Visão do mouse" name="Mouselook"/>
+ <menu_item_check label="Construção" name="Build"/>
+ <menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
+ <menu_item_call label="Resetar visão" name="Reset View"/>
+ <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Barra de ferramentas" name="Toolbar"/>
+ <menu_item_check label="Conversa local" name="Chat History"/>
+ <menu_item_check label="Comunicar" name="Instant Message"/>
+ <menu_item_check label="Inventário" name="Inventory"/>
+ <menu_item_check label="Microfone ativo" name="Active Speakers"/>
+ <menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Controle de câmeras" name="Camera Controls"/>
+ <menu_item_check label="Controle de movimentos" name="Movement Controls"/>
+ <menu_item_check label="Mapa do mundo" name="World Map"/>
+ <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>
+ <menu_item_check label="Linhas de propriedades" name="Property Lines"/>
+ <menu_item_check label="Dono de terrenos" name="Land Owners"/>
+ <menu_item_separator label="-----------" name="separator4"/>
<menu label="Dicas" name="Hover Tips">
- <menu_item_check label="Mostrar dicas" name="Show Tips" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Dicas de terreno" name="Land Tips" />
- <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects" />
- </menu>
- <menu_item_check label="Mostrar tamanho fisíco" name="Alt Shows Physical" />
- <menu_item_check label="Luz para transparência" name="Highlight Transparent" />
- <menu label="Piscar" name="Beacons">
- <menu_item_check label="Objetos com scripts" name="Scripted Objects" />
- <menu_item_check label="Objetos fisícos" name="Physical Objects" />
- <menu_item_check label="Recursos de som" name="Sound Sources" />
- <menu_item_check label="Recursos" name="Particle Sources" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Partículas escondidas" name="Hide Particles" />
+ <menu_item_check label="Mostrar dicas" name="Show Tips"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Dicas de terreno" name="Land Tips"/>
+ <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects"/>
</menu>
- <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments" />
- <menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="Mais zoom" name="Zoom In" />
- <menu_item_call label="Zoom padrão" name="Zoom Default" />
- <menu_item_call label="Menos zoom" name="Zoom Out" />
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Tela cheia" name="Toggle Fullscreen" />
- <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default" />
+ <menu_item_check label="Luz para transparência" name="Highlight Transparent"/>
+ <menu_item_check label="Balizas" name="beacons"/>
+ <menu_item_check label="Esconder partículas" name="Hide Particles"/>
+ <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Mais zoom" name="Zoom In"/>
+ <menu_item_call label="Zoom padrão" name="Zoom Default"/>
+ <menu_item_call label="Menos zoom" name="Zoom Out"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Tela cheia" name="Toggle Fullscreen"/>
+ <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default"/>
</menu>
<menu label="Mundo" name="World">
- <menu_item_call label="Conversa" name="Chat" />
- <menu_item_call label="Iniciar movimento" name="Start Gesture" />
- <menu_item_check label="Sempre Correr" name="Always Run" />
- <menu_item_check label="Voar" name="Fly" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here" />
- <menu_item_call label="Marcar como casa " name="Set Home to Here" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Teleportar para casa" name="Teleport Home" />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Deixar ausente" name="Set Away" />
- <menu_item_call label="Modo Ocupado" name="Set Busy" />
- <menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="Meu terreno..." name="My Land..." />
- <menu_item_call label="Sobre terreno..." name="About Land..." />
- <menu_item_call label="Comprar terreno..." name="Buy Land..." />
- <menu_item_call label="Região/Estado..." name="Region/Estate..." />
- <menu_item_separator label="-----------" name="separator6" />
- <menu label="Forçar o sol" name="Force Sun">
- <menu_item_call label="Amanhecer" name="Sunrise" />
- <menu_item_call label="Meio-dia" name="Noon" />
- <menu_item_call label="Pôr do sol" name="Sunset" />
- <menu_item_call label="Meia noite" name="Midnight" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Reverter para o padrão da região" name="Revert to Region Default" />
+ <menu_item_call label="Conversa" name="Chat"/>
+ <menu_item_check label="Sempre Correr" name="Always Run"/>
+ <menu_item_check label="Voar" name="Fly"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here"/>
+ <menu_item_call label="Marcar como casa " name="Set Home to Here"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Teleportar para casa" name="Teleport Home"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Deixar ausente" name="Set Away"/>
+ <menu_item_call label="Modo Ocupado" name="Set Busy"/>
+ <menu_item_call label="Parar todas as animações" name="Stop All Animations"/>
+ <menu_item_call label="Liberar controles" name="Release Keys"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Histórico de conta..." name="Account History..."/>
+ <menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."/>
+ <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Meu terreno..." name="My Land..."/>
+ <menu_item_call label="Sobre terreno..." name="About Land..."/>
+ <menu_item_call label="Comprar terreno..." name="Buy Land..."/>
+ <menu_item_call label="Região/Estado..." name="Region/Estate..."/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu label="Configurações de ambiente" name="Environment Settings">
+ <menu_item_call label="Amanhecer" name="Sunrise"/>
+ <menu_item_call label="Meio dia" name="Noon"/>
+ <menu_item_call label="Pôr do sol" name="Sunset"/>
+ <menu_item_call label="Meia noite" name="Midnight"/>
+ <menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Editor de ambiente" name="Environment Editor"/>
</menu>
</menu>
<menu label="Ferramentas" name="Tools">
<menu label="Selecionar ferramenta" name="Select Tool">
- <menu_item_call label="Foco" name="Focus" />
- <menu_item_call label="Mover" name="Move" />
- <menu_item_call label="Editar" name="Edit" />
- <menu_item_call label="Criar" name="Create" />
- <menu_item_call label="Terreno" name="Land" />
+ <menu_item_call label="Foco" name="Focus"/>
+ <menu_item_call label="Mover" name="Move"/>
+ <menu_item_call label="Editar" name="Edit"/>
+ <menu_item_call label="Criar" name="Create"/>
+ <menu_item_call label="Terreno" name="Land"/>
</menu>
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects" />
- <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects" />
- <menu_item_check label="Selecionar objetos pelo som" name="Select By Surrounding" />
- <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection" />
- <menu_item_check label="Mostrar luz radiante para solução"
- name="Show Light Radius for Selection" />
- <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_check label="Alinhar a grade" name="Snap to Grid" />
- <menu_item_call label="Alinhar objeto a grade XY" name="Snap Object XY to Grid" />
- <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid" />
- <menu_item_call label="Opções de grade..." name="Grid Options..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Unir" name="Link" />
- <menu_item_call label="Desunir" name="Unlink" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="Parar todas as animações" name="Stop All Animations" />
- <menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="Focus na seleção" name="Focus on Selection" />
- <menu_item_call label="Zoom na Seleção" name="Zoom to Selection" />
- <menu_item_call label="Comprar objetos" name="Menu Object Take" />
- <menu_item_call label="Pegar cópia" name="Take Copy" />
- <menu_item_call label="Salvar objeto direto no meu inventário"
- name="Save Object Back to My Inventory" />
- <menu_item_call label="Salvar todos os objetos" name="Save Object Back to Object Contents" />
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Mostrar scripts defeituosos/Erros de janela"
- name="Show Script Warning/Error Window" />
- <menu_item_call label="Recolocar scripts na seleção" name="Recompile Scripts in Selection" />
- <menu_item_call label="Resetar script selecionado" name="Reset Scripts in Selection" />
- <menu_item_call label="Ajustar scripts para funcionar na seleção"
- name="Set Scripts to Running in Selection" />
- <menu_item_call label="Ajustar scripts para não funcionar na seleção"
- name="Set Scripts to Not Running in Selection" />
- <menu_item_separator label="-----------" name="separator6" />
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects"/>
+ <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects"/>
+ <menu_item_check label="Selecionar objetos pelo som" name="Select By Surrounding"/>
+ <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection"/>
+ <menu_item_check label="Mostrar luz radiante para solução" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Alinhar a grade" name="Snap to Grid"/>
+ <menu_item_call label="Alinhar objeto a grade XY" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid"/>
+ <menu_item_call label="Opções de grade..." name="Grid Options..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Editar partes ligadas" name="Edit Linked Parts"/>
+ <menu_item_call label="Unir" name="Link"/>
+ <menu_item_call label="Desunir" name="Unlink"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Focus na seleção" name="Focus on Selection"/>
+ <menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/>
+ <menu_item_call label="Comprar objetos" name="Menu Object Take"/>
+ <menu_item_call label="Pegar cópia" name="Take Copy"/>
+ <menu_item_call label="Salvar objeto direto no meu inventário" name="Save Object Back to My Inventory"/>
+ <menu_item_call label="Salvar todos os objetos" name="Save Object Back to Object Contents"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Mostrar scripts defeituosos/Erros de janela" name="Show Script Warning/Error Window"/>
+ <menu label="Recolocar scripts na seleção" name="Recompile Scripts in Selection">
+ <menu_item_call label="Mono" name="Mono"/>
+ <menu_item_call label="LSL" name="LSL"/>
+ </menu>
+ <menu_item_call label="Resetar script selecionado" name="Reset Scripts in Selection"/>
+ <menu_item_call label="Ajustar scripts para funcionar na seleção" name="Set Scripts to Running in Selection"/>
+ <menu_item_call label="Ajustar scripts para não funcionar na seleção" name="Set Scripts to Not Running in Selection"/>
</menu>
<menu label="Ajuda" name="Help">
- <menu_item_call label="Ajuda Second Life" name="Second Life Help" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Reportar Abuso..." name="Report Abuse..." />
- <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp; Hits..." />
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Sobre Second Life..." name="About Second Life..." />
+ <menu_item_call label="Ajuda Second Life" name="Second Life Help"/>
+ <menu_item_call label="Tutorial" name="Tutorial"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Blog official da Linden..." name="Official Linden Blog..."/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Portal de Scripts..." name="Scripting Portal..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Reportar Abuso..." name="Report Abuse..."/>
+ <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp; Hits..."/>
+ <menu_item_call label="Medidor de Lag" name="Lag Meter"/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu label="Reportando Bug" name="Bug Reporting">
+ <menu_item_call label="Rastreador público de problemas..." name="Public Issue Tracker..."/>
+ <menu_item_call label="Ajuda do rastreador público de problemas..." name="Publc Issue Tracker Help..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_call label="Reportando Bug 101..." name="Bug Reporing 101..."/>
+ <menu_item_call label="Questões de Segurança..." name="Security Issues..."/>
+ <menu_item_call label="Wiki de QA ..." name="QA Wiki..."/>
+ <menu_item_separator label="-----------" name="separator9"/>
+ <menu_item_call label="Reportar Bug..." name="Report Bug..."/>
+ </menu>
+ <menu_item_call label="Sobre Second Life..." name="About Second Life..."/>
</menu>
</menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
new file mode 100644
index 0000000..de3d958
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/mime_types.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+ <widgetset name="web">
+ <label name="web_label">
+ Conteúdo da Web
+ </label>
+ <tooltip name="web_tooltip">
+ Esta região possui Conteúdo da Web disponível.
+ </tooltip>
+ <playtip name="web_playtip">
+ Exibir Conteúdo da Web
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ Filme
+ </label>
+ <tooltip name="movie_tooltip">
+ Há um filme disponível para se assistir aqui
+ </tooltip>
+ <playtip name="movie_playtip">
+ Iniciar filme
+ </playtip>
+ </widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Sem conteúdo disponível
+ </label>
+ <tooltip name="none_tooltip">
+ Não há mídia disponível aqui.
+ </tooltip>
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ Imagem
+ </label>
+ <tooltip name="image_tooltip">
+ Há uma imagem neste local
+ </tooltip>
+ <playtip name="image_playtip">
+ Ver a imagem disponível deste local.
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ Audio
+ </label>
+ <tooltip name="audio_tooltip">
+ Há um audio neste local
+ </tooltip>
+ <playtip name="audio_playtip">
+ Iniciar audio disponípivel nest local
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ Transmissão em tempo real
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ - Nenhum -
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ - None - Nenhum -
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ Audio
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ Vídeo
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ Imagem
+ </label>
+ </mimetype>
+ <mimetype name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ Filme (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Javascript
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Áudio/Vídeo Ogg
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ Documento PDF
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Documento Postscript
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ Rich Text (RTF)
+ </label>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ Synchronized Multimedia Integration Language (SMIL)
+ </label>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ Página Web (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ </mimetype>
+ <mimetype name="application/x-shockwave-flash">
+ <label name="application/x-shockwave-flash_label">
+ Flash
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ Áudio (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ Áudio (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ Áudio (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ Áudio (WAV)
+ </label>
+ </mimetype>
+ <mimetype name="image/bmp">
+ <label name="image/bmp_label">
+ Imagem (BMP)
+ </label>
+ </mimetype>
+ <mimetype name="image/gif">
+ <label name="image/gif_label">
+ Imagem (GIF)
+ </label>
+ </mimetype>
+ <mimetype name="image/jpeg">
+ <label name="image/jpeg_label">
+ Imagem (JPEG)
+ </label>
+ </mimetype>
+ <mimetype name="image/png">
+ <label name="image/png_label">
+ Imagem (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ Imagem (SVG)
+ </label>
+ </mimetype>
+ <mimetype name="image/tiff">
+ <label name="image/tiff_label">
+ Imagem (TIFF)
+ </label>
+ </mimetype>
+ <mimetype name="text/html">
+ <label name="text/html_label">
+ Página Web
+ </label>
+ </mimetype>
+ <mimetype name="text/plain">
+ <label name="text/plain_label">
+ Texto
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ </mimetype>
+ <mimetype name="video/mpeg">
+ <label name="video/mpeg_label">
+ Filme (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ Filme (MP4)
+ </label>
+ </mimetype>
+ <mimetype name="video/quicktime">
+ <label name="video/quicktime_label">
+ Filme (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ Filme (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ Filme (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ Filme (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/pt/notify.xml b/indra/newview/skins/default/xui/pt/notify.xml
index 13c9975..0768c72 100644
--- a/indra/newview/skins/default/xui/pt/notify.xml
+++ b/indra/newview/skins/default/xui/pt/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<notifications>
<notify name="SystemMessageTip">
<message name="message">
@@ -77,12 +77,13 @@
</notify>
<notify name="GestureMissing">
<message name="message">
- A animação foi perdida.
+ O Gesto [NAME] não se encontra na base de dados
</message>
</notify>
<notify name="UnableToLoadGesture">
<message name="message">
- Impossível fazer o download da imagem. Por favor, tente de novo.
+ Impossível de carregar o gesto [NAME].
+Por favor, tente de novo.
</message>
</notify>
<notify name="InventoryLoaded">
@@ -115,6 +116,11 @@
Permissões insuficientes para visualizar o notecard
</message>
</notify>
+ <notify name="RezItemNoPermissions">
+ <message name="message">
+ Sem permissões suficientes para criar objetos.
+ </message>
+ </notify>
<notify name="UnableToLoadNotecard">
<message name="message">
Impossível carregar o notecard. Por favor, tente novamente.
@@ -155,11 +161,6 @@
Você deve oferecer um chamado a [FIRST] [LAST]
</message>
</notify>
- <notify name="OfferedFriendship">
- <message name="message">
- Você ofereceu um pedido de amizade a [FIRST] [LAST]
- </message>
- </notify>
<notify name="UnableToBuyWhileDownloading">
<message name="message">
Impossível comprar o objeto enquanto ele está sendo carregado. Por favor, tente novamente.
@@ -222,12 +223,14 @@
</notify>
<notify name="TeleportToLandmark">
<message name="message">
- Agora que você alcançou o mainland, você pode teleport a qualquer ponto do mapa. Clicando na opção do inventário na direita de sua tela, e selecione.Dois clicks no lugar escolhido e você será teletransportado para este local.
+ Agora que você chegou à mainland, você pode teletransportar-se para locais como '[NAME]' clicando no botão de Inventário, no canto direito inferior de sua tela, e selecionando a pasta Landmarks.
+Dê um duplo-clique na landmark e clique Teletransportar para viajar para o local desejado.
</message>
</notify>
<notify name="TeleportToPerson">
<message name="message">
- Agora que você alcançou o mainland, você pode contatar os residentes [NAME] .Clique no inventário da direita do sua tela, e dê dois cliques no calling card. Clique sobre sobre o calling card, que aparece a mensagem instantânea.
+ Agora que você chegou à mainland, você pode contatar residentes como '[NAME]' clicando no botão de Inventário, canto direito inferior de sua tela, e selecionando a pasta Cartões de Visita
+Dê um duplo-clique num cartão de visitas e em Mensagem Instantânea e digite sua mensagem
</message>
</notify>
<notify name="CantSelectLandFromMultipleRegions">
@@ -341,7 +344,12 @@
</notify>
<notify name="PushRestricted">
<message name="message">
- Esta terra tem propriedades especificas. Você não pode fazer nenhuma ação grave nela.
+ Esta terra é “Não empurre”. Você não pode empurrar os outros, a não ser que seja o proprietário da terra.
+ </message>
+ </notify>
+ <notify name="NoVoice">
+ <message name="message">
+ O uso de voz está desabilkitado nesta terra.
</message>
</notify>
<notify name="NoBuild">
@@ -437,6 +445,9 @@
<option name="Decline">
Saia
</option>
+ <option name="Info">
+ Informações
+ </option>
</notify>
<notify name="JoinGroupOfficerNoFee">
<message name="message">
@@ -495,7 +506,11 @@
</notify>
<notify name="OfferFriendship">
<message name="message">
- [NAME] está te oferecendo um convite de amizade.
+ [NAME] está lhe oferecendo sua amizade
+
+[MESSAGE]
+
+(Por definição vocês serão capazes de ver um ao outro online)
</message>
<option name="Accept">
Aceitar
@@ -504,6 +519,19 @@
Negar
</option>
</notify>
+ <notify name="OfferFriendshipNoMessage">
+ <message name="message">
+ [NAME] está lhe oferecendo sua amizade.
+
+(Por definição vocês poderão ver se o outro está online.)
+ </message>
+ <option name="Accept">
+ Aceitar
+ </option>
+ <option name="Decline">
+ Recusar
+ </option>
+ </notify>
<notify name="FriendshipAccepted">
<message name="message">
[NAME] aceitou seu convite de amizade.
@@ -548,12 +576,20 @@
</notify>
<notify name="FailedToLoadWearableUnnamed">
<message name="message">
- Falha ao carregar a página [TYPE].Por favor, notifique o vendedor que lhe vendeu este produto
+ Opa!
+Você tentou vestir um/uma [TYPE] que não carregou.
+
+Não se apavore
+Tente novamente em alguns minutes para que tudo se ajeite
</message>
</notify>
<notify name="FailedToLoadWearable">
<message name="message">
- Falha ao carregar [TYPE] nomeado [DESC].Por favor, notifique o vendedor que lhe vendeu os objetos
+ Opa!
+Você tentou vestir um/uma [TYPE] chamado/a [DESC] que não carregou
+
+Não se apavore
+Tente novamente em alguns minutos para que tudo se ajeite.
</message>
</notify>
<notify name="FailedToFindWearableUnnamed">
@@ -631,6 +667,38 @@
<option name="No">
Não
</option>
+ <option name="Mute">
+ Mudo
+ </option>
+ </notify>
+ <notify name="ScriptQuestionCautionChatGranted">
+ <message name="message">
+ '[OBJECTNAME]'Um objeto de '[OWNERNAME]', localizado em[REGIONNAME] a [REGIONPOS], está lhe dando permissão para: [PERMISSIONS].
+ </message>
+ </notify>
+ <notify name="ScriptQuestionCautionChatDenied">
+ <message name="message">
+ '[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], revogou suas permissoes para: [PERMISSIONS].
+ </message>
+ </notify>
+ <notify name="ScriptQuestionCaution">
+ <message name="message">
+ '[OBJECTNAME]', um objeto de '[NAME]', gostaria de:
+
+[QUESTIONS]
+Se você não confia neste objeto ou em seu criador, você deveria negar-lhe o pedido. Para informações adicionais clique no botão Detalhes.
+
+Autorizar este pedido?
+ </message>
+ <option name="Grant">
+ Autorizar
+ </option>
+ <option name="Deny">
+ Negar
+ </option>
+ <option name="Details">
+ Detalhes...
+ </option>
</notify>
<notify name="ScriptDialog">
<message name="message">
@@ -662,7 +730,6 @@
<message name="message">
Você está sentado. Use as setas (or AWSD) para mudar a visão.Clique em 'Stand Up' para levantar.
</message>
- Você foi teleportado
</notify>
<notify name="FirstMap">
<message name="message">
@@ -681,7 +748,9 @@
</notify>
<notify name="FirstTeleport">
<message name="message">
- Você foi teleportado
+ Esta região não permite teletransporte ponto-a-ponto, assim você foi teletransportado para o telehub mais próximo.
+Seu destino está assinalado com um farol.
+Siga a flecha vermelha até o farol, ou clique nela para apagar o farol.
</message>
</notify>
<notify name="FirstOverrideKeys">
@@ -709,9 +778,174 @@
Este objeto tem a propriedade flexível
</message>
</notify>
+ <notify name="FirstDebugMenus">
+ <message name="message">
+ Você ativou o menu Avançado. Este menu contém funcionalidades úteis para desenvolvedores debugarem o Second Life. Para mostrar esse menu no Windows pressione Ctrl-Alt-D. No Mac pressione Cmd-Opt-Shift-D.
+ </message>
+ </notify>
+ <notify name="FirstSculptedPrim">
+ <message name="message">
+ Você está editando um sculpted prim. Sculpted prims requerem uma textura especial para especificar suas formas. Você encontrará exemplos dessas texturas na Biblioteca do Inventário.
+ </message>
+ </notify>
+ <notify name="FirstMedia">
+ <message name="message">
+ Você começou a tocar uma mídia. Mídias podem ser autorizadas a iniciar automaticamente se você assim escolher na janela de Preferências, sob Audio/Vídeo. Atente para o risco de segurança que pode haver ao acessar websites de mídia que você não confia.
+ </message>
+ </notify>
<notify name="MaxListSelectMessage">
<message name="message">
Você pode selecionar este objeto [MAX_SELECT] da lista
</message>
</notify>
+ <notify name="VoiceInviteP2P">
+ <message name="message">
+ [NAME] está lhe convidando para uma conversa com voz.
+Clique Aceitar para atender, ou Recusar para recusar o convite. Clique Mudo para calar quem está chamando
+ </message>
+ <option name="Accept">
+ Aceitar
+ </option>
+ <option name="Decline">
+ Recusar
+ </option>
+ <option name="Mute">
+ Mudo
+ </option>
+ </notify>
+ <notify name="AutoUnmuteByIM">
+ <message name="message">
+ [FIRST] [LAST] recebeu uma Mensagem Instantânea sua e automáticamente não está mais no modo mudo.
+ </message>
+ </notify>
+ <notify name="AutoUnmuteByMoney">
+ <message name="message">
+ [FIRST] [LAST] recebeu pagamento seu e automaticamente não está mais no modo mudo.
+ </message>
+ </notify>
+ <notify name="AutoUnmuteByInventory">
+ <message name="message">
+ [FIRST] [LAST] recebeu inventário seu e automaticamente não está mais mudo.
+ </message>
+ </notify>
+ <notify name="VoiceInviteGroup">
+ <message name="message">
+ [NAME] juntou-se a uma conversa com voz do grupo [GROUP].
+Clique Aceitar para atender, ou Recusar para recusar o convite. Clique Mudo para calar quem está chamando.
+ </message>
+ <option name="Accept">
+ Aceitar
+ </option>
+ <option name="Decline">
+ Recusar
+ </option>
+ <option name="Mute">
+ Mudo
+ </option>
+ </notify>
+ <notify name="VoiceInviteAdHoc">
+ <message name="message">
+ [NAME] juntou-se a uma chamada de Conferência com voz...
+Clique Aceitar para jumtar-se à chamada ou Recusar para recusar o convite. Clique Mudo para calar este usuário.
+ </message>
+ <option name="Accept">
+ Aceitar
+ </option>
+ <option name="Decline">
+ Recusar
+ </option>
+ <option name="Mute">
+ Mudo
+ </option>
+ </notify>
+ <notify name="InviteAdHoc">
+ <message name="message">
+ [NAME] está lhe convidando para uma conversa em conferência...
+ Clique Aceitar para juntar-se à conversa, ouu Recusar para recusar o convite. Clique Mudo para calar este usuário.
+ </message>
+ <option name="Accept">
+ Aceitar
+ </option>
+ <option name="Decline">
+ Recusar
+ </option>
+ <option name="Mute">
+ Mudo
+ </option>
+ </notify>
+ <notify name="VoiceChannelFull">
+ <message name="message">
+ A chamada de voz a qual você está tentando juntar-se, [VOICE_CHANNEL_NAME], atingiu sua máxima capacidade. Favor tentar novamente mais tarde.
+ </message>
+ </notify>
+ <notify name="ProximalVoiceChannelFull">
+ <message name="message">
+ Desculpe-nos. Esta área atingiu seu limite de capacidade para conversas com voz. Favor tentar o usar voz em outra área.
+ </message>
+ </notify>
+ <notify name="VoiceChannelDisconnected">
+ <message name="message">
+ Você foi desconectado de [VOICE_CHANNEL_NAME]. Voce será reconectado agora a Conversa com voz local.
+ </message>
+ </notify>
+ <notify name="VoiceChannelDisconnectedP2P">
+ <message name="message">
+ [VOICE_CHANNEL_NAME] desligou a chamada. Voce será reconectado agora a Conversa com voz local.
+ </message>
+ </notify>
+ <notify name="P2PCallDeclined">
+ <message name="message">
+ [VOICE_CHANNEL_NAME] recusou sua chamada. Voce será reconectado agora a Conversa com voz local.
+ </message>
+ </notify>
+ <notify name="P2PCallNoAnswer">
+ <message name="message">
+ [VOICE_CHANNEL_NAME] não está disponível para aceitar sua chamada. Voce será reconectado agora a Conversa com voz local.
+ </message>
+ </notify>
+ <notify name="VoiceChannelJoinFailed">
+ <message name="message">
+ Falha na conexão com [VOICE_CHANNEL_NAME], tente novamente mais tarde. Voce será reconectado agora a Converda com voz local.
+ </message>
+ </notify>
+ <notify name="VoiceLoginRetry">
+ <message name="message">
+ Estamos criando uma canal de voz para você. Isto pode levar até um minuto.
+ </message>
+ </notify>
+ <notify name="Cannot enter parcel: not a group member">
+ <message name="message">
+ Você não pode entrar nessa terra, você não é membro do grupo autorizado.
+ </message>
+ </notify>
+ <notify name="Cannot enter parcel: banned">
+ <message name="message">
+ Você não pode entrar nessa terra, você foi banido.
+ </message>
+ </notify>
+ <notify name="Cannot enter parcel: not on access list">
+ <message name="message">
+ Você não pode entrar nessa terra, você não está na lista de acesso.
+ </message>
+ </notify>
+ <notify name="VoiceNotAllowed">
+ <message name="message">
+ Você não tem permissão para se conectar à conversa com voz de [VOICE_CHANNEL_NAME].
+ </message>
+ </notify>
+ <notify name="VoiceCallGenericError">
+ <message name="message">
+ Ocorreu um erro enquanto você tentava conectar-se à conversa de voz de [VOICE_CHANNEL_NAME]. Favor tentar novamente mais tarde.
+ </message>
+ </notify>
+ <notify name="ServerVersionChanged">
+ <message name="message">
+ A região que você entrou está rodando uma versão do simulador diferente da sua. Clique aqui para mais detalhes.
+ </message>
+ </notify>
+ <notify name="UnableToOpenCommandURL">
+ <message name="message">
+ A URL que vocÊ clicou não pôde ser aberta no navegador web.
+ </message>
+ </notify>
</notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_audio_device.xml b/indra/newview/skins/default/xui/pt/panel_audio_device.xml
new file mode 100644
index 0000000..9581413
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_audio_device.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="device_settings">
+ <text name="Audio Devices">
+ Dispositivos de Áudio
+ </text>
+ <text name="Input device (microphone):">
+ Dispositivo de entrada (microfone):
+ </text>
+ <text name="Input level:">
+ Nível de Entrada
+ </text>
+ <string name="default_text">
+ Padrão
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar.xml b/indra/newview/skins/default/xui/pt/panel_avatar.xml
index bfa9edb..5b92346 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar.xml
@@ -1,31 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Panel Avatar">
<tab_container name="tab">
<panel label="2nd Life" name="2nd Life">
- <text name="CaptionTextAcctInfo">
+ <string name="CaptionTextAcctInfo">
[ACCTTYPE][PAYMENTINFO]
- </text>
- <text name="AcctTypeResident">
+ </string>
+ <string name="AcctTypeResident">
Residente
- </text>
- <text name="AcctTypeTrial">
+ </string>
+ <string name="AcctTypeTrial">
Teste
- </text>
- <text name="AcctTypeCharterMember">
+ </string>
+ <string name="AcctTypeCharterMember">
Estatuto do membro.
- </text>
- <text name="AcctTypeEmployee">
+ </string>
+ <string name="AcctTypeEmployee">
Contratado da Linden Lab.
- </text>
- <text name="PaymentInfoUsed">
+ </string>
+ <string name="PaymentInfoUsed">
Informações de pagamento utilizado.
- </text>
- <text name="PaymentInfoOnFile">
+ </string>
+ <string name="PaymentInfoOnFile">
Informações de pagamento no arquivo.
- </text>
- <text name="NoPaymentInfoOnFile">
+ </string>
+ <string name="NoPaymentInfoOnFile">
Sem informações de pagamento no arquivo.
- </text>
+ </string>
+ <string name="AgeVerified">
+ Idade Verificada
+ </string>
+ <string name="NotAgeVerified">
+ Idade não Verificada
+ </string>
<text name="Name:">
Nome:
</text>
@@ -38,21 +44,18 @@
<text name="label2">
Conta:
</text>
- <text name="partner_label"
- tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
+ <text name="partner_label" tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
Parceiro:
</text>
- <line_editor name="partner_edit"
- tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
+ <button label="i" label_selected="i" name="partner_info" tool_tip="Clique para abrir o perfil do(a) parceiro(a)"/>
+ <button label="?" label_selected="?" name="partner_help"/>
+ <line_editor name="partner_edit" tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
[FIRST] [LAST]
</line_editor>
<text name="Photo:">
Foto:
</text>
- <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto" />
- <text name="Ratings:">
- Avaliação
- </text>
+ <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto"/>
<text name="Groups:">
Grupos:
</text>
@@ -65,57 +68,52 @@
<text name="Give item:">
Doar item:
</text>
- <text name="Give inventory"
- tool_tip="Arraste e solte o item aqui para da-lo a pessoa desejada.">
+ <text name="Give inventory" tool_tip="Arraste e solte o item aqui para da-lo a pessoa desejada.">
Arraste e solte o item aqui.
</text>
- <check_box label="Publicar na Web." name="allow_publish"
- tool_tip="Publica as informações do seu perfil na web." />
- <button label="?" label_selected="?" name="?" />
- <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" />
- <button label="Oferecer teleporte..." label_selected="Oferecer teleporte..."
- name="Offer Teleport..." />
- <button label="Adicionar amigo..." label_selected="Adicionar amigo..."
- name="Add Friend..." />
- <button label="Pagar..." label_selected="Pagar..." name="Pay..." />
- <button label="Mensagem Instantânea..." label_selected="Mensagem Instantânea..."
- name="Instant Message..." />
- <button label="Silenciar" label_selected="Silenciar" name="Mute" />
+ <check_box label="Mostrar na busca" name="allow_publish" tool_tip="Publicar informações de perfil adicionais, como descrição e imagem, na Busca."/>
+ <button label="?" label_selected="?" name="?"/>
+ <button label="Encontrar no Mapa" label_selected="Encontrar no Mapa" name="Find on Map"/>
+ <button label="Oferecer teleporte..." label_selected="Oferecer teleporte..." name="Offer Teleport..."/>
+ <button label="Adicionar amigo..." label_selected="Adicionar amigo..." name="Add Friend..."/>
+ <button label="Pagar..." label_selected="Pagar..." name="Pay..."/>
+ <button label="Mensagem Instantânea..." label_selected="Mensagem Instantânea..." name="Instant Message..." tool_tip="Mensagem Instantânea (MI)"/>
+ <button label="Silenciar" label_selected="Silenciar" name="Mute"/>
</panel>
<panel label="Web" name="WebProfile">
- <button label="Inicío" label_selected="Home" name="home" />
- <button label="Carregar" label_selected="Carregar" name="load"
- tool_tip="Carrega o seu perfil no seu navegador." />
- <button label="Abrir..." label_selected="Abrir..." name="open"
- tool_tip="Abre essa página no seu navegador externo." />
- <button label="?" label_selected="?" name="web_profile_help" />
- <check_box label="Carregar Perfis da Web" name="auto_load"
- tool_tip="Carrega automaticamente os perfis da Web sem perguntar antes." />
- <text name="status_text">
- Feito.
- </text>
+ <flyout_button label="Carregar" label_selected="Carregar" name="load" tool_tip="Carrega o seu perfil no seu navegador.">
+ <flyout_button_item name="open_item">
+ No navegador externo
+ </flyout_button_item>
+ <flyout_button_item name="home_item">
+ URL de Casa
+ </flyout_button_item>
+ </flyout_button>
+ <button label="?" label_selected="?" name="web_profile_help"/>
+ <check_box label="Carregar Perfis da Web" name="auto_load" tool_tip="Carrega automaticamente os perfis da Web sem perguntar antes."/>
+ <text name="status_text"/>
</panel>
<panel label="Interesses" name="Interests">
<text name="I Want To:">
Eu quero:
</text>
- <check_box label="Construção." name="chk0" />
- <check_box label="Explorar" name="chk1" />
- <check_box label="Encontros." name="chk2" />
- <check_box label="Ser contratado" name="chk6" />
- <check_box label="Grupo" name="chk3" />
- <check_box label="Comprar" name="chk4" />
- <check_box label="Vender" name="chk5" />
- <check_box label="Contratar" name="chk7" />
+ <check_box label="Construção." name="chk0"/>
+ <check_box label="Explorar" name="chk1"/>
+ <check_box label="Encontros." name="chk2"/>
+ <check_box label="Ser contratado" name="chk6"/>
+ <check_box label="Grupo" name="chk3"/>
+ <check_box label="Comprar" name="chk4"/>
+ <check_box label="Vender" name="chk5"/>
+ <check_box label="Contratar" name="chk7"/>
<text name="Skills:">
Habilidades:
</text>
- <check_box label="Texturas" name="schk0" />
- <check_box label="Arquitetura:" name="schk1" />
- <check_box label="Planejador de Eventos" name="schk2" />
- <check_box label="Modelador" name="schk3" />
- <check_box label="Programador" name="schk4" />
- <check_box label="Personagens customizados." name="schk5" />
+ <check_box label="Texturas" name="schk0"/>
+ <check_box label="Arquitetura:" name="schk1"/>
+ <check_box label="Planejador de Eventos" name="schk2"/>
+ <check_box label="Modelador" name="schk3"/>
+ <check_box label="Programador" name="schk4"/>
+ <check_box label="Personagens customizados." name="schk5"/>
<text name="Languages:">
Línguas:
</text>
@@ -124,8 +122,8 @@
<text name="Tell everyone about your favorite places in Second Life.">
Diga a todos os seus lugares favoritos em Second Life.
</text>
- <button label="Novo..." label_selected="Novo..." name="New..." />
- <button label="Apagar..." label_selected="Apagar..." name="Delete..." />
+ <button label="Novo..." label_selected="Novo..." name="New..."/>
+ <button label="Apagar..." label_selected="Apagar..." name="Delete..."/>
<text name="loading_text">
Carregando...
</text>
@@ -134,8 +132,8 @@
<text name="Place an ad in Second Life's classified listings.">
Adicione no Second Life sua lista de classificados.
</text>
- <button label="Novo..." label_selected="Novo..." name="New..." />
- <button label="Apagar..." label_selected="Apagar..." name="Delete..." />
+ <button label="Novo..." label_selected="Novo..." name="New..."/>
+ <button label="Apagar..." label_selected="Apagar..." name="Delete..."/>
<text name="loading_text">
Carregando...
</text>
@@ -144,7 +142,7 @@
<text name="Photo:">
Foto:
</text>
- <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto" />
+ <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto"/>
<text name="Info:">
Sobre:
</text>
@@ -153,36 +151,39 @@
</text>
</panel>
<panel label="Minhas anotações" name="My Notes">
+ <string name="Loading">
+ Carregando...
+ </string>
<text name="label">
Use esse espaço para falar sobre essa pessoa. Coloque aqui o que desejar, projetos, lembretes e etc. Somente você poderá ver essa anotação.
</text>
</panel>
</tab_container>
- <button label="OK" label_selected="OK" name="OK" />
- <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
- <button label="Retirar" label_selected="Retirar" name="Kick" />
- <button label="Paralizar" label_selected="Paralizar" name="Freeze"
- tool_tip="Paraliza o movimento e conversa desse residente." />
- <button label="Unfreeze" label_selected="Unfreeze" name="Unfreeze"
- tool_tip="Libera o residente" />
- <button label="CSR" label_selected="CSR" name="csr_btn"
- tool_tip="Abre a ferramenta de cliente para esse residente." />
- <text name="ShowOnMapNonFriend">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <button label="Retirar" label_selected="Retirar" name="Kick"/>
+ <button label="Paralizar" label_selected="Paralizar" name="Freeze" tool_tip="Paraliza o movimento e conversa desse residente."/>
+ <button label="Unfreeze" label_selected="Unfreeze" name="Unfreeze" tool_tip="Libera o residente"/>
+ <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Abre a ferramenta de cliente para esse residente."/>
+ <string name="ShowOnMapNonFriend">
Mostra a localização no mapa. Desativado porque ainda não é amigo desse residente.
- </text>
- <text name="ShowOnMapFriendOffline">
- Mostra a localização no mapa. Desativado pois ele não está online.
- </text>
- <text name="ShowOnMapFriendOnline">
+ </string>
+ <string name="ShowOnMapFriendOffline">
+ Mostrar a localidade no mapa. Desabilitar porque eles não estão conectados.
+ </string>
+ <string name="ShowOnMapFriendOnline">
Mostra localização no mapa.
- </text>
- <text name="TeleportGod">
+ </string>
+ <string name="TeleportGod">
Força teleporte até a sua localização.
- </text>
- <text name="TeleportPrelude">
+ </string>
+ <string name="TeleportPrelude">
Oferece teleporte para a sua lozalização. Desativado até que você saia da ilha da Orientação.
- </text>
- <text name="TeleportNormal">
+ </string>
+ <string name="TeleportNormal">
Oferece teleporte para a sua localização.
- </text>
+ </string>
+ <string name="Loading">
+ Carregando...
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml b/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
index 0a0e396..c0a2a88 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
@@ -1,25 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Classified" title="Classificados">
- <line_editor name="given_name_editor"
- tool_tip="O Nome precisa começar com uma letra ou número, não pontuação." />
- <line_editor name="location_editor"
- tool_tip="Defina a posição para este classificado para sua posição atual." />
- <button label="Definir Posição" name="set_location_btn" />
- <button label="Teleporte" name="classified_teleport_btn" />
- <button label="Mapa" name="classified_map_btn" />
- <combo_box label="" name="classified_category_combo" />
- <check_box label="Adulto" name="classified_mature_check" />
- <text name="classified_info_text"
- tool_tip="Quando mais você escolhe pagar pelo seu anúncio, melhor será sua visualizaçã na lista.">
+ <line_editor name="given_name_editor" tool_tip="O Nome precisa começar com uma letra ou número, não pontuação."/>
+ <line_editor name="location_editor" tool_tip="Defina a posição para este classificado para sua posição atual."/>
+ <button label="Definir Posição" name="set_location_btn"/>
+ <button label="Teleporte" name="classified_teleport_btn"/>
+ <button label="Mapa" name="classified_map_btn"/>
+ <combo_box label="" name="classified_category_combo"/>
+ <combo_box label="" name="classified_mature_check">
+ <combo_item name="select_mature">
+ - Selecione Maduro -
+ </combo_item>
+ <combo_item name="mature">
+ Conteúdo Maduro
+ </combo_item>
+ <combo_item name="not_mature">
+ Conteúdo Não Maduro
+ </combo_item>
+ </combo_box>
+ <text name="classified_info_text" tool_tip="Quando mais você escolhe pagar pelo seu anúncio, melhor será sua visualizaçã na lista.">
Lugar do Anúncio: Ainda não publicado
</text>
- <text name="click_through_text"
- tool_tip="Número total de cliques em cada botão desde que este classificado foi posicionado.">
+ <text name="click_through_text" tool_tip="Número total de cliques em cada botão desde que este classificado foi posicionado.">
Cliques:
</text>
- <button label="Publicar..." name="classified_update_btn" />
- <check_box label="Auto-Renovar a cada Semana" name="auto_renew_check" />
- <text name="ad_placed_paid">
+ <button label="Publicar..." name="classified_update_btn"/>
+ <check_box label="Auto-Renovar a cada Semana" name="auto_renew_check"/>
+ <string name="ad_placed_paid">
Anúncio publicado em: [DATE], Pago L$[AMT] para listar.
- </text>
+ </string>
+ <string name="update_txt">
+ Atualizar
+ </string>
+ <string name="publish_txt">
+ Publicar…
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
index 0fab2a2..621d1ee 100644
--- a/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="chat_bar">
- <button label="Histórico" label_selected="Histórico" name="History"
- tool_tip="Clique aqui para ver o que foi dito" />
- <line_editor label="Clique aqui para iniciar o chat" name="Chat Editor"
- tool_tip="Pressione Enter para dizer" />
- <button label="Dizer" label_selected="Dizer" name="Say" tool_tip="Enter" />
- <button label="Gritar" label_selected="Gritar" name="Shout" tool_tip="Ctrl-Enter" />
- <combo_box label="Gestos" name="Gesture">
- <combo_item name="Gestures">
- Gestos
- </combo_item>
- </combo_box>
+ <button label="Conversa local" label_selected="Histórico" name="History" tool_tip="Clique aqui para ver o que foi dito"/>
+ <line_editor label="Clique aqui para iniciar o chat" name="Chat Editor" tool_tip="Pressione Enter para dizer"/>
+ <flyout_button label="Falar" label_selected="Dizer" name="Say" tool_tip="Enter">
+ <flyout_button_item name="shout_item">
+ Gritar
+ </flyout_button_item>
+ <flyout_button_item name="say_item">
+ Falar
+ </flyout_button_item>
+ <flyout_button_item name="whisper_item">
+ Sussurrar
+ </flyout_button_item>
+ </flyout_button>
+ <combo_box label="Gestos" name="Gesture"/>
+ <string name="gesture_label">Gestos</string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_classified.xml b/indra/newview/skins/default/xui/pt/panel_classified.xml
index ba219b4..f50eea2 100644
--- a/indra/newview/skins/default/xui/pt/panel_classified.xml
+++ b/indra/newview/skins/default/xui/pt/panel_classified.xml
@@ -1,13 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Classified" title="Classificados">
- <line_editor name="given_name_editor"
- tool_tip="O nome deve começar com uma letra ou um número, não pontuação." />
- <line_editor name="location_editor" tool_tip="Ajustar a posição para sua localização." />
- <button label="Ajuste" name="set_location_btn" />
- <button label="Tele-transporte" name="classified_teleport_btn" />
- <button label="Mostrar no mapa" name="classified_map_btn" />
- <button label="Perfil" name="classified_profile_btn" />
- <check_box label="Maduro" name="classified_mature_check" />
- <combo_box label="" name="classified_category_combo" />
- <button label="Update" name="classified_update_btn" />
+ <line_editor name="given_name_editor" tool_tip="O nome deve começar com uma letra ou um número, não pontuação."/>
+ <line_editor name="location_editor" tool_tip="Ajustar a posição para sua localização."/>
+ <button label="Ajuste" name="set_location_btn"/>
+ <button label="Tele-transporte" name="classified_teleport_btn"/>
+ <button label="Mostrar no mapa" name="classified_map_btn"/>
+ <button label="Perfil" name="classified_profile_btn"/>
+ <combo_box label="Maduro" name="classified_mature_check">
+ <combo_item name="select_mature">
+ - Selecionar Adulto -
+ </combo_item>
+ <combo_item name="mature">
+ Conteúdo Adulto
+ </combo_item>
+ <combo_item name="not_mature">
+ Conteúdo Não Adulto
+ </combo_item>
+ </combo_box>
+ <combo_box label="" name="classified_category_combo"/>
+ <button label="Update" name="classified_update_btn"/>
+ <string name="ad_placed_paid">
+ Anúncio colocado: [DATE], Pagos L$[AMT] para constar na lista.
+ </string>
+ <string name="update_txt">
+ Atualizar
+ </string>
+ <string name="publish_txt">
+ Publicar...
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_event.xml b/indra/newview/skins/default/xui/pt/panel_event.xml
index 5493583..72f1731 100644
--- a/indra/newview/skins/default/xui/pt/panel_event.xml
+++ b/indra/newview/skins/default/xui/pt/panel_event.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Event" title="Evento">
<text name="event_name_label">
Nome:
@@ -15,8 +15,11 @@
<text name="event_mature_label">
Índice:
</text>
- <text name="event_mature">
- (desconhecido)
+ <text name="event_mature_yes">
+ sim
+ </text>
+ <text name="event_mature_no">
+ Não
</text>
<text name="event_date_label">
Data:
@@ -51,8 +54,17 @@
<text name="event_desc_label">
Descrição:
</text>
- <button label="Tele-transportar" name="teleport_btn" />
- <button label="Mostrar no mapa" name="map_btn" />
- <button label="Notificar" name="notify_btn" />
- <button label="Criar Evento..." name="create_event_btn" />
+ <button label="Tele-transportar" name="teleport_btn"/>
+ <button label="Mostrar no mapa" name="map_btn"/>
+ <button label="Notificar" name="notify_btn"/>
+ <button label="Criar Evento..." name="create_event_btn"/>
+ <string name="none">
+ nenhum
+ </string>
+ <string name="notify">
+ Avisar
+ </string>
+ <string name="dont_notify">
+ Não avisar
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
new file mode 100644
index 0000000..5815605
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="friends">
+ <string name="Multiple">
+ Multiplos amigos...
+ </string>
+ <scroll_list name="friend_list" tool_tip="Hold shift or control while clicking to select multiple friends">
+ <column name="icon_online_status" tool_tip="Status Online"/>
+ <column label="Name" name="friend_name" tool_tip="Nome"/>
+ <column name="icon_visible_online" tool_tip="Amigo pod ever quando você está online"/>
+ <column name="icon_visible_map" tool_tip="Amigo pode localiza-lo no mapa"/>
+ <column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar os seus objetos"/>
+ <column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
+ </scroll_list>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 31bd1b6..ec57397 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Geral" name="general_tab">
- <text name="help_text">
+ <string name="help_text">
A aba diversos contém informações gerais sobre esse grupo, a lista dos donos e seus membros, preferências gerais do grupo e opções dos membros. Passe o seu mouse por cima para ver mais informações. Ajuda.
- </text>
- <button label="?" label_selected="?" name="help_button" />
- <line_editor name="group_name_editor">
- Digite o nome do seu novo grupo aqui
- </line_editor>
+ </string>
+ <string name="group_info_unchanged">
+ Informações gerais do grupo foram modificadas
+ </string>
+ <button label="?" label_selected="?" name="help_button"/>
+ <line_editor label="Digite o nome do seu novo grupo aqui" name="group_name_editor"/>
<text name="group_name">
Digite o nome do seu novo grupo aqui
</text>
@@ -19,54 +20,57 @@
<text name="group_charter_label">
Patente do Grupo
</text>
- <texture_picker label="Group Insignia" name="insignia"
- tool_tip="Clique para escolher uma imagem" />
+ <texture_picker label="Group Insignia" name="insignia" tool_tip="Clique para escolher uma imagem"/>
<text_editor name="charter">
Patente do grupo
</text_editor>
- <button label="Juntar (L$0)" label_selected="Juntar (L$0)" name="join_button" />
- <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button" />
- <text>
- Donos & Membros visíveis
+ <button label="Juntar (L$0)" label_selected="Juntar (L$0)" name="join_button"/>
+ <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
+ <text name="text_owners_and_visible_members">
+ Proprietários & Membros visíveis
</text>
- <text>
- Os proprietários são mostrados em realce
+ <text name="text_owners_are_shown_in_bold">
+ (Proprietários são mostrados em negrito )
</text>
<name_list name="visible_members">
- <column label="Nome do membro" name="name" />
- <column label="Título" name="title" />
- <column label="Último login" name="online" />
+ <column label="Nome do membro" name="name"/>
+ <column label="Título" name="title"/>
+ <column label="Último login" name="online"/>
</name_list>
- <text name="incomplete_member_data_str">
- Recuperando dados do membro
- </text>
- <text name="confirm_group_create_str">
- Criar este grupo custará L$100. Você está certo que quer gastar L$100 para criar este grupo?
- </text>
- <text>
- Preferências do grupo
+ <text name="text_group_preferences">
+ Preferências de Grupos
</text>
<panel name="preferences_container">
- <check_box label="Mostrar na lista do grupo." name="show_in_group_list"
- tool_tip="Selecione onde esse grupo será exibido. janela de procura e no perfil dos membros." />
- <check_box label="Publicar na Web." name="publish_on_web"
- tool_tip="Selecione onde a informações desse grupo irá ser publicada na Web." />
- <check_box label="Abrir o registro" name="open_enrollement"
- tool_tip="Esse grupo permite que novos membros entrem sem serem convidados" />
- <check_box label="Tx. de adesão: L$" name="check_enrollment_fee"
- tool_tip="É necessário uma taxa de registro." />
- <spinner name="spin_enrollment_fee"
- tool_tip="Os novos membros terão de pagar a taxa de registro para fazerem parte do grupo." />
- <check_box label="Adulto" name="mature"
- tool_tip="Selecione se o grupo possuir conteúdo adulto." />
+ <check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas ver este grupo nos resultados de busca."/>
+ <check_box label="Aberta inscrição" name="open_enrollement" tool_tip="Esse grupo permite que novos membros entrem sem serem convidados"/>
+ <check_box label="Taxa de inscrição: L$" name="check_enrollment_fee" tool_tip="É necessário uma taxa de registro."/>
+ <spinner name="spin_enrollment_fee" tool_tip="Os novos membros terão de pagar a taxa de registro para fazerem parte do grupo."/>
+ <combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada adulta.">
+ <combo_item name="select_mature">
+ - Selecinar conteúdo adulto -
+ </combo_item>
+ <combo_item name="mature">
+ Conteúdo adulto
+ </combo_item>
+ <combo_item name="not_mature">
+ Conteúdo não adulto
+ </combo_item>
+ </combo_box>
<panel name="title_container">
<text name="active_title_label">
Meu título ativo
</text>
- <combo_box name="active_title"
- tool_tip="Mude o título que aparece em seu avatar quando o grupo estiver ativo." />
+ <combo_box name="active_title" tool_tip="Mude o título que aparece em seu avatar quando o grupo estiver ativo."/>
</panel>
- <check_box label="Receba notícias do grupo." name="receive_notices"
- tool_tip="Você quer receber notícias desse grupo" />
+ <check_box label="Receber avisos do grupo" name="receive_notices" tool_tip="Você quer receber notícias desse grupo"/>
+ <check_box label="Listar grupo no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja listar este grupo no seu Perfil"/>
</panel>
+ <string name="incomplete_member_data_str">
+ Recuperando dados do membro
+ </string>
+ <string name="confirm_group_create_str">
+ Criar este grupo irá custar L$100.
+Você está realmente, realmente, REALMENTE seguro que deseja gastar L$100 para criar este grupo?
+Esteja consciente de que ninguém mais se juntar este grupo dentro de 48 horas, será dissolvido e o nome não estará disponível para uso futuro.
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index 89f0b93..f8e76b8 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Convidar um membro" name="invite_panel">
<text name="help_text">
- Você pode seleciolar vários residentes para convidar para o seu grupo. Clique 'Selecionador de pessoas' para iniciar.
+ Você pode selecionar múltiplos residentes para convidar ao seu grupo. Clique 'Abra o Selecionador de Pessoas' para iniciar.
</text>
- <button label="Abrir selecionador de pessoas." name="add_button" tool_tip="" />
- <name_list name="invitee_list"
- tool_tip="Segure a tecla Ctrl e clique no nome dos residentes para selecionar multiplos personagens." />
- <button label="Remove Selected from List" name="remove_button"
- tool_tip="Remove os residentes selecionados acima da lista de convite." />
+ <button label="Abrir selecionador de pessoas." name="add_button" tool_tip=""/>
+ <name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
+ <button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima da lista de convite."/>
<text name="role_text">
- Selecione a função a ser dada a eles:
+ Escolha que Função atribuir a eles:
</text>
- <combo_box name="role_name"
- tool_tip="Selecione da lista de Funções os que você está permitido a dar aos membros." />
- <button label="Mandar convite." name="ok_button" />
- <button label="Cancelar" name="cancel_button" />
+ <combo_box name="role_name" tool_tip="Escolha a partir da lista de Funções autorizadas a você para inclusão de membros."/>
+ <button label="Mandar convite." name="ok_button"/>
+ <button label="Cancelar" name="cancel_button"/>
+ <string name="confirm_invite_owner_str">
+ Você tem certeza de que deseja convidar novo(s) proprietário(s)? Esta ação é permanente!
+ </string>
+ <string name="loading">
+ (carregando...)
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index 7288c98..f299d78 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Terra L$" name="land_money_tab">
- <text name="help_text">
+ <string name="help_text">
Lotes pertencentes ao grupo são listadas com detalhes de contribuição. Um aviso aparece até que o total de Terras em Uso seja menor ou igual ao Total de Contribuições. As abas de Planejamento, Detalhes e Vendas fornecem informações sobre as finanças do grupo.
- </text>
- <button label="?" name="help_button" />
- <text name="cant_view_group_land_text">
+ </string>
+ <button label="?" name="help_button"/>
+ <string name="cant_view_group_land_text">
Você não tem permissão para ver as terras pertencentes ao grupo.
- </text>
- <text name="cant_view_group_accounting_text">
+ </string>
+ <string name="cant_view_group_accounting_text">
Você não tem permissão para ver as informações sobre as contas do grupo.
- </text>
+ </string>
+ <string name="loading_txt">
+ Carregando...
+ </string>
<text name="group_land_heading">
Terra percentence ao grupo
</text>
<scroll_list name="group_parcel_list">
- <column label="Nome do Lote" name="name" />
- <column label="Região" name="location" />
- <column label="Área" name="area" />
- <column label="" name="hidden" />
+ <column label="Nome do Lote" name="name"/>
+ <column label="Região" name="location"/>
+ <column label="Área" name="area"/>
+ <column label="" name="hidden"/>
</scroll_list>
- <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button" />
+ <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
<text name="total_contributed_land_label">
Contribuição Total:
</text>
<text name="total_contributed_land_value">
- 0 metros quadrados
+ [AREA] m2
</text>
<text name="total_land_in_use_label">
Total de Terra em Uso:
</text>
<text name="total_land_in_use_value">
- 0 metros quadrados
+ [AREA] m2
</text>
<text name="land_available_label">
Terra Disponível:
</text>
<text name="land_available_value">
- 0 metros quadrados
+ [AREA] m2
</text>
<text name="your_contribution_label">
Sua Contribuição:
</text>
- <text name="your_contribution_max_value_append">
- metros quadrados
- </text>
+ <string name="land_contrib_error">
+ Não é possível definir sua contribuição para o terreno.
+ </string>
<text name="your_contribution_max_value">
- (aguardado)
+ m2 ([AMOUNT] máxima)
</text>
<text name="group_over_limit_text">
Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
@@ -54,28 +57,19 @@
Grupo L$
</text>
<tab_container name="group_money_tab_container">
- <panel label="Planejamento" name="group_money_planning_tab">
- <text_editor name="group_money_planning_text">
- Computando...
- </text_editor>
- </panel>
<panel label="Detalhes" name="group_money_details_tab">
<text_editor name="group_money_details_text">
Computando...
</text_editor>
- <button label="< Cedo" label_selected="< Cedo" name="earlier_details_button"
- tool_tip="Voltar no Tempo" />
- <button label="Tarde >" label_selected="Tarde >" name="later_details_button"
- tool_tip="Adiantar o Tempo" />
+ <button label="< Cedo" label_selected="< Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
+ <button label="Tarde >" label_selected="Tarde >" name="later_details_button" tool_tip="Adiantar o Tempo"/>
</panel>
<panel label="Vendas" name="group_money_sales_tab">
<text_editor name="group_money_sales_text">
Computando...
</text_editor>
- <button label="< Mais Cedo" label_selected="< Mais Cedo"
- name="earlier_sales_button" tool_tip="Voltar no Tempo" />
- <button label="Mais Tarde" label_selected="Mais Tarde" name="later_sales_button"
- tool_tip="Adiantar o Tempo" />
+ <button label="< Mais Cedo" label_selected="< Mais Cedo" name="earlier_sales_button" tool_tip="Voltar no Tempo"/>
+ <button label="Mais Tarde" label_selected="Mais Tarde" name="later_sales_button" tool_tip="Adiantar o Tempo"/>
</panel>
</tab_container>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index f5698a7..aa32870 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -11,7 +11,9 @@
Arquivo de notícias do grupo
</text>
<text name="lbl2">
- As notícias são mantidas por 14 dias. Clicar na notícia que você desejar ver.
+ As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja ver.
+Clique no botão “Atualizar” para verificar se novas notícias foram recebidas.
+Listas de aviso estão limitadas a 200 por grupo, diariamente.
</text>
<scroll_list name="notice_list">
<column label="" name="icon" />
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 8bf421c..cbb21c5 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Membros e Funções" name="roles_tab">
- <text name="default_needs_apply_text">
+ <string name="default_needs_apply_text">
Existem alterações
- </text>
- <text name="want_apply_text">
+ </string>
+ <string name="want_apply_text">
Você quer aplicar essas alterações?
- </text>
- <text name="cant_delete_role">
- Todos os proprietários possuem funções especiais que não podem ser apagadas.
- </text>
- <button label="?" name="help_button" />
+ </string>
+ <button label="?" name="help_button"/>
<panel name="members_header">
<text name="static">
Membros e Funções
@@ -46,43 +43,46 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
</panel>
<tab_container name="roles_tab_container">
<panel label="Membros" name="members_sub_tab" tool_tip="Membros">
- <button label="Pesquisar" name="search_button" />
- <button label="Mostrar todos" name="show_all_button" />
+ <button label="Pesquisar" name="search_button"/>
+ <button label="Mostrar todos" name="show_all_button"/>
<name_list name="member_list">
- <column label="Nome do membro" name="name" />
- <column label="Tarefa cedida." name="donated" />
- <column label="Último login" name="online" />
+ <column label="Nome do membro" name="name"/>
+ <column label="Tarefa cedida." name="donated"/>
+ <column label="Último login" name="online"/>
</name_list>
- <button label="Convidar nova pessoa" name="member_invite" />
- <button label="Sair do Grupo" name="member_eject" />
- <text name="help_text">
- Você pode adicionar ou remover as funções atribuídas ou selecionar múltiplos membros pressionando o Ctrl e clicando em seus nomes.
- </text>
+ <button label="Convidar nova pessoa" name="member_invite"/>
+ <button label="Sair do Grupo" name="member_eject"/>
+ <string name="help_text">
+ Você pode adicionar ou remover os direitos designados aos membros.Selecione vários membros segurando a tecla Ctrl e clicando em seus nomes.
+ </string>
</panel>
<panel label="Funções" name="roles_sub_tab">
- <button label="Busca" name="search_button" />
- <button label="Mostrar todos" name="show_all_button" />
+ <button label="Busca" name="search_button"/>
+ <button label="Mostrar todos" name="show_all_button"/>
<scroll_list name="role_list">
- <column label="Nome da função" name="name" />
- <column label="Título" name="title" />
- <column label="Membro" name="members" />
+ <column label="Nome da função" name="name"/>
+ <column label="Título" name="title"/>
+ <column label="Membro" name="members"/>
</scroll_list>
- <button label="Criar nova função..." name="role_create" />
- <button label="Apagar função" name="role_delete" />
- <text name="help_text">
+ <button label="Criar nova função..." name="role_create"/>
+ <button label="Apagar função" name="role_delete"/>
+ <string name="help_text">
Funções e habilidades permitidas para os membros da lista. Os membros poderão ter um ou mais funções. O grupo poderá ter 10 ou mais funções, Incluíndo as funções dos membros e do dono do grupo.
- </text>
+ </string>
+ <string name="cant_delete_role">
+ Os direitos de “Todos” e dos “Donos” são especiais e não podem ser apagados
+ </string>
</panel>
<panel label="Habilidades" name="actions_sub_tab">
- <button label="Busca" name="search_button" />
- <button label="Mostrar todos" name="show_all_button" />
+ <button label="Busca" name="search_button"/>
+ <button label="Mostrar todos" name="show_all_button"/>
<scroll_list name="action_list" tool_tip="Selecionar habilidade e ver detalhes.">
- <column label="" name="icon" />
- <column label="" name="action" />
+ <column label="" name="icon"/>
+ <column label="" name="action"/>
</scroll_list>
- <text name="help_text">
+ <string name="help_text">
Habilidades permite que os membros façam coisas especificas dentro do grupo.Há uma grande variedade de habilidades.
- </text>
+ </string>
</panel>
</tab_container>
<panel name="members_footer">
@@ -93,13 +93,12 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
Habilidades permitidas
</text>
<scroll_list name="member_assigned_roles">
- <column label="" name="checkbox" />
- <column label="" name="role" />
+ <column label="" name="checkbox"/>
+ <column label="" name="role"/>
</scroll_list>
- <scroll_list name="member_allowed_actions"
- tool_tip="Ver detalhes das habilidades permitidas">
- <column label="" name="icon" />
- <column label="" name="action" />
+ <scroll_list name="member_allowed_actions" tool_tip="Ver detalhes das habilidades permitidas">
+ <column label="" name="icon"/>
+ <column label="" name="action"/>
</scroll_list>
</panel>
<panel name="roles_footer">
@@ -124,17 +123,14 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
<text name="static4">
Membros atribuídos
</text>
- <text name="static5"
- tool_tip="A list of Abilities the currently selected role can perform.">
+ <text name="static5">
Habilidades permitidas
</text>
- <check_box label="Membros visivéis" name="role_visible_in_list"
- tool_tip="Selecione se os membros estarão visivéis na aba diversos para as pessoas de fora do grupo." />
- <scroll_list name="role_allowed_actions"
- tool_tip="Para ver detalhes de cada habiliadade permitida veja a aba correspondente.">
- <column label="" name="icon" />
- <column label="" name="checkbox" />
- <column label="" name="action" />
+ <check_box label="Membros visivéis" name="role_visible_in_list" tool_tip="Selecione se os membros estarão visivéis na aba diversos para as pessoas de fora do grupo."/>
+ <scroll_list name="role_allowed_actions" tool_tip="Para ver detalhes de cada habiliadade permitida veja a aba correspondente.">
+ <column label="" name="icon"/>
+ <column label="" name="checkbox"/>
+ <column label="" name="action"/>
</scroll_list>
</panel>
<panel name="actions_footer">
diff --git a/indra/newview/skins/default/xui/pt/panel_group_voting.xml b/indra/newview/skins/default/xui/pt/panel_group_voting.xml
index 56bae09..d324452 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_voting.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_voting.xml
@@ -1,51 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Propostas" name="voting_tab">
- <text name="help_text">
+ <string name="help_text">
As propostas do grupo poderá mostrar para os outros como esse determinado grupo se sente sobre determinado assunto.Se vocÊ possuir poder de propriedade você poderá abrir novas propostas, votar em propostas abertas e visualizar propostas antigas.
- </text>
- <button label="?" name="help_button" />
+ </string>
+ <button label="?" name="help_button"/>
<text name="proposal_header">
Abrir propostas do grupo
</text>
- <text name="proposals_header_view_txt">
- Abrir propostas do grupo
- </text>
- <text name="proposals_header_create_txt">
- Criar proposta
- </text>
- <text name="proposals_header_vote_txt">
- Votar na proposta
- </text>
- <text name="empty_proposal_txt">
- A proposta que você está tentando criar encontra-se vazia.
- </text>
<text name="proposal_instructions">
Clique duas vezes sobre a proposta que desejar votar.
</text>
<text name="proposal_lbl">
- Proposta:
+ Descrição da Proposta
</text>
- <button label="Criar proposta" label_selected="Criar proposta" name="btn_proposal" />
- <button label="Ver proposta" label_selected="Ver proposta"
- name="btn_view_proposal_item" />
- <button label="Ver Lista" label_selected="Ver Lista" name="btn_view_proposal_list" />
+ <text name="proposal_voting_lbl">
+ Proposta Término da votação Votado?
+ </text>
+ <button label="Criar proposta" label_selected="Criar proposta" name="btn_proposal"/>
+ <button label="Ver proposta" label_selected="Ver proposta" name="btn_view_proposal_item"/>
+ <button label="Ver Lista" label_selected="Ver Lista" name="btn_view_proposal_list"/>
<text name="quorum_lbl">
Quantidade:
</text>
- <spinner name="quorum"
- tool_tip="# do número de votos necessário para eleger a proposta" />
+ <spinner name="quorum" tool_tip="# do número de votos necessário para eleger a proposta"/>
<text name="quorum_text">
- x é o número de membros fora do grupo.
+ de [MEMBERS] membros precisam votar.
</text>
<text name="duration_lbl">
Duração:
</text>
- <spinner name="duration" tool_tip="# de dias que a eleição irá durar." />
+ <spinner name="duration" tool_tip="# de dias que a eleição irá durar."/>
<text name="duration_text">
dias
</text>
- <radio_group name="majority"
- tool_tip="A maioria de 2/3 dos votos é necessário para ganhar">
+ <radio_group name="majority" tool_tip="A maioria de 2/3 dos votos é necessário para ganhar">
Simples maioria 2/3 maioria unanime
</radio_group>
<text name="start_lbl">
@@ -54,12 +42,11 @@
<text name="end_lbl">
Voto final:
</text>
- <button label="Submeter a proposta" label_selected="Submeter a proposta"
- name="btn_submit" />
- <button label="Cancelar" label_selected="Cancelar" name="btn_cancel" />
- <button label="Sim" label_selected="Sim" name="btn_yes" />
- <button label="Não" label_selected="Não" name="btn_no" />
- <button label="Abstencia" label_selected="Abstencia" name="btn_abstain" />
+ <button label="Submeter a proposta" label_selected="Submeter a proposta" name="btn_submit"/>
+ <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/>
+ <button label="Sim" label_selected="Sim" name="btn_yes"/>
+ <button label="Não" label_selected="Não" name="btn_no"/>
+ <button label="Abstencia" label_selected="Abstencia" name="btn_abstain"/>
<text name="txt">
Histórico de votos do grupo
</text>
@@ -69,15 +56,49 @@
<text name="history_list_lbl">
Após o voto Voto finalizado
</text>
- <button label="Visualizar Item" label_selected="Visualizar Item"
- name="btn_view_history_item" />
+ <button label="Visualizar Item" label_selected="Visualizar Item" name="btn_view_history_item"/>
<text name="vote_text_lbl">
Resultado:
</text>
- <button label="Visualizar lista" label_selected="Visualizar lista"
- name="btn_view_history_list" />
- # o número de votos necessário para eleger a proposta
-
-
-# é o número de dias da eleição.
+ <button label="Visualizar lista" label_selected="Visualizar lista" name="btn_view_history_list"/>
+ <string name="proposals_header_view_txt">
+ Abrir propostas do grupo
+ </string>
+ <string name="proposals_header_view_inst">
+ Dê um duplo click na proposto a qual você gostaria de votar ou pressione Criar Proposto para criar uma nova proposta
+ </string>
+ <string name="proposals_header_create_txt">
+ Criar proposta
+ </string>
+ <string name="proposals_header_vote_txt">
+ Votar na proposta
+ </string>
+ <string name="proposals_header_vote_inst">
+ Pressione o botão Sim ou Não para votar na proposta,
+Ou escolha de abster nesta proposta.
+ </string>
+ <string name="proposals_header_voted_inst">
+ Você já votou: [VOTE]
+ </string>
+ <string name="empty_proposal_txt">
+ A proposta que você está tentando criar encontra-se vazia.
+ </string>
+ <string name="proposals_submit_yes_txt">
+ Submeter Sim à proposta...
+ </string>
+ <string name="proposals_submit_no_txt">
+ Submeter Não à proposta...
+ </string>
+ <string name="proposals_submit_abstain_txt">
+ Submetendo abster a Proposta...
+ </string>
+ <string name="proposals_submit_new_txt">
+ Submetendo nova proposta...
+ </string>
+ <string name="vote_recorded">
+ Seu voto foi recebido.
+ </string>
+ <string name="vote_previously_recorded">
+ Você já votou antes. Você só pode votar uma vez durante uma eleição
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index fb42e24..8b9cef3 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<text name="first_name_text">
Primeiro nome:
@@ -23,15 +23,15 @@
< Digite o nome da região;
</combo_item>
</combo_box>
- <check_box label="Lembrar senha" name="remember_check" />
- <text name="full_screen_text">
- O visor indicará a tela cheia quando entrar.
+ <check_box label="Lembrar senha" name="remember_check"/>
+ <button label="Entrar" label_selected="Entrar" name="connect_btn"/>
+ <text name="create_new_account_text">
+ Registrar-se para uma conta
</text>
- <button label="Preferências..." label_selected="Preferências..."
- name="preferences_btn" />
- <button label="Conectar" label_selected="Conectar" name="connect_btn" />
- <button label="Sair" label_selected="Sair" name="quit_btn" />
- <text name="version_text">
- 1.23.4 (5)
+ <text name="forgot_password_text">
+ Esqueceu seu nome de usuário e senha?
+ </text>
+ <text name="channel_text">
+ [CHANNEL] [VERSION]
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_media_controls.xml
new file mode 100644
index 0000000..65a6077
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_media_controls.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="media_controls">
+ <icon label="" name="music_icon" tool_tip="Executar/pausar fluxo de música"/>
+ <button label="" name="music_play" tool_tip="Executar/pausar fluxo de música"/>
+ <button label="" name="music_pause" tool_tip="Pausar fluxo de música"/>
+ <button label="" name="music_stop" tool_tip="Parar o fluxo de música"/>
+ <icon label="" name="media_icon" tool_tip="Executar/pausar o fluxo de música"/>
+ <button label="" name="media_play" tool_tip="Executar/pausar o fluxo de música"/>
+ <button label="" name="media_pause" tool_tip="Pausar o fluxo de mídia"/>
+ <button label="" name="media_stop" tool_tip="Parar o fluxo de mídia"/>
+ <volume_slider name="volume_slider" tool_tip="Volume Mestre"/>
+ <button label="" name="mute_master" tool_tip="Emudecedor Mestre"/>
+ <button label="" name="expand" tool_tip="Ajustar níveis de volume individuais"/>
+ <string name="play_label">
+ Executar
+ </string>
+ <string name="stop_label">
+ Parar
+ </string>
+ <string name="pause_label">
+ Pausar
+ </string>
+ <string name="default_tooltip_label">
+ Nenhuma Mídia Especificada
+ </string>
+ <string name="media_hidden_label">
+ (URL escondida pelo dono do terreno)
+ </string>
+ <string name="media_icon_tooltip_web">
+ Esta localidade mostra conteúdo da World Wide Web. Clique no botão Play para mostrar conteúdo da web.
+ </string>
+ <string name="media_icon_tooltip_movie">
+ Esta localidade mostra conteúdo de Vídeo. Clique no botão Play para executar o vídeo.
+ </string>
+ <string name="media_play_tooltip">
+ Mostra conteúdo da Web nesta localidade.
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..ed34f2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="media_remote">
+ <panel label="Áudio & Vídeo" name="Volume Panel"/>
+ <string name="play_label">
+ Executar
+ </string>
+ <string name="stop_label">
+ Parar
+ </string>
+ <string name="pause_label">
+ Pausar
+ </string>
+ <string name="default_tooltip_label">
+ Nenhuma Mídia Especificada
+ </string>
+ <string name="media_hidden_label">
+ (URL escondida pelo dono do terreno)
+ </string>
+ <string name="media_icon_tooltip_web">
+ Esta localidade mostra conteúdo da World Wide Web. Clique no botão Executar para mostrar o conteúdo Web.
+ </string>
+ <string name="media_icon_tooltip_movie">
+ Esta localidade mostra conteúdo de Vídeo. Clique no botão Executar para executar o vídeo.
+ </string>
+ <string name="media_play_tooltip">
+ Mostra conteúdo Web nesta localidade.
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_overlaybar.xml b/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
index 8d8c760..81ff921 100644
--- a/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
@@ -1,20 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="overlay">
<layout_stack name="overlay_layout_panel">
<layout_panel name="main_panel">
<layout_stack name="chatbar_and_buttons">
<layout_panel name="state_buttons">
- <button label="MI Recebida" label_selected="MI Recebida" name="IM Received"
- tool_tip="Você tem uma mensagem instantânea pendente. Clique para visualizar." />
- <button label="Ajustar como não ocupado" label_selected="Ajustar como não ocupado"
- name="Set Not Busy"
- tool_tip="O chat e o MI não aparecem. Clique aqui para solucionar." />
- <button label="Liberar Teclas" label_selected="Liberar Teclas" name="Release Keys"
- tool_tip="Foi feito um controle em suas teclas. Clique aqui para liberá-las." />
- <button label="Mouselook" label_selected="Mouselook" name="Mouselook"
- tool_tip="Use o mouse para aproximar sua visualização." />
- <button label="Levantar" label_selected="Levantar" name="Stand Up"
- tool_tip="Clique aqui para levantar" />
+ <button label="MI recebida" label_selected="MI recebida" name="IM Received" tool_tip="Você tem uma mensagem instantânea pendente. Clique para mostrar as MIs."/>
+ <button label="Ajustar para Não Ocupado" label_selected="Ajustar para desocupado" name="Set Not Busy" tool_tip="Conversa e MI estão ocultas para você. Clique aqui para se colocar desocupado."/>
+ <button label="Olhar com mouse" label_selected="Olhar com mouse" name="Mouselook" tool_tip="Use o mouse para pilotar sua visão. Se você tiver uma arma, clicando, ela dispara."/>
+ <button label="Levantar" label_selected="Levantar" name="Stand Up" tool_tip="Clique aqui para levantar."/>
</layout_panel>
</layout_stack>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_place.xml b/indra/newview/skins/default/xui/pt/panel_place.xml
index 0c41592..3217ffc 100644
--- a/indra/newview/skins/default/xui/pt/panel_place.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place.xml
@@ -1,6 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Place" title="Lugar">
- <button label="Teleportar" name="teleport_btn" />
- <button label="Mostrar no mapa" name="map_btn" />
- <button label="Ofertas..." name="auction_btn" />
+ <text name="name_label">
+ Nome:
+ </text>
+ <text name="description_label">
+ Descrição:
+ </text>
+ <text name="information_label">
+ Informação:
+ </text>
+ <text name="location_label">
+ Localidade:
+ </text>
+ <button label="Teleportar" name="teleport_btn"/>
+ <button label="Mostrar no mapa" name="map_btn"/>
+ <button label="Ofertas..." name="auction_btn"/>
+ <string name="traffic_text">
+ Tráfego: [TRAFFIC]
+ </string>
+ <string name="area_text">
+ Área: [AREA] m2.
+ </string>
+ <string name="forsale_text">
+ À venda por L$ [PRICE]
+ </string>
+ <string name="auction_text">
+ ID do leilão [ID].
+ </string>
+ <string name="server_update_text">
+ Informação do local indisponível sem a atualização do servidor.
+ </string>
+ <string name="server_error_text">
+ A informação sobre esta localidade está indisponível no momento, por favor tente novamente mais tarde.
+ </string>
+ <string name="server_forbidden_text">
+ Informações sobre esta localidade estão indisponíveis devido a restrições de acesso. Por favor, verifique suas permissões com o dono do terreno.
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_place_small.xml b/indra/newview/skins/default/xui/pt/panel_place_small.xml
index 8912149..05b01f1 100644
--- a/indra/newview/skins/default/xui/pt/panel_place_small.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_small.xml
@@ -1,6 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="Place" title="Lugar">
- <button label="Tele-transportar" name="teleport_btn" />
- <button label="Mostrar no mapa" name="map_btn" />
- <button label="Ofertas..." name="auction_btn" />
+ <text name="name_label">
+ Nome:
+ </text>
+ <text name="description_label">
+ Descrição:
+ </text>
+ <text name="information_label">
+ Informações:
+ </text>
+ <text name="location_label">
+ Localidade:
+ </text>
+ <button label="Tele-transportar" name="teleport_btn"/>
+ <button label="Mostrar no mapa" name="map_btn"/>
+ <button label="Ofertas..." name="auction_btn"/>
+ <string name="traffic_text">
+ Tráfego: [TRAFFIC]
+ </string>
+ <string name="area_text">
+ Área: [AREA] m2
+ </string>
+ <string name="forsale_text">
+ À venda por L$ [PRICE]
+ </string>
+ <string name="auction_text">
+ ID do Leilão [ID].
+ </string>
+ <string name="server_update_text">
+ Informação do local indisponível sem a atualização do servidor.
+ </string>
+ <string name="server_error_text">
+ Informações sobre esta localidade estão indisponíveis no momento, por favor tente novamente mais tarde.
+ </string>
+ <string name="server_forbidden_text">
+ Informações sobre esta localidade estão indisponíveis. Por favor, verifique suas permissões com o dono do terreno.
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml b/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
index c43b0b6..a9bb626 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
@@ -1,53 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Áudio & Vídeo" name="Media panel">
- <text type="string" length="1" name="muting_text">
+ <text length="1" name="muting_text" type="string">
Silenciar:
</text>
- <check_box label="Silenciar Áudio" name="disable audio" />
- <check_box label="Silenciar Áudio Quando Minimizar Janela" name="mute_when_minimized" />
- <text type="string" length="1" name="streaming_text">
- Streaming:
- </text>
- <check_box label="Executar Música em Streaming Quando Disponível" name="streaming_music" />
- <check_box label="Executar Vídeo em Streaming Quando Disponível" name="streaming_video" />
- <text type="string" length="1" name="system_volume_text">
- Efeitos Sonoros:
- </text>
- <text type="string" length="1" name="wind_volume_text">
- Volume do Vento:
- </text>
- <text type="string" length="1" name="footsteps_volume_text">
- Volume dos Passos:
- </text>
- <text type="string" length="1" name="ui_volume_text">
- Volume de interface:
- </text>
- <spinner label="Alerta de L$" name="L$ Change Threshold" />
- <spinner label="Alerta de Saúde" name="Health Change Threshold" />
- <text type="string" length="1" name="doppler_effect_text">
- Efeito Doppler:
- </text>
- <text type="string" length="1" name="distance_factor_text">
- Fator Distância:
- </text>
- <text type="string" length="1" name="rolloff_factor_text">
- Fator Perda:
- </text>
- <text type="string" length="1" name="default_upload_bitrate_text">
- Bitrate para Upload:
- </text>
- <radio_group name="bitrate">
- <radio_item type="string" length="1" name="32kbps">
- 32 kbps
- </radio_item>
- <radio_item type="string" length="1" name="64kbps">
- 64 kbps
- </radio_item>
- <radio_item type="string" length="1" name="96kbps">
- 96 kbps
- </radio_item>
- <radio_item type="string" length="1" name="128kbps">
- 128 kbps
- </radio_item>
- </radio_group>
+ <text name="streaming_prefs_text">
+ Preferências de Streaming:
+ </text>
+ <text name="audio_prefs_text">
+ Preferências de Audio:
+ </text>
+ <panel label="Volume" name="Volume Panel"/>
+ <check_box label="Executar Música em Streaming Quando Disponível" name="streaming_music"/>
+ <check_box label="Tocar corrente de Media quando disponível (usa mais banda)" name="streaming_video"/>
+ <check_box label="Tocar media automaticamente" name="auto_streaming_video"/>
+ <check_box label="Silenciar Áudio Quando Minimizar Janela" name="mute_when_minimized"/>
+ <slider label="Efeito Doppler" name="Doppler Effect"/>
+ <slider label="Fator Distância" name="Distance Factor"/>
+ <slider label="Fator Rolloff" name="Rolloff Factor"/>
+ <spinner label="Alerta de L$" name="L$ Change Threshold"/>
+ <spinner label="Alerta de Saúde" name="Health Change Threshold"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index d99e620..952997a 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,56 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat" name="chat">
- <text type="string" length="1" name="text_box">
- Tamanho da Fonte do Chat:
+ <text length="1" name="text_box" type="string">
+ Tamanho da Fonte do Chat:
</text>
- <radio_group name="chat font size">
- <radio_item type="string" length="1" name="radio">
+ <radio_group name="chat_font_size">
+ <radio_item name="radio">
Pequeno
</radio_item>
- <radio_item type="string" length="1" name="radio2">
+ <radio_item name="radio2">
Médio
</radio_item>
- <radio_item type="string" length="1" name="radio3">
+ <radio_item name="radio3">
Grande
</radio_item>
</radio_group>
- <text type="string" length="1" name="text_box2">
+ <text length="1" name="text_box2" type="string">
Cor do Chat:
</text>
- <color_swatch label="Sistema" name="system" />
- <color_swatch label="Usuários" name="users" />
- <color_swatch label="Objetos" name="objects" />
- <color_swatch label="Bubble" name="background" />
- <color_swatch label="URLs" name="links" />
- <text type="string" length="1" name="text_box3">
+ <color_swatch label="Você" name="user"/>
+ <color_swatch label="Outros" name="agent"/>
+ <color_swatch label="MI" name="im"/>
+ <color_swatch label="Sistema" name="system"/>
+ <color_swatch label="Erros" name="script_error"/>
+ <color_swatch label="Objetos" name="objects"/>
+ <color_swatch label="Dono" name="owner"/>
+ <color_swatch label="Bubble" name="background"/>
+ <color_swatch label="URLs" name="links"/>
+ <text length="1" name="text_box8" type="string">
+ Erros de Script:
+ </text>
+ <check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/>
+ <text length="1" name="text_box3" type="string">
Console do Chat:
</text>
- <spinner label="Ocultar Chat depois" name="fade_chat_time" />
- <text type="string" length="1" name="text_box4">
+ <spinner label="Ocultar Chat depois" name="fade_chat_time"/>
+ <text length="1" name="text_box4" type="string">
(segundos)
</text>
- <text type="string" length="1" name="text_box5">
+ <text length="1" name="text_box5" type="string">
(# linhas)
</text>
- <slider label="Opacidade" name="console_opacity" />
- <text type="string" length="1" name="text_box6">
+ <slider label="Opacidade" name="console_opacity"/>
+ <check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/>
+ <text length="1" name="text_box6" type="string">
Opções do Chat:
</text>
- <check_box label="Usar largura da tela cheia no Chat (depois do reinício)"
- name="chat_full_width_check" />
- <check_box label="Fechar Chat depois de tocar voltar" name="close_chat_on_return_check" />
- <check_box label="Teclas de Setas movem o avatar durante o chat"
- name="arrow_keys_move_avatar_check" />
- <check_box label="Mostrar data e hora no chat" name="show_timestamps_check" />
- <text type="string" length="1" name="text_box7">
+ <check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/>
+ <check_box label="Teclas de Setas movem o avatar durante o chat" name="arrow_keys_move_avatar_check"/>
+ <check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/>
+ <check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+ <text length="1" name="text_box7" type="string">
Bubble Chat:
</text>
- <check_box label="Mostrar bolhas do chat" name="bubble_text_chat" />
- <slider label="Opacidade" name="bubble_chat_opacity" />
- <text type="string" length="1" name="text_box8">
- Erros de Script:
- </text>
- <check_box label="Mostrar Erros de Script e avisos como chat comum"
- name="script_errors_as_chat" />
- <color_swatch label="Cor" name="script_error" />
+ <check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/>
+ <slider label="Opacidade" name="bubble_chat_opacity"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index f076766..599d325 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -1,67 +1,105 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Geral" name="general_panel">
- <combo_box name="location_combobox">
- <combo_item name="MyHome">
+ <radio_group name="default_start_location">
+ <radio_item name="MyHome" tool_tip="Como padrão, registrar na minha casa.">
Minha Casa
- </combo_item>
- </combo_box>
- <check_box label="Mostrar Posição Inicial na Tela de Login"
- name="show_location_checkbox" />
- <radio_group name="fade_out_radio">
- <radio_item type="string" length="1" name="Never">
- Nunca
</radio_item>
- <radio_item type="string" length="1" name="Temporarily">
- Temporariamente
- </radio_item>
- <radio_item type="string" length="1" name="Always">
- Sempre
+ <radio_item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade.">
+ Minha Última Localidade
</radio_item>
</radio_group>
- <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox" />
- <check_box label="Ocultar meu Título no Grupo" name="show_my_title_checkbox" />
- <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox" />
- <color_swatch label="" name="effect_color_swatch"
- tool_tip="Clique para abrir po seletor de cores" />
- <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner" />
- <check_box label="Avisar meus amigos que estou online"
- name="friends_online_notify_checkbox" />
- <check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox" />
- <check_box label="Avisar quando receber ou gastar Linden dollars (L$)"
- name="notify_money_change_checkbox" />
- <check_box label="Usar a paleta de cores padrão do sistema"
- name="use_system_color_picker_checkbox"
- tool_tip="Usar a palheta de cores padrão do sistema ao invés de uma feita dentro de Second Life." />
- <text type="string" length="1" name="start_location_textbox">
+ <check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/>
+ <combo_box name="fade_out_combobox">
+ <combo_item name="Never">
+ Nunca
+ </combo_item>
+ <combo_item name="Show Temporarily">
+ Mostrar Temporariamente
+ </combo_item>
+ <combo_item name="Always">
+ Sempre
+ </combo_item>
+ </combo_box>
+ <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/>
+ <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/>
+ <text name="group_titles_textbox">
+ Títulos dos Grupos:
+ </text>
+ <check_box label="Esconder Todos os Títulos de Grupos" name="show_all_title_checkbox"/>
+ <check_box label="Ocultar meu Título no Grupo" name="show_my_title_checkbox"/>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir po seletor de cores"/>
+ <text name="UI Size:">
+ Tamanho da UI:
+ </text>
+ <check_box label="Usar escala independente da resolução" name="ui_auto_scale"/>
+ <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
+ <check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox"/>
+ <check_box label="Avisar quando receber ou gastar Linden dollars (L$)" name="notify_money_change_checkbox"/>
+ <check_box label="Usar a paleta de cores padrão do sistema" name="use_system_color_picker_checkbox" tool_tip="Usar a palheta de cores padrão do sistema ao invés de uma feita dentro de Second Life."/>
+ <check_box label="Mostrar o painel de busca na barra sobreposta" name="show_search_panel" tool_tip="Mostrar o painel de busca embutido."/>
+ <text length="1" name="start_location_textbox" type="string">
Posição Inicial:
</text>
- <text type="string" length="1" name="show_names_textbox">
+ <text length="1" name="show_names_textbox" type="string">
Mostrar Nomes:
</text>
- <text type="string" length="1" name="effects_color_textbox">
+ <text length="1" name="effects_color_textbox" type="string">
Cores para Meus Efeitos:
</text>
- <text type="string" length="1" name="seconds_textbox">
+ <text length="1" name="seconds_textbox" type="string">
segundos
</text>
- <text type="string" length="1" name="crash_report_textbox">
+ <text length="1" name="crash_report_textbox" type="string">
Relatórios de Falhas:
</text>
- <text type="string" length="1" name="language_textbox2">
+ <text name="language_textbox">
+ Linguagem:
+ </text>
+ <text length="1" name="language_textbox2" type="string">
(Precisa de reinício para efetivar)
</text>
- <text name="region_name_prompt">
+ <string name="region_name_prompt">
Digite o nome da Região
- </text>
+ </string>
<combo_box name="crash_behavior_combobox">
- <combo_item type="string" length="1" name="Askbeforesending">
+ <combo_item length="1" name="Askbeforesending" type="string">
Perguntar antes de enviar
</combo_item>
- <combo_item type="string" length="1" name="Alwayssend">
+ <combo_item length="1" name="Alwayssend" type="string">
Sempre enviar
</combo_item>
- <combo_item type="string" length="1" name="Neversend">
+ <combo_item length="1" name="Neversend" type="string">
Nunca Enviar
</combo_item>
</combo_box>
+ <combo_box name="language_combobox">
+ <combo_item name="System Default Language">
+ Padrão do Sistema
+ </combo_item>
+ <combo_item name="English">
+ English (Inglês)
+ </combo_item>
+ <combo_item name="Deutsch(German)">
+ Deutsch (Alemão) - Beta
+ </combo_item>
+ <combo_item name="Spanish">
+ Español (Espanhol) - Beta
+ </combo_item>
+ <combo_item name="French">
+ Français (Francês) - Beta
+ </combo_item>
+ <combo_item name="Portugese">
+ Português - Beta
+ </combo_item>
+ <combo_item name="Chinese">
+ 汉语/漢語 (Chinês) - Beta
+ </combo_item>
+ <combo_item name="(Japanese)">
+ 日本語 (Japonês) - Beta
+ </combo_item>
+ <combo_item name="(Korean)">
+ 한국어 (Coreano) - Beta
+ </combo_item>
+ </combo_box>
+ <check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
</panel>
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 58b9956..327f563 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,40 +1,176 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Gráficos" name="Display panel">
- <check_box label="Executar em Janela" name="windowed mode" />
- <text type="string" length="1" name="Fullscreen Aspect Ratio:">
- Aparência de Tela Cheia:
+ <button label="?" name="GraphicsPreferencesHelpButton"/>
+ <check_box label="Execute Second Life emu ma janela" name="windowed mode"/>
+ <text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
+ Caso contrário, visualizador irá exibir em tela inteira quando fizer o acesso.
+ </text_editor>
+ <text name="WindowSizeLabel">
+ Tamanho da Janela:
</text>
- <text type="string" length="1" name="(width / height)">
- (largura / altura)
+ <combo_box name="windowsize combo">
+ <combo_item name="640x480">
+ 640x480
+ </combo_item>
+ <combo_item name="800x600">
+ 800x600
+ </combo_item>
+ <combo_item name="720x480">
+ 720x480 (NTSC)
+ </combo_item>
+ <combo_item name="768x576">
+ 768x576 (PAL)
+ </combo_item>
+ <combo_item name="1024x768">
+ 1024x768
+ </combo_item>
+ </combo_box>
+ <text name="DisplayResLabel">
+ Resolução de Display:
</text>
- <combo_box name="aspect_ratio">
- <combo_item type="string" length="1" name="4:3(StandardCRT)">
+ <text name="AspectRatioLabel1" tool_tip="largura / altura">
+ Aspecto da tela:
+ </text>
+ <combo_box name="aspect_ratio" tool_tip="largura / altura">
+ <combo_item length="1" name="4:3(StandardCRT)" type="string">
4:3 (CRT Padrão)
</combo_item>
- <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+ <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
5:4 (1280x1024 LCD)
</combo_item>
- <combo_item type="string" length="1" name="16:9(Widescreen)">
+ <combo_item name="8:5(Widescreen)">
+ 8:5 (tela ampla)
+ </combo_item>
+ <combo_item length="1" name="16:9(Widescreen)" type="string">
16:9 (Widescreen)
</combo_item>
</combo_box>
- <check_box label="Auto detectar" name="aspect_auto_detect" />
- <text type="string" length="1" name="UI Size:">
- Tamanho da interface:
+ <check_box label="Auto-detectar ratio" name="aspect_auto_detect"/>
+ <text name="HigherText">
+ Qualidade e
</text>
- <text type="string" length="1" name="(meters, lower is faster)">
- (metros, menor é mais rápido)
+ <text name="QualityText">
+ Performance:
</text>
- <text type="string" length="1" name="text2">
- Mostrar Opções:
+ <text name="FasterText">
+ Mais rápido
</text>
- <check_box label="Usar resolução de escala independente" name="ui_auto_scale" />
- <spinner label="Desenhar Distância:" name="draw_distance" />
- <check_box label="Mostrar Avatar em Mouselook" name="avfp" />
- <text name="resolution_format">
- [RES_X] x [RES_Y]
+ <text name="ShadersPrefText">
+ Baixo
</text>
- <text name="aspect_ratio_text">
- [NUM]:[DEN]
+ <text name="ShadersPrefText2">
+ Mid
+ </text>
+ <text name="ShadersPrefText3">
+ Alto
+ </text>
+ <text name="ShadersPrefText4">
+ Ultra
+ </text>
+ <text name="HigherText2">
+ Mais alto
+ </text>
+ <text name="QualityText2">
+ Qualidade
+ </text>
+ <check_box label="Padrão" name="CustomSettings" left="395" />
+ <text name="ShadersText">
+ Sombreamentos:
+ </text>
+ <check_box label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
+ <check_box label="Sombreamento básico" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vídeo a travem."/>
+ <check_box label="Sombreamento Atmosférico" name="WindLightUseAtmosShaders"/>
+ <check_box label="Reflexos de Água" name="Reflections"/>
+ <text name="ReflectionDetailText">
+ Detalhes de Reflexão:
</text>
+ <radio_group name="ReflectionDetailRadio">
+ <radio_item name="0">
+ Terreno e Árvores
+ </radio_item>
+ <radio_item name="1">
+ Todos os objetos estáticos
+ </radio_item>
+ <radio_item name="2">
+ Todos os avatares e Objetos
+ </radio_item>
+ <radio_item name="3">
+ Tudo
+ </radio_item>
+ </radio_group>
+ <text name="AvatarRenderingText">
+ Renderização de Avatar:
+ </text>
+ <check_box label="Avatar Impostors" name="AvatarImpostors"/>
+ <check_box label="Hardware Skinning" name="AvatarVertexProgram"/>
+ <check_box label="Vestimenta do Avatar" name="AvatarCloth"/>
+ <text name="DrawDistanceMeterText1">
+ m
+ </text>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Medir Distancia:" name="DrawDistance"/>
+ <slider label="Contador máximo de partículas" name="MaxParticleCount"/>
+ <slider label="Qualidade de Post Process:" name="RenderPostProcess"/>
+ <text name="MeshDetailText">
+ Detalhes de Malha:
+ </text>
+ <slider label="Objetos:" name="ObjectMeshDetail"/>
+ <slider label="Primitivos Flexiveis:" name="FlexibleMeshDetail"/>
+ <slider label="Árvores:" name="TreeMeshDetail"/>
+ <slider label="Avatares:" name="AvatarMeshDetail"/>
+ <slider label="Terreno:" name="TerrainMeshDetail"/>
+ <slider label="Céu:" name="SkyMeshDetail"/>
+ <text name="PostProcessText">
+ Baixo
+ </text>
+ <text name="ObjectMeshDetailText">
+ Baixo
+ </text>
+ <text name="FlexibleMeshDetailText">
+ Baixo
+ </text>
+ <text name="TreeMeshDetailText">
+ Baixo
+ </text>
+ <text name="AvatarMeshDetailText">
+ Baixo
+ </text>
+ <text name="TerrainMeshDetailText">
+ Baixo
+ </text>
+ <text name="SkyMeshDetailText">
+ Baixo
+ </text>
+ <text name="LightingDetailText">
+ Detalhes de Iluminação:
+ </text>
+ <radio_group name="LightingDetailRadio">
+ <radio_item name="SunMoon">
+ Sol e Lua apenas
+ </radio_item>
+ <radio_item name="LocalLights">
+ Luzes locais nas proximidades
+ </radio_item>
+ </radio_group>
+ <text name="TerrainDetailText">
+ Detalhes do Terreno:
+ </text>
+ <radio_group name="TerrainDetailRadio">
+ <radio_item name="0">
+ Baixo
+ </radio_item>
+ <radio_item name="2">
+ Alto
+ </radio_item>
+ </radio_group>
+ <button label="Configurações Recomendadas" name="Defaults"/>
+ <button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/>
+ <string name="resolution_format">
+ [RES_X] x [RES_Y]
+ </string>
+ <string name="aspect_ratio_text">
+ [NUM]:[DEN]
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_im.xml b/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
index 72bcae1..6f1d678 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
@@ -1,24 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Comunicação" name="im">
- <text type="string" length="1" name="text_box">
- Situação do Perfil On-Line:
+ <text length="1" name="text_box" type="string">
+ Minha situação online:
</text>
- <check_box label="Fazer com que meus amigos saibam que estou on-line"
- name="online_visibility" />
- <text type="string" length="1" name="text_box2">
+ <check_box label="Apenas meus Amigos e Grupos podem ver-me online" name="online_visibility"/>
+ <text length="1" name="text_box2" type="string">
Opções MI:
</text>
- <text name="log_in_to_change">
+ <string name="log_in_to_change">
Logar para Alterar
- </text>
- <check_box label="Enviar MI para o e-mail ([EMAIL])" name="send_im_to_email" />
- <check_box label="Incluir MI no Histórico do Chat" name="include_im_in_chat_history" />
- <check_box label="Mostrar data e hora na MI" name="show_timestamps_check" />
- <check_box label="Registrar Mensagens Instantâneas" name="log_instant_messages" />
- <check_box label="Registrar Chat" name="log_chat" />
- <check_box label="Mostrar final da última conversa MI" name="log_show_history" />
- <button label="Alt. Caminho" label_selected="Alt. Caminho" name="log_path_button" />
- <text type="string" length="1" name="text_box3">
+ </string>
+ <check_box label="Enviar MI para o e-mail ([EMAIL])" name="send_im_to_email"/>
+ <check_box label="Incluir MIs no histórico de conversas" name="include_im_in_chat_history"/>
+ <check_box label="Mostrar data e hora na MI" name="show_timestamps_check"/>
+ <check_box label="Mostrar notificação de Amigo online" name="friends_online_notify_checkbox"/>
+ <text length="1" name="text_box3" type="string" width="134">
Resp. no Modo Ocupado:
</text>
+ <text name="text_box4">
+ Opções de Registro:
+ </text>
+ <check_box label="Salvar um registro das MIs em meu computador" name="log_instant_messages"/>
+ <check_box label="Mostrar a hora nas MIs" name="log_instant_messages_timestamp"/>
+ <check_box label="Mostrar o final da última conversa em MI" name="log_show_history"/>
+ <check_box label="Salvar um registro da Conversa local em meu computador" name="log_chat"/>
+ <check_box label="Mostrar a hora no registro da Conversa local" name="log_chat_timestamp"/>
+ <check_box label="Mostrar MIs recebidas no registro de Conversa local" name="log_chat_IM"/>
+ <check_box label="Incluir data e hora" name="log_date_timestamp"/>
+ <button label="Alt. Caminho" label_selected="Alt. Caminho" name="log_path_button"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_input.xml b/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
index 2c5d5bd..38a3f90 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
@@ -1,26 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Câmera" name="Input panel">
- <text type="string" length="1" name=" Mouselook Options:">
+ <text length="1" name=" Mouselook Options:" type="string">
Opções de Mouselook:
</text>
- <text type="string" length="1" name=" Mouse Sensitivity:">
+ <text length="1" name=" Mouse Sensitivity:" type="string">
Sensibilidade do Mouse:
</text>
- <check_box label="Inverter Mouse" name="invert mouse" />
- <text type="string" length="1" name=" Auto Fly Options:">
- Opções de Vôo Automático:
+ <check_box label="Inverter o Mouse" name="invert_mouse"/>
+ <text length="1" name=" Auto Fly Options:" type="string">
+ Vôo Automático:
</text>
- <check_box label="Voar/Pousar segurando Para Cima/Para Baixo" name="automatic fly" />
- <text type="string" length="1" name=" Camera Options:">
+ <check_box label="Voar/Aterrizar pressionando teclar para cima/baixo" name="automatic_fly"/>
+ <text length="1" name=" Camera Options:" type="string">
Opções de Câmera:
</text>
- <text type="string" length="1" name="Camera Springiness:">
- Elasticidade da Câmera:
+ <text name="Camera Follow Distance:" width="178">
+ Distância de Acompanhamento da Camêra:
</text>
- <check_box label="Movimento Automático da Câmera de Edição"
- name="edit camera movement"
- tool_tip="Usar posicionamento automático de câmera quando estiver entrando ou saindo do modo de edição" />
- <check_box label="Movimento Automático da Câmera de Aparência"
- name="appearance camera movement"
- tool_tip="Usar posicionamento automático da câmera enquanto no modo de edição" />
+ <slider left="325" name="dynamic_camera_strength" />
+ <text name="Camera Transition Time:" width="178">
+ Tempo de transição da câmera :
+ </text>
+ <slider left="325" name="zoom_time" />
+ <slider left="325" name="camera_position_smoothing" />
+ <check_box label="Movimento automático da câmera de edição" name="edit_camera_movement" tool_tip="Usar posicionamento automático da câmera quando entrar e sair do modo de edição"/>
+ <check_box label="Movimento Automático da Câmera na edição de aparência" name="appearance_camera_movement" tool_tip="Usar posicionamento automático da câmera em modo de edição"/>
+ <text name="text2">
+ Opções de Exibição do Avatar:
+ </text>
+ <check_box label="Mostra o avatar em primeira pessoa" name="first_person_avatar_visible"/>
+ <text name="text5">
+ Opções de Joystick:
+ </text>
+ <button label="Configuração do Joystick" name="joystick_setup_button" width="165"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_network.xml b/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
index b0b46b1..700320d 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Rede" name="network">
- <text type="string" length="1" name="text_box">
+ <text length="1" name="text_box" type="string">
Banda Máxima:
</text>
- <text type="string" length="1" name="text_box2">
+ <text length="1" name="text_box2" type="string">
kbps(kilobits por segundo)
</text>
- <text type="string" length="1" name="cache_size_label_l">
- Cache em Disco:
+ <text length="1" name="cache_size_label_l" type="string">
+ Tamanho do Cachê de Disco:
</text>
- <button label="Limpar Cache" name="clear_cache" />
- <text type="string" length="1" name="cache_location_label">
+ <text name="text_box5">
+ MB
+ </text>
+ <button label="Limpar Cache" name="clear_cache"/>
+ <text length="1" name="cache_location_label" type="string">
Local do Cache em Disco:
</text>
- <button label="Ajusta" label_selected="Ajusta" name="set_cache" />
- <button label="Inicia" label_selected="Inicia" name="reset_cache" />
- <check_box label="Conexão de porta personalizada" name="connection_port_enabled" />
- <spinner label=" Porta:" name="connection_port" />
+ <button label="Ajusta" label_selected="Ajusta" name="set_cache"/>
+ <button label="Inicia" label_selected="Inicia" name="reset_cache"/>
+ <check_box label="Conexão de porta personalizada" name="connection_port_enabled"/>
+ <spinner label=" Porta:" name="connection_port"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml b/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
index a6ade10..5a57115 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Popups" name="popups">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Popups" name="popups" title="Popups">
<text name="dont_show_label">
- Não mostrar popups:
+ Não mostrar estas popups:
</text>
- <button label="Habilitar este popup" label_selected="Habilitar este popup"
- name="enable_popup" />
- <text type="string" length="1" name="show_label">
- Mostrar popups:
+ <button label="Habilitar este popup" label_selected="Habilitar este popup" name="enable_popup"/>
+ <button width="200" label="Habilitar todas as popups..." label_selected="Reiniciar Dialogos que serão mostrados na próxima vez..." name="reset_dialogs_btn" tool_tip="Habilitar todas as popups opcionais e notificações de “primeiro uso”."/>
+ <text length="1" name="show_label" type="string">
+ Mostrar estas popups:
</text>
- <check_box label="Aceitar automaticamente" name="accept_new_inventory" />
- <check_box label="Visualizar após aceitar" name="show_new_inventory" />
- <button label="Reiniciar Dialogos que serão mostrados na próxima vez..."
- label_selected="Reiniciar Dialogos que serão mostrados na próxima vez..."
- name="reset_dialogs_btn" />
+ <button width="200" label="Desabilitar todas estas popups..." name="skip_dialogs_btn" tool_tip="Desabilitar todas as popups opcionais e notificações de “primeiro uso”."/>
+ <text name="text_box2">
+ Ofertas de notecards, texturas e landmarks:
+ </text>
+ <check_box label="Aceitar automaticamente" name="accept_new_inventory"/>
+ <check_box label="Visualizar após aceitar" name="show_new_inventory"/>
+ <check_box label="Mostrar automaticamente objetos aceitos recentemente no inventário." name="show_in_inventory"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml b/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
new file mode 100644
index 0000000..6564953
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Peles" name="Skins panel">
+ <text name="muting_text">
+ Selecione uma pele (necessita reiniciar):
+ </text>
+ <radio_group name="skin_selection">
+ <radio_item name="default">
+ Padrão
+ </radio_item>
+ <radio_item name="silver">
+ Prata
+ </radio_item>
+ </radio_group>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml b/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
new file mode 100644
index 0000000..e2d1d49
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Voice Chat" name="chat">
+ <button label="Configurações do dispositivo" name="device_settings_btn"/>
+ <text_editor name="device_settings_text" height="48" bottom_delta="-45">
+ NOTA: Executar o Configurações do dispositivo vai desligá-lo temporariamente do Bate- papo de voz, e as mudanças que você fizer serão imediatamente aplicadas.
+ </text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_web.xml b/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
index 1fd6bb9..cc22ce9 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
@@ -1,12 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Web" name="web">
- <text type="string" length="1" name="cache_size_label_l">
+ <radio_group name="use_external_browser">
+ <radio_item name="external" tool_tip="Use o sistema navegador web padrão sistema para ajuda, links, etc. Não é recomendável se estiver sendo executado em tela cheia.">
+ Use navegador externo (Firefox, Safari, Internet Explorer)
+ </radio_item>
+ <radio_item name="internal" tool_tip="Use o navegador web embutido para ajudar, links, etc Este navegador abre uma nova janela dentro do Second Life.">
+ Use navegador built-in
+ </radio_item>
+ </radio_group>
+ <text length="1" name="cache_size_label_l" type="string">
Cache do Browser:
</text>
- <button label="Limpar Agora" name="clear_cache" />
- <text type="string" length="1" name="cookie_label">
+ <button label="Limpar Agora" name="clear_cache" width="105" />
+ <text length="1" name="cookie_label" type="string">
Cookies:
</text>
- <check_box label="Aceitar cookies de websites" name="cookies_enabled" />
- <button label="Limpar Agora" name="clear_cookies" />
+ <check_box label="Aceitar cookies de websites" name="cookies_enabled"/>
+ <text name="proxy_label">
+ Web Proxy:
+ </text>
+ <check_box label="Permitir Web Proxy" name="web_proxy_enabled"/>
+ <text name="proxy_text_label">
+ Endereço:
+ </text>
+ <line_editor name="web_proxy_editor" tool_tip="Nome ou endereço de IP do proxy que você gostaria de usar"/>
+ <spinner label="Numero da porta:" name="web_proxy_port"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index f82586d..b4c0d92 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Corretagem" name="Covenant">
- <text name="covenant_help_text">
- As mudanças à informação do convénio mostrarão em todos os pacotes na propriedade.
+ <text name="covenant_help_text" bottom="-25">
+ As mudanças à informação do convénio mostrarão em todos os pacotes
+na propriedade.
</text>
- <text name="region_name_lbl">
+ <text name="region_name_lbl" bottom_delta="-31">
Região:
</text>
<text name="region_name_text">
(desconhecido)
</text>
- <text name="estate_name_lbl">
+ <text name="estate_name_lbl" bottom_delta="-19">
Propriedade:
</text>
<text name="estate_name_text">
(desconhecido)
</text>
<text name="covenent_instructions">
- Arraste o cartao de um Corretor
-para este estado.
+ Arraste e solte um notecard para alterar o Contrato para este Terreno.
</text>
<button label="?" name="covenant_help" />
<button label="Resetar" name="reset_covenant" />
- <text name="estate_owner_lbl">
+ <text name="estate_owner_lbl" bottom_delta="-19">
Proprietário final:
</text>
<text name="estate_owner_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index d597b28..0c2ab2b 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Debug" name="Debug">
<text name="region_text_lbl">
Região:
@@ -6,29 +6,35 @@
<text name="region_text">
nenhum
</text>
- <check_box label="Desabilitar Scripts" name="disable_scripts_check"
- tool_tip="Desabilitar todos scripts nesta região" />
- <button label="?" name="disable_scripts_help" />
- <check_box label="Desabilitar colisões" name="disable_collisions_check"
- tool_tip="Desabilitar colisões dos avateres nessa região" />
- <button label="?" name="disable_collisions_help" />
- <check_box label="Desabilitar física" name="disable_physics_check"
- tool_tip="Desabilitar fisíca nessa região" />
- <button label="?" name="disable_physics_help" />
- <button label="Aplicar" name="apply_btn" />
- <button label="Escolher o avatar..." name="choose_avatar_btn" />
- <button label="Retornar objetos com scripts no terreno de outros"
- name="return_scripted_other_land_btn" />
- <button label="Retornar todos os objetos com script" name="return_scripted_all_btn" />
- <button label="Ranking-Colisões" name="top_colliders_btn"
- tool_tip="Lista dos objetos que experimentam as colisões " />
- <button label="?" name="top_colliders_help" />
- <button label="Ranking-Scripts" name="top_scripts_btn"
- tool_tip="List of objects spending the most time running scripts" />
- <button label="?" name="top_scripts_help" />
- <button label="Restart Region" name="restart_btn"
- tool_tip="Inicio da contagem regressiva em 2 minutos" />
- <button label="?" name="restart_help" />
- <button label="Cancelar Reinicio" name="cancel_restart_btn"
- tool_tip="Cancelar o reinicio da região" />
+ <check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos scripts nesta região"/>
+ <button label="?" name="disable_scripts_help"/>
+ <check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões dos avateres nessa região"/>
+ <button label="?" name="disable_collisions_help"/>
+ <check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar fisíca nessa região"/>
+ <button label="?" name="disable_physics_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <text name="objret_text_lbl">
+ Retornar Objeto
+ </text>
+ <text name="resident_text_lbl">
+ Residente:
+ </text>
+ <line_editor name="target_avatar_name">
+ (nenhum)
+ </line_editor>
+ <button label="Escolher..." name="choose_avatar_btn"/>
+ <text name="options_text_lbl">
+ Opções:
+ </text>
+ <check_box label="Retornar apenas aqueles objetos que contenham scripts" name="return_scripts" tool_tip="Retornar apenas objetos que contenham scripts."/>
+ <check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam em uma terra pertencente a alguém"/>
+ <check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
+ <button label="Retornar" name="return_btn"/>
+ <button label="Ranking-Colisões" name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as colisões "/>
+ <button label="?" name="top_colliders_help"/>
+ <button label="Ranking-Scripts" name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts"/>
+ <button label="?" name="top_scripts_help"/>
+ <button label="Restart Region" name="restart_btn" tool_tip="Inicio da contagem regressiva em 2 minutos"/>
+ <button label="?" name="restart_help"/>
+ <button label="Cancelar Reinicio" name="cancel_restart_btn" tool_tip="Cancelar o reinicio da região"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index f647abb..eb3aa5a 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Estado" name="Estate">
<text name="estate_help_text">
- As mudanças aos ajustes nesta aba afetarão todas as regiões na propriedade.
+ Mudanças nas definições nesta guia irá afetar
+todas as regiões do Terreno.
</text>
<text name="estate_text">
Estado:
@@ -15,49 +16,54 @@
<text name="estate_owner">
(nenhum)
</text>
- <text name="estate_manager_label">
- Gerentes da propriedade:
+ <check_box label="Usar Tempo global " name="use_global_time_check"/>
+ <button label="?" name="use_global_time_help"/>
+ <check_box label="Sol fixo " name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Fase " name="sun_hour_slider"/>
+ <check_box label="Permitir acesso público" name="externally_visible_check"/>
+ <button label="?" name="externally_visible_help"/>
+ <text name="Only Allow">
+ Acesso restrito a:
</text>
- <button label="?" name="estate_manager_help" />
- <button label="Adicionar..." name="add_estate_manager_btn" />
- <button label="Remover..." name="remove_estate_manager_btn" />
- <check_box label="Usar Tempo global " name="use_global_time_check" />
- <button label="?" name="use_global_time_help" />
- <check_box label="Sol fixo " name="fixed_sun_check" />
- <button label="?" name="fixed_sun_help" />
- <slider label="Fase " name="sun_hour_slider" />
- <check_box label="Acesso público " name="externally_visible_check" />
- <button label="?" name="externally_visible_help" />
- <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport" />
- <button label="?" name="allow_direct_teleport_help" />
- <text name="region_text_lbl">
- Proibir acesso a:
- </text>
- <check_box label="Informações de não pagamento" name="deny_anonymous" />
- <check_box label="Informações de pagamento" name="deny_identified" />
- <check_box label="Informações de pagtos realizados" name="deny_transacted" />
+ <check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residents não identificados."/>
+ <check_box label="Idade verificada -adultos" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
+ <check_box label="Permitir conversa de voz" name="voice_chat_check"/>
+ <button label="?" name="voice_chat_help"/>
+ <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
+ <button label="?" name="allow_direct_teleport_help"/>
<text name="abuse_email_text">
- E-mail do abuso:
+ Endereço de email de Abuso:
+ </text>
+ <string name="email_unsupported">
+ Funcionalidade não suportada
+ </string>
+ <button label="?" name="abuse_email_address_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Descartar Estado" name="kick_user_from_estate_btn"/>
+ <button label="Enviar mensagem ao Estado " name="message_estate_btn"/>
+ <text name="estate_manager_label">
+ Gerentes da propriedade:
</text>
- <button label="Aplicar" name="apply_btn" />
+ <button label="?" name="estate_manager_help"/>
+ <button label="Remover..." name="remove_estate_manager_btn"/>
+ <button label="Adicionar..." name="add_estate_manager_btn"/>
<text name="allow_resident_label">
Residentes permitidos:
</text>
- <button label="?" name="allow_resident_help" />
- <button label="Adicionar..." name="add_allowed_avatar_btn" />
- <button label="Remover..." name="remove_allowed_avatar_btn" />
+ <button label="?" name="allow_resident_help"/>
+ <button label="Remover..." name="remove_allowed_avatar_btn"/>
+ <button label="Adicionar..." name="add_allowed_avatar_btn"/>
<text name="allow_group_label">
- Grupos reservados:
+ Grupos permitidos:
</text>
- <button label="?" name="allow_group_help" />
- <button label="Adicionar..." name="add_allowed_group_btn" />
- <button label="Remover..." name="remove_allowed_group_btn" />
+ <button label="?" name="allow_group_help"/>
+ <button label="Remover..." name="remove_allowed_group_btn"/>
+ <button label="Adicionar..." name="add_allowed_group_btn"/>
<text name="ban_resident_label">
- Residentes proibidos:
+ Residentes banidos:
</text>
- <button label="?" name="ban_resident_help" />
- <button label="Adicionar..." name="add_banned_avatar_btn" />
- <button label="Remover..." name="remove_banned_avatar_btn" />
- <button label="Enviar mensagem ao Estado " name="message_estate_btn" />
- <button label="Descartar Estado" name="kick_user_from_estate_btn" />
+ <button label="?" name="ban_resident_help"/>
+ <button label="Remover..." name="remove_banned_avatar_btn"/>
+ <button label="Adicionar..." name="add_banned_avatar_btn"/>
</panel>
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 c80d6f4..45e813f 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Região" name="General">
<text name="region_text_lbl">
Região:
@@ -6,23 +6,30 @@
<text name="region_text">
desconhecido
</text>
- <check_box label="Bloquear Terraform" name="block_terraform_check" />
- <button label="?" name="terraform_help" />
- <check_box label="Bloquear Vôo" name="block_fly_check" />
- <button label="?" name="fly_help" />
- <check_box label="Permitir Dano" name="allow_damage_check" />
- <button label="?" name="damage_help" />
- <check_box label="Restringir Empurrar" name="restrict_pushobject" />
- <button label="?" name="restrict_pushobject_help" />
- <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check" />
- <button label="?" name="land_resell_help" />
- <check_box label="Permitir Compartilhamento/Divisão de Lotes"
- name="allow_parcel_changes_check" />
- <button label="?" name="parcel_changes_help" />
- <spinner label="Agente Limite" name="agent_limit_spin" />
- <button label="?" name="agent_limit_help" />
- <spinner label="Objeto Bonus" name="object_bonus_spin" />
- <button label="?" name="object_bonus_help" />
+ <text name="version_channel_text_lbl">
+ Versão:
+ </text>
+ <text name="version_channel_text">
+ desconhecido
+ </text>
+ <check_box label="Bloquear Terraform" name="block_terraform_check"/>
+ <button label="?" name="terraform_help"/>
+ <check_box label="Bloquear Vôo" name="block_fly_check"/>
+ <button label="?" name="fly_help"/>
+ <check_box label="Permitir Dano" name="allow_damage_check"/>
+ <button label="?" name="damage_help"/>
+ <check_box label="Restringir Empurrar" name="restrict_pushobject"/>
+ <button label="?" name="restrict_pushobject_help"/>
+ <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/>
+ <button label="?" name="land_resell_help"/>
+ <check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/>
+ <button label="?" name="parcel_changes_help"/>
+ <check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus terrenos nos resultados de busca"/>
+ <button label="?" name="parcel_search_help"/>
+ <spinner label="Agente Limite" name="agent_limit_spin"/>
+ <button label="?" name="agent_limit_help"/>
+ <spinner label="Objeto Bonus" name="object_bonus_spin"/>
+ <button label="?" name="object_bonus_help"/>
<text label="Maturidade" name="access_text">
Maturidade:
</text>
@@ -34,10 +41,10 @@
Adulto
</combo_item>
</combo_box>
- <button label="?" name="access_help" />
- <button label="Aplicar" name="apply_btn" />
- <button label="Teleportar um usuário para Casa..." name="kick_btn" />
- <button label="Teleportar Todos os Usuários..." name="kick_all_btn" />
- <button label="Enviar Mensagem para Região..." name="im_btn" />
- <button label="Gerenciar Telehub..." name="manage_telehub_btn" />
+ <button label="?" name="access_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Teleportar um usuário para Casa..." name="kick_btn"/>
+ <button label="Teleportar Todos os Usuários..." name="kick_all_btn"/>
+ <button label="Enviar Mensagem para Região..." name="im_btn"/>
+ <button label="Gerenciar Telehub..." name="manage_telehub_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml b/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
new file mode 100644
index 0000000..1967362
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="active_speakers_panel">
+ <string name="moderator_label">
+ (Moderador)
+ </string>
+ <layout_stack name="panels">
+ <layout_panel name="moderation_mode_panel">
+ <combo_box name="moderation_mode">
+ <combo_item name="OpenVoice">
+ Voz ativada por padrão
+ </combo_item>
+ <combo_item name="ModeratedVoice">
+ Voz desligada por padrão
+ </combo_item>
+ </combo_box>
+ </layout_panel>
+ <layout_panel name="moderate_chat_panel">
+ <scroll_list name="speakers_list">
+ <column label="Nome" name="speaker_name"/>
+ </scroll_list>
+ <panel name="speaker_controls">
+ <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+ <check_box label="Emudecer Texto" name="mute_text_btn"/>
+ </panel>
+ </layout_panel>
+ <layout_panel name="moderator_controls">
+ <text name="moderator_controls_label">
+ Controles do Moderador:
+ </text>
+ <check_box name="moderator_allow_voice">
+ Permitir conversa por voz
+ </check_box>
+ <check_box name="moderator_allow_text">
+ Permitir conversa por texto
+ </check_box>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 194bf11..2174d3d 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,32 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="status">
- <text type="string" length="1" name="ParcelNameText"
- tool_tip="Nome do pedaço de terra em que você esta. Clique para informações.">
+ <text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você esta. Clique para informações." type="string">
Nome do pedaço de terra vai aqui.
</text>
- <text type="string" length="1" name="BalanceText" tool_tip="Cotação de Compra">
+ <text length="1" name="BalanceText" tool_tip="Cotação de Compra" type="string">
L$
</text>
- <button label="" label_selected="" name="buycurrency" tool_tip="Compras" />
- <text type="string" length="12" name="TimeText" tool_tip="Hora atual (Pacific)">
+ <button label="" label_selected="" name="buycurrency" tool_tip="Compras"/>
+ <text length="12" name="TimeText" tool_tip="Hora atual (Pacific)" type="string">
12:00 AM
</text>
- <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script" />
- <button label="" label_selected="" name="health" tool_tip="Saúde" />
- <text type="string" length="1" name="HealthText" tool_tip="Saúde">
+ <string name="StatBarDaysOfWeek">
+ Domingo:Segunda-feira:terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
+ </string>
+ <string name="StatBarMonthsOfYear">
+ Janeiro: Fevereiro: Março: Abril: Maio: Junho: Julho: Agosto: Setembro: Outubro: Novembro: Dezembro
+ </string>
+ <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/>
+ <button label="" label_selected="" name="health" tool_tip="Saúde"/>
+ <text length="1" name="HealthText" tool_tip="Saúde" type="string">
100%
</text>
- <button label="" label_selected="" name="fly" tool_tip="Sem voar." />
- <button label="" label_selected="" name="build" tool_tip="Sem construções." />
- <button label="" label_selected="" name="scripts" tool_tip="Sem scripts." />
- <button label="" label_selected="" name="restrictpush"
- tool_tip="Restriro llEmpurrar objeto." />
- <button label="" label_selected="" name="buyland" tool_tip="Comprar esse pedaço" />
- <line_editor label="Procurar" name="search_editor" tool_tip="Procurar em Second Life" />
- <text name="packet_loss_tooltip">
+ <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/>
+ <button label="" label_selected="" name="no_build" tool_tip="construir/Rezzar não permitido"/>
+ <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/>
+ <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/>
+ <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponível aqui"/>
+ <button label="" label_selected="" name="buyland" tool_tip="Comprar esse pedaço"/>
+ <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/>
+ <button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/>
+ <string name="packet_loss_tooltip">
Perda de pacote
- </text>
- <text name="bandwidth_tooltip">
+ </string>
+ <string name="bandwidth_tooltip">
Banda
- </text>
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_toolbar.xml b/indra/newview/skins/default/xui/pt/panel_toolbar.xml
index 8f62b7b..6f66d24 100644
--- a/indra/newview/skins/default/xui/pt/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_toolbar.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="toolbar">
+ <string name="Redock Windows">
+ Reagrupar as janelas
+ </string>
<layout_stack name="toolbar_stack">
- <button label="MI" name="im_btn" tool_tip="Mensagens Instantâneas para seus amigos" />
- <button label="" name="chat_btn"
- tool_tip="Conversar com as pessoas próximas. (Enter)" />
- <button label="Amigos" name="friends_btn"
- tool_tip="Ache e converse com os seus camaradas." />
- <button label="Voar" label_selected="Parar de voar" name="fly_btn"
- tool_tip="Comece a voar. Use E/C ou PgUp/PgDn para voar para cima e para baixo." />
- <button label="Foto" name="snapshot_btn"
- tool_tip="Salve uma foto em seu disco ou inventário." />
- <button label="Procurar" name="directory_btn"
- tool_tip="Procurar por lugares, eventos, pessoas, e muito mais." />
- <button label="Construir" name="build_btn" tool_tip="Construa novos objetos" />
- <button label="Mini-Mapa" name="radar_btn"
- tool_tip="Mapa da área próxima a você. (Ctrl-Shift-M)" />
- <button label="Mapa" name="map_btn" tool_tip="Map do mundo todo. (Ctrl-M)" />
- <button label="Inventário" name="inventory_btn" tool_tip="Seus itens. (Ctrl-I)" />
- </layout_stack>
+ <button label="" name="chat_btn" tool_tip="Mostrar a barra de Conversa por Texto. (Enter)"/>
+ <flyout_button label="Comunicar-se" name="communicate_btn" tool_tip="Comunicar-se com seus Amigos e Grupos."/>
+ <button label="Voar" label_selected="Parar de voar." name="fly_btn" tool_tip="Começar a voar. Use E/C ou PgUp/PgDn para voar para cima ou para baixo."/>
+ <button label="Instantâneo" name="snapshot_btn" tool_tip="Salvar uma foto da tela no disco ou no inventário."/>
+ <button label="Busca" name="directory_btn" tool_tip="Busca a lugares, eventos, pessoas e mais."/>
+ <button label="Construir" name="build_btn" tool_tip="Criar novos objetos."/>
+ <button label="Mapa" name="map_btn" tool_tip="Mapa do Mundo. (Ctrl-M)"/>
+ <button label="Mini-Mapa" name="radar_btn" tool_tip="Mapa da área ao seu redor. (Ctrl-Shift-M)"/>
+ <button label="Inventário" name="inventory_btn" tool_tip="Seus itens. (Ctrl-I)"/>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_controls.xml b/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
new file mode 100644
index 0000000..549256f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="voice_controls">
+ <button label="" name="speakers_btn" tool_tip="Mostra os residents que estão usando bate-papo em voz em torno de ti."/>
+ <button label="Falar" name="push_to_talk" tool_tip="Segure o botão para falar"/>
+ <button label="" name="ptt_lock" tool_tip="Clique na fechadura para entrar no modo de falar"/>
+ <button label="" name="show_channel" tool_tip="Clique para mostrar o canal corrente de voz"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_enable.xml b/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
new file mode 100644
index 0000000..c6e6b0f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="content_panel">
+ <text_editor name="voice_intro_text1">
+ Bem-vindo ao Bate-Papo em voz do Second Life! O Bate-papo em Voz lhe permite falar com outros residentes. Este assistente irá guiá-lo através dos passos necessários para configurar o Bate-papo em voz. Utiliza-lo exige falantes e áudio, se quiser falar com outras pessoas, use um microfone ou headset estéreo com microfone.
+ </text_editor>
+ <text_editor name="voice_intro_text2">
+ Bate-papo em voz é ativado por padrão. Quer continuar usando a conversa em voz?
+ </text_editor>
+ <radio_group name="voice_enable">
+ <radio_item name="1">
+ Sim, continue com o Bate-papo em Voz.
+ </radio_item>
+ <radio_item name="0">
+ Não, desative o Bate-papo em Voz.
+ </radio_item>
+ </radio_group>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_options.xml b/indra/newview/skins/default/xui/pt/panel_voice_options.xml
new file mode 100644
index 0000000..31468b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_voice_options.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="content_panel">
+ <check_box label="Permitir somente amigos de iniciar chamadas de voz comigo." name="friends_only_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml b/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..feb407e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="voice_remote">
+ <button label="" name="end_call_btn" tool_tip="Clique para deixar em espera"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
new file mode 100644
index 0000000..c57cefa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+ It is only for those strings which don't belong in a floater.
+ For example, the strings used in avatar chat bubbles, and strings
+ that are returned from one component and may appear in many places-->
+<strings>
+ <string name="LoginInProgress">
+ Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
+ </string>
+ <string name="LoginAuthenticating">
+ Autenticando
+ </string>
+ <string name="LoginMaintenance">
+ Executando manutenção da conta...
+ </string>
+ <string name="LoginAttempt">
+ Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]
+ </string>
+ <string name="LoginPrecaching">
+ Carregando mundo...
+ </string>
+ <string name="LoginInitializingBrowser">
+ Inicializando navegador embutido...
+ </string>
+ <string name="LoginInitializingMultimedia">
+ Inicializando multimídia...
+ </string>
+ <string name="LoginVerifyingCache">
+ Verificando arquivos no cache (pode levar 60-90 segundos)...
+ </string>
+ <string name="LoginProcessingResponse">
+ Processando Resposta...
+ </string>
+ <string name="LoginInitializingWorld">
+ Inicializando Mundo...
+ </string>
+ <string name="LoginDecodingImages">
+ Decodificando imagens...
+ </string>
+ <string name="LoginInitializingQuicktime">
+ Inicializando o QuickTime...
+ </string>
+ <string name="LoginQuicktimeNotFound">
+ O QuickTime não foi encontrado - incapaz de inicializar.
+ </string>
+ <string name="LoginQuicktimeOK">
+ O QuickTime foi inicializado com sucesso.
+ </string>
+ <string name="LoginWaitingForRegionHandshake">
+ Aguardando o handshake com a região...
+ </string>
+ <string name="LoginConnectingToRegion">
+ Conectando à região...
+ </string>
+ <string name="LoginDownloadingClothing">
+ Baixando roupas...
+ </string>
+ <string name="LoginFailedNoNetwork">
+ Erro de Rede: Não foi possível estabelecer uma conexão. Por favor, verifique sua conexão de rede.
+ </string>
+ <string name="AgentLostConnection">
+ Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
+ </string>
+ <string name="TooltipPerson">
+ Pessoa
+ </string>
+ <string name="TooltipNoName">
+ (sem nome)
+ </string>
+ <string name="TooltipOwner">
+ Proprietário:
+ </string>
+ <string name="TooltipPublic">
+ Público
+ </string>
+ <string name="TooltipIsGroup">
+ (Grupo)
+ </string>
+ <string name="TooltipFlagScript">
+ Script
+ </string>
+ <string name="TooltipFlagPhysics">
+ Física
+ </string>
+ <string name="TooltipFlagTouch">
+ Toque
+ </string>
+ <string name="TooltipFlagL$">
+ L$
+ </string>
+ <string name="TooltipFlagDropInventory">
+ Largar Estoque
+ </string>
+ <string name="TooltipFlagPhantom">
+ Imaterial
+ </string>
+ <string name="TooltipFlagTemporary">
+ Temporário
+ </string>
+ <string name="TooltipFlagRightClickMenu">
+ (Clique com o botão direito para acessar o menu)
+ </string>
+ <string name="TooltipFreeToCopy">
+ Cópia Permitida
+ </string>
+ <string name="TooltipForSaleL$">
+ À venda: L$[AMOUNT]
+ </string>
+ <string name="TooltipForSaleMsg">
+ À venda: [MESSAGE]
+ </string>
+ <string name="TooltipFlagGroupBuild">
+ Construído por Grupo
+ </string>
+ <string name="TooltipFlagNoBuild">
+ Não é Permitido Construir
+ </string>
+ <string name="TooltipFlagNoEdit">
+ Construído por Grupo
+ </string>
+ <string name="TooltipFlagNotSafe">
+ Não é Seguro
+ </string>
+ <string name="TooltipFlagNoFly">
+ Não é Permitido Voar
+ </string>
+ <string name="TooltipFlagGroupScripts">
+ Scripts de Grupo
+ </string>
+ <string name="TooltipFlagNoScripts">
+ Não são Permitidos Scripts
+ </string>
+ <string name="TooltipLand">
+ Terreno:
+ </string>
+ <string name="TooltipMustSingleDrop">
+ Apenas um item único pode ser arrastado para este local
+ </string>
+ <string name="RetrievingData">
+ Buscando...
+ </string>
+ <string name="ReleaseNotes">
+ Notas de Distribuição
+ </string>
+ <string name="LoadingData">
+ Carregando...
+ </string>
+ <string name="AvatarNameNobody">
+ (ninguém)
+ </string>
+ <string name="AvatarNameWaiting">
+ (aguardando)
+ </string>
+ <string name="AvatarNameHippos">
+ (hippos)
+ </string>
+ <string name="GroupNameNone">
+ (nenhum)
+ </string>
+ <string name="AssetErrorNone">
+ Nenhum erro
+ </string>
+ <string name="AssetErrorRequestFailed">
+ Valor pedido falhou
+ </string>
+ <string name="AssetErrorNonexistentFile">
+ Valor pedido: arquivo inexistente
+ </string>
+ <string name="AssetErrorNotInDatabase">
+ Valor pedido: valor não encontrado na base de dados.
+ </string>
+ <string name="AssetErrorEOF">
+ Fim do arquivo
+ </string>
+ <string name="AssetErrorCannotOpenFile">
+ Não é possível abrir arquivo
+ </string>
+ <string name="AssetErrorFileNotFound">
+ Arquivo não encontrado
+ </string>
+ <string name="AssetErrorTCPTimeout">
+ Tempo de transferência de arquivo expirado
+ </string>
+ <string name="AssetErrorCircuitGone">
+ Circuito caiu (Circuit gone)
+ </string>
+ <string name="AssetErrorUnknownStatus">
+ Status desconhecido
+ </string>
+ <string name="AvatarEditingApparance">
+ (Editando Aparência)
+ </string>
+ <string name="AvatarAway">
+ Distante
+ </string>
+ <string name="AvatarBusy">
+ Ocupado
+ </string>
+ <string name="AvatarMuted">
+ Emudecido
+ </string>
+ <string name="anim_express_afraid">
+ Temeroso
+ </string>
+ <string name="anim_express_anger">
+ Bravo
+ </string>
+ <string name="anim_away">
+ Distante
+ </string>
+ <string name="anim_backflip">
+ Virar para trás
+ </string>
+ <string name="anim_express_laugh">
+ Rir segurando a barriga
+ </string>
+ <string name="anim_express_toothsmile">
+ Sorriso largo
+ </string>
+ <string name="anim_blowkiss">
+ Mandar beijo
+ </string>
+ <string name="anim_express_bored">
+ Entediado
+ </string>
+ <string name="anim_bow">
+ Saudar curvando
+ </string>
+ <string name="anim_clap">
+ Aplaudir
+ </string>
+ <string name="anim_courtbow">
+ Saudação formal
+ </string>
+ <string name="anim_express_cry">
+ Chorar
+ </string>
+ <string name="anim_dance1">
+ Dança 1
+ </string>
+ <string name="anim_dance2">
+ Dança 2
+ </string>
+ <string name="anim_dance3">
+ Dança 3
+ </string>
+ <string name="anim_dance4">
+ Dança 4
+ </string>
+ <string name="anim_dance5">
+ Dança 5
+ </string>
+ <string name="anim_dance6">
+ Dança 6
+ </string>
+ <string name="anim_dance7">
+ Dança 7
+ </string>
+ <string name="anim_dance8">
+ Dança 8
+ </string>
+ <string name="anim_express_disdain">
+ Desdén
+ </string>
+ <string name="anim_drink">
+ Beber
+ </string>
+ <string name="anim_express_embarrased">
+ Envergonhado
+ </string>
+ <string name="anim_angry_fingerwag">
+ Negar com o dedo.
+ </string>
+ <string name="anim_fist_pump">
+ Vibrar provocando
+ </string>
+ <string name="anim_yoga_float">
+ Levitar Yoga
+ </string>
+ <string name="anim_express_frown">
+ Careta
+ </string>
+ <string name="anim_impatient">
+ Impaciente
+ </string>
+ <string name="anim_jumpforjoy">
+ Pular de Alegria
+ </string>
+ <string name="anim_kissmybutt">
+ Beije meu Bumbum
+ </string>
+ <string name="anim_express_kiss">
+ Beijar
+ </string>
+ <string name="anim_laugh_short">
+ rir
+ </string>
+ <string name="anim_musclebeach">
+ Exibir músculos
+ </string>
+ <string name="anim_no_unhappy">
+ Não (descontente)
+ </string>
+ <string name="anim_no_head">
+ Não
+ </string>
+ <string name="anim_nyanya">
+ Nya-nya-nya
+ </string>
+ <string name="anim_punch_onetwo">
+ Um-Dois soco
+ </string>
+ <string name="anim_express_open_mouth">
+ Abrir a boca
+ </string>
+ <string name="anim_peace">
+ Paz
+ </string>
+ <string name="anim_point_you">
+ Apontar para o outro
+ </string>
+ <string name="anim_point_me">
+ Apontar para si
+ </string>
+ <string name="anim_punch_l">
+ Socar Esquerda
+ </string>
+ <string name="anim_punch_r">
+ Socar Direita
+ </string>
+ <string name="anim_rps_countdown">
+ RPS contar
+ </string>
+ <string name="anim_rps_paper">
+ RPS papel
+ </string>
+ <string name="anim_rps_rock">
+ RPS pedra
+ </string>
+ <string name="anim_rps_scissors">
+ RPS tesoura
+ </string>
+ <string name="anim_express_repulsed">
+ Repulsa
+ </string>
+ <string name="anim_kick_roundhouse_r">
+ Chute giratório
+ </string>
+ <string name="anim_express_sad">
+ Triste
+ </string>
+ <string name="anim_salute">
+ Saúde
+ </string>
+ <string name="anim_shout">
+ Gritar
+ </string>
+ <string name="anim_express_shrug">
+ Encolher ombros
+ </string>
+ <string name="anim_express_smile">
+ Sorrir
+ </string>
+ <string name="anim_smoke_idle">
+ Fumar a toa
+ </string>
+ <string name="anim_smoke_inhale">
+ Inalar Fumaça
+ </string>
+ <string name="anim_smoke_throw_down">
+ Expelir Fumaça
+ </string>
+ <string name="anim_express_surprise">
+ Surpresa
+ </string>
+ <string name="anim_sword_strike_r">
+ Golpe de Espada
+ </string>
+ <string name="anim_angry_tantrum">
+ Enraivecer
+ </string>
+ <string name="anim_express_tongue_out">
+ Mostrar a língua
+ </string>
+ <string name="anim_hello">
+ Onda
+ </string>
+ <string name="anim_whisper">
+ Sussurrar
+ </string>
+ <string name="anim_whistle">
+ Assobiar
+ </string>
+ <string name="anim_express_wink">
+ Piscar
+ </string>
+ <string name="anim_wink_hollywood">
+ Piscar (Hollywood)
+ </string>
+ <string name="anim_express_worry">
+ Preocupar-se
+ </string>
+ <string name="anim_yes_happy">
+ Sim (Feliz)
+ </string>
+ <string name="anim_yes_head">
+ Sim
+ </string>
+ <string name="texture_loading">
+ Carregando...
+ </string>
+ <string name="worldmap_offline">
+ Desconectado
+ </string>
+ <string name="whisper">
+ sussurra:
+ </string>
+ <string name="shout">
+ grita:
+ </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index b3f1c39..df6dc2c 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -1,56 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<teleport_messages>
<message_set name="errors">
<message name="invalid_tport">
- Foi encontrado um problema na sua solicitação de teleport. Você
- provavelmente precisará entrar no Second Life novamente
- antes de teleportar-se. Se esse problema persistir, por favor
- verifique o FAQ do suporte técnico em www.secondlife.com/support.
+ Problema encontrado ao processar seu pedido de Teleporte. Você pode tentar reiniciar antes de tentar teleportar. Se você continuar a receber essa mensagem, por favor cheque a FAQ do Suporte Técnico em:
+www.secondlife.com/support
</message>
<message name="invalid_region_handoff">
- Foi encontrado um problema ao processar sua transição entre as
- regiões. Você provavelmente precisará entrar no Second Life
- novamente antes de conseguir passar entre regiões.
- Se esse problema persistir, por favor verifique o FAQ do suporte
- técnico em www.secondlife.com/support.
+ Problema encontrado ao processar a passage de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber essa mensagem, por favor cheque a FAQ do Suporte Técnico em:
+www.secondlife.com/support
</message>
<message name="blocked_tport">
- Desculpe, teleport temporariamente bloqueado. Tente novamente em
- alguns instantes. Se você ainda não puder teleportar-se, por favor,
- entre novamente no Second Life para resolver seu problema.
+ Desculpe, Teleportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teleporte, por favor tente deslogar e relogar para resolver o problema.
</message>
<message name="nolandmark_tport">
Desculpe, mas o sistema não conseguiu localizar a landmark de destino.
</message>
<message name="timeout_tport">
- Desculpe, mas o sistema está incapaz de completar sua conexão para o
- teleport. Tente novamente em alguns instantes.
+ Desculpe, não foi possível para o sistema executar o teleporte, Tente novamente dentro de alguns instantes.
</message>
<message name="noaccess_tport">
Desculpe, você não tem permissão para acessar esse destino.
</message>
<message name="missing_attach_tport">
- Seus anexos não foram carregados ainda. Tente esperar por alguns
- segundos ou entre no Second Life novamente antes de tentar
- teleportar-se.
+ Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleportar novamente.
</message>
<message name="too_many_uploads_tport">
- A fila de recursos nesta região está sobrecarregada portanto sua solicitação
- de teleport não pode ser atendida em tempo hábil. Por favor tente novamente
- em alguns minutos ou vá para uma área menos carregada.
+ A fluxo nesta região é atualmente tão alto e entupido que seu pedido de teleporte não será possível teleportar com êxito em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada.
</message>
<message name="expired_tport">
- Desculpe, mas o sistema não foi capaz de completar sua solicitação
- de teleport. Por favor, tente novamente em alguns minutos.
+ Desculpe, mas o sistema não conseguiu concluir o seu pedido teleporte em tempo hábil. Por favor, tente novamente em alguns minutos.
</message>
<message name="expired_region_handoff">
- Desculpe, mas o sistema não foi capaz de completar transição entre
- as regiões. Por favor, tente novamente em alguns minutos.
+ Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos.
</message>
<message name="no_host">
- Não foi possível encontrar o destino para o teleport. O destino
- pode estar temporariamente indisponível ou não existir mais.
- Por favor, tente novamente em alguns minutos.
+ Não foi possível encontrar o destino do teleporte. O destino pode estar temporariamente indisponível ou não existir mais. Por favor, tente novamente em poucos minutos.
+ </message>
+ <message name="no_inventory_host">
+ O sistema de inventário está indisponível no momento.
</message>
</message_set>
<message_set name="progress">
diff --git a/indra/newview/skins/default/xui/zh/alerts.xml b/indra/newview/skins/default/xui/zh/alerts.xml
index a8e2b2a..666f0ab 100644
--- a/indra/newview/skins/default/xui/zh/alerts.xml
+++ b/indra/newview/skins/default/xui/zh/alerts.xml
@@ -1,27 +1,36 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<alerts>
+ <global name="skipnexttime">
+ 下次不要再让我看这个了
+ </global>
+ <global name="alwayschoose">
+ 总是选择该选项
+ </global>
<alert name="MissingAlert">
<message name="message">
- [ALERT_NAME]从alerts.xml中遗失!
+ alerts.xml 中找不到 [ALERT_NAME]!
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="FloaterNotFound">
<message name="message">
- 处理错误: 无法找到以下调节:
+ 浮动框错误: 无法找到以下控件:
[CONTROLS]
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
- <alert name="MOTD" title="通知天数">
+ <alert name="TutorialNotFound">
<message name="message">
- [MOTD]
+ 现在还没有可用的教程。
</message>
+ <option name="OK">
+ 确定
+ </option>
</alert>
<alert name="GenericAlert">
<message name="message">
@@ -46,41 +55,28 @@
</alert>
<alert name="ConnectTimeout">
<message name="message">
- 无法连接到[SECOND_LIFE].
+ 无法连接到 [SECOND_LIFE].
系统可能出现故障。
-请几分钟后再试, 或点击帮助
+
+请稍候再试, 或点击帮助
获得建议和到达系统状态的网页链接。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
</option>
</alert>
- <alert name="RemoveWearableSave">
- <message name="message">
- 保存目前对衣物/身体部位的更改?
- </message>
- <option name="Save">
- 存储
- </option>
- <option name="Don'tSave">
- 禁止储存
- </option>
- <option name="Cancel">
- 取消
- </option>
- </alert>
- <alert name="SetWearableSave">
+ <alert name="WearableSave">
<message name="message">
- 保存目前对衣物/身体部位的更改?
+ 保存对当前衣物/身体部位的更改？
</message>
<option name="Save">
- 存储
+ 保存
</option>
<option name="Don'tSave">
- 禁止储存
+ 不保存
</option>
<option name="Cancel">
取消
@@ -93,12 +89,12 @@
</alert>
<alert name="CompileQueueSaveBytecode">
<message name="message">
- 上传汇编脚本时出错，出于以下原因: [REASON]。请稍候再试。
+ 上传已编译脚本代码时出错，出于以下原因: [REASON]。请稍候再试。
</message>
</alert>
<alert name="WriteAnimationFail">
<message name="message">
- 无法写入动画数据
+ 无法写入动画数据。请稍候再试。
</message>
</alert>
<alert name="UploadAuctionSnapshotFail">
@@ -108,62 +104,65 @@
</alert>
<alert name="UnableToViewContentsMoreThanOne">
<message name="message">
- 一次不能浏览一个以上的物品.
-请只选择一个东东重试.
+ 一次不能浏览一个以上物品的内容。
+请只选择一个物体后重试。
</message>
</alert>
<alert name="MustSupplyVoteProposal">
<message name="message">
- 你必须为选举给出提名人。.
+ 你必须为投票给出提议。
键入一条社团目标的简短描述。
</message>
</alert>
<alert name="InsufficientFunds">
<message name="message">
- 资金充足。
+ 资金不足。
</message>
</alert>
<alert name="CharacterSnapshotSaved">
<message name="message">
- 你的形象快照已经保存。
-
+ 你的角色的快照已经保存。
查看形象请访问网络工作室的陈列馆。
</message>
</alert>
<alert name="SaveClothingBodyChanges">
<message name="message">
- 保存所有对衣物/身体部位的更改?
+ 保存所有对衣物/身体部位的更改？
</message>
<option name="SaveAll">
- 储存全部
+ 全部保存
</option>
<option name="Don'tSave">
- 禁止储存
+ 不保存
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="AlterModifyRights">
+ <alert name="GrantModifyRights">
<message name="message">
- 你是否要[ACTION]更改权利[DERECTION] [FIRST_NAME] [LAST_NAME]?
+ 授予另外一名居民修改的权利，意味着允许他们修改、删除或拿走
+任何你在世界里可能拥有的物品。请在执行这项许可的时候格外小心。
+你真的希望授予[FIRST_NAME] [LAST_NAME]修改权利吗？
</message>
<option name="Yes">
- 是
+ 是的，我愿意
</option>
<option name="No">
- 否
+ 不，我想再考虑一下
</option>
</alert>
- <alert name="GrantModifyRights">
+ <alert name="GrantModifyRightsMultiple">
<message name="message">
- 授予另外一名居民修改的权利，则意味着允许他们修改任何你再第二人生世界里可能拥有的物品。请在执行这项许可的时候格外小心。 你真的希望授予[FIRST_NAME] [LAST_NAME]修改权利吗？
+ 授予另外一名居民修改的权利，意味着允许他们修改、删除或拿走
+任何你在世界里可能拥有的物品。请在执行这项许可的时候格外小心。
+你真的希望授予所选择的居民修改权利吗？
</message>
<option name="Yes">
是的，我愿意
</option>
<option name="No">
- 不是，我想再考虑一下
+ 不，我想再考虑一下
</option>
</alert>
<alert name="RevokeModifyRights">
@@ -174,12 +173,23 @@
是的，我愿意
</option>
<option name="No">
- 不是，我想再考虑一下
+ 不，我想再考虑一下
+ </option>
+ </alert>
+ <alert name="RevokeModifyRightsMultiple">
+ <message name="message">
+ 你真的希望撤回所选居民的修改权利吗？
+ </message>
+ <option name="Yes">
+ 是的，我愿意
+ </option>
+ <option name="No">
+ 不，我想再考虑一下
</option>
</alert>
<alert name="RemoveFriend">
<message name="message">
- 你是否要将[FIRST_NAME] [LAST_NAME]移出你的朋友圈?
+ 你是否要将[FIRST_NAME] [LAST_NAME]从你的朋友列表中去除？
</message>
<option name="Remove">
移除
@@ -199,7 +209,7 @@
[MESSAGE]
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="PanelGroupApply">
@@ -211,7 +221,7 @@
应用更改
</option>
<option name="IgnoreChanges">
- 忽视更改
+ 忽略更改
</option>
<option name="Cancel">
取消
@@ -221,13 +231,13 @@
<message name="message">
创建一个新社团需花费 L$[COST].
-要想保持一个新社团超过三天,你的社团总人数必须达到三人获三人以上。
+要想保持一个新社团超过三天，你的社团总人数必须达到三人或三人以上。
是否创建新社团?
</message>
<option name="Create">
- 创造
+ 创建
</option>
<option name="Cancel">
取消
@@ -235,18 +245,18 @@
</alert>
<alert name="CreateGroupCannotAfford">
<message name="message">
- 建立社团将花费 L$[花费].
-你没有足够的钱来建立此社团。
+ 建立社团将花费 L$[COST].
+你没有足够的 L$ 来建立此社团。
</message>
</alert>
<alert name="GroupNameTooShort">
<message name="message">
- 社团名必须包含至少4个字母。
+ 社团名必须至少4个字母长。
</message>
</alert>
<alert name="GroupNameUsesReservedWord">
<message name="message">
- 社团名已被预订。 请另外
+ 社团名中带有不能使用的词。 请另外
选择一个名字。
</message>
</alert>
@@ -255,18 +265,25 @@
你必须为发送给社团的通知拟定一个主题.
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="MustSupplyGroupCharter">
<message name="message">
请为社团制定一个规章。
+简短地描述社团的目标。
</message>
</alert>
<alert name="AddGroupOwnerWarning">
<message name="message">
- 你将添加社团会员至角色[ROLE_NAME]中。会员不能从该角色中被移除。会员必须自己从角色中辞职。你真的愿意继续吗？
+ 你将添加社团会员至角色 [ROLE_NAME] 中。
+会员不能从该角色中被移除。
+会员必须自己从角色中辞职。
+你真的愿意继续吗？
</message>
+ <ignore name="ignore">
+ 当添加社团会员到团长角色时
+ </ignore>
<option name="Yes">
是
</option>
@@ -276,12 +293,15 @@
</alert>
<alert name="AssignDangerousActionWarning">
<message name="message">
- 你将添加能力'[ACTION_NAME]'至角色'[ROLE_NAME]'中。
+ 你将为角色 ‘[ROLE_NAME]’ 添加 ‘[ACTION_NAME]’ 的能力。
*警告*
- 任何角色中的会员拥有这项能力后，都可以分配给他们自己，或者任何其他的会员各种角色，这些角色的权利可能比他们目前所拥有的大得多，并很可能提拔他们自己到最靠近主人权利的位置上。请在分配这项能力之前确定自己这么做将带来的后果。
+任何具有该角色的会员拥有这项能力后，都可以给他们自己——以及
+任何其他的会员各种角色——分配权利比他们目前所拥有的权利大得多
+的角色，并可能提拔他们自己到相近于团长权利的位置上。
+请在分配这项能力之前确定自己这么做将带来的后果。
-你是否愿意添加这个能力至'[ROLE_NAME]'?
+你是否愿意添加这个能力至 ‘[ROLE_NAME]’?
</message>
<option name="Yes">
是
@@ -295,7 +315,7 @@
你将添加能力'[ACTION_NAME]'至角色 '[ROLE_NAME]'中。
*警告*
- 任何角色中的会员拥有这项能力后，都可以分配给他们自己，或者其他会员所有的能力，甚至可以提拔他们自己到最靠近主人的权利的位置上。
+任何具有该角色的会员拥有这项能力后，都可以给他们自己——或者其他会员——分配所有的能力，甚至可以提拔他们自己到相近于团长权利 的位置上。
你是否愿意添加这项能力至 '[ROLE_NAME]'?
</message>
@@ -313,82 +333,107 @@
</alert>
<alert name="ClickPublishHelpLand">
<message name="message">
- 选择 "在网络上发布"选项将允许我们发布土地的名称，描述，快照和地点至[SECOND_LIFE]网站。如果你发布的内容，根据社区标准规定，涉及到成人内容，你有责任对此作出声明。
+ 选择 "在搜索中发布"
+这个选项将会:
+- 在搜索结果中显示该地块
+- 显示该地块的公开物体
+- 在网页搜索中显示这个地块
+ </message>
+ </alert>
+ <alert name="ClickPublishHelpLandDisabled">
+ <message name="message">
+ 你不能让这个地块显示在搜索中，因为它所在的地区禁止这样做。
</message>
</alert>
<alert name="ClickPublishHelpPostcard">
<message name="message">
- 选择 "在网络上发布"选项将允许我们发布摄影师在[SECOND_LIFE]的名字，工作，地点，信息和快照至[SECOND_LIFE]网站。如果你发布的任何快照内容，根据社区标准规定，涉及到成人内容，你有责任对此作出声明。
+ 选择 "在网络上发布"选项将允许我们发布摄影师在[SECOND_LIFE]的名字、主题、地点、信息和快照至[SECOND_LIFE]网站。如果你发布的任何快照内容，根据社区标准规定，涉及到成人内容，你有责任对此作出声明。
</message>
</alert>
<alert name="ClickPublishHelpAvatar">
<message name="message">
- 选择 "在网络上发布"选项将允许我们发布你的名字，图像，和‘关于自己’的文本至[SECOND_LIFE]网站。
+ 选择 "在搜索中显示" 将会:
+ - 在搜索结果中显示我的档案
+ - 在公开社团的页面中显示到我的档案的链接
</message>
</alert>
+ <alert name="ClickPartnerHelpAvatar">
+ <message name="message">
+ 你可以通过[SECOND_LIFE] 网站邀请另一位居民成为你的搭档，或者解除现存的关系。
+
+到[SECOND_LIFE]网站查询关于搭档的信息吗？
+ </message>
+ <option name="GotoPage">
+ 打开网页
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
<alert name="ClickWebProfileHelpAvatar">
<message name="message">
- If this resident has a web profile URL set then you can:
- * Click Load to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
+ 如果该居民设置了网络档案URL的话你可以:
+ * 选择“加载“来用内部浏览器打开这个档案页面。
+ * 选择 加载 > “在外部浏览器中打开” 来在外部浏览。
+ * 如果您浏览到了其他的地方，点击加载 > “返回原来页面” 来回到居民的 Web 档案。
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+在你的档案中你可以输入任何URL作为你的网络档案然后按确认来设置。
+其他居民在观看你的档案的时候可以访问你所指定的URL。
</message>
</alert>
<alert name="ClickWebProfileNoWebHelpAvatar">
<message name="message">
- If this resident has a web profile URL set then you can:
- * Click Open to view externally in your default web browser.
+ 如果该居民设置了网络档案URL的话你可以:
+ * 用你的默认浏览器打开这个档案页面。
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+在你的档案中你可以输入任何URL作为你的网络档案。
+其他居民在观看你的档案的时候可以访问你所指定的URL。
</message>
</alert>
<alert name="ReputationMinGreaterThanMax">
<message name="message">
声望最小值比最大值大。
-降低最小值或提高最大值。
+请降低最小值或提高最大值。
</message>
</alert>
<alert name="MoneyMinGreaterThanMax">
<message name="message">
钱的最小限度比最大限度大。
-可以降低最小值或者提高最大值。
+请降低最小值或者提高最大值。
</message>
</alert>
<alert name="OfficerTitleTooLong">
<message name="message">
- 官员头衔最多可以包含20个词。
-请选择一个较短头衔。
+ 官员头衔最多可以包含20个字。
+请选择一个较短的头衔。
</message>
</alert>
<alert name="MemberTitleTooLong">
<message name="message">
- 成员头衔最多可以包含20个词。
+ 成员头衔最多可以包含20个字。
请选择一个较短的头衔。
</message>
</alert>
<alert name="RunningLocally">
<message name="message">
- 本地运行...
-没有找到你的数据.
+ 在本地运行...
+将不会给你任何的数据。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="EjectNoMemberSelected">
<message name="message">
- 没有选定要驱逐成员。
+ 没有选定要驱逐的成员。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="ConfirmEject">
<message name="message">
- 这将会把[MEMBER]驱逐出社团
+ 这将会把 [MEMBER] 驱逐出社团。
你确定要继续吗?
</message>
<option name="Eject">
@@ -413,16 +458,16 @@ Residents can visit the URL you specify when they view your profile.
<alert name="JoinGroupCannotAfford">
<message name="message">
加入该社团需花费 L$[COST].
-加入该社团后，你并不是一定要留有结余。
+您拥有的 L$ 不够。
</message>
</alert>
<alert name="LandBuyPass">
<message name="message">
- 花费L$[COST]你就可以进入这块土地('[PARCEL_NAME]')
+ 花费 L$[COST] 你就可以进入这块土地('[PARCEL_NAME]')
[TIME]小时。是否购买通行证?
</message>
<option name="OK">
- OK
+ 购买
</option>
<option name="Cancel">
取消
@@ -431,25 +476,37 @@ Residents can visit the URL you specify when they view your profile.
<alert name="CannotStartAuctionAlreadyForSale">
<message name="message">
你不能对已经设置为代售的土地进行
-拍卖. 如果你执意开始拍卖，必须种植该土地
-的销售.
+拍卖。如果你执意开始拍卖，必须中止该土地
+的销售。
</message>
</alert>
<alert name="SalePriceRestriction">
<message name="message">
- 不管出售给何人，出售价格必须 > L$0。
+ 如果出售给任何人，出售价格必须 > L$0。
如果售价为L$0，请选定一个用户来售出。
</message>
</alert>
<alert name="ConfirmLandSaleChange">
<message name="message">
- 所选的[LAND_SIZE]平方米土地正被设置为代售。
-你的售价应当为 L$[SALE_PRICE]并将被审定为售给[NAME]。
-
-你愿意继续改变吗?
+ 所选的 [LAND_SIZE]平方米土地正被设置为代售。
+你的售价将是为 L$[SALE_PRICE]并将被授权售给[NAME]。
</message>
<option name="Continue">
- 继续
+ 确定
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="ConfirmLandSaleToAnyoneChange">
+ <message name="message">
+ 请注意: 点击 '售出给任何人' 将使你的土地对整个第二人生社区开放，包括当前不在这个地区中的人。
+
+所选的 [LAND_SIZE]平方米土地正被设置为代售。
+你的售价将是为 L$[SALE_PRICE]并将被授权售给[NAME]。
+ </message>
+ <option name="Continue">
+ 确定
</option>
<option name="Cancel">
取消
@@ -457,15 +514,15 @@ Residents can visit the URL you specify when they view your profile.
</alert>
<alert name="ReturnObjectsDeededToGroup">
<message name="message">
- 你是否确定愿意归还在这块土地上由社团[NAME]分享的东东至它们原先主人的库存?
-已经转让给别的社团的，可移动的东东将被归还至它们原先的主人处。
+ 你是否确定返还在这块土地上由社团 '[NAME]'
+分享的物体至它们原先主人的库存?
-*警告* 这项操作将删除已转让至别的社团的不可移动的东东。
+*警告* 这项操作将删除该社团所分享的不可转让的物体！
-东东: [N]
+物体: [N]个
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -473,14 +530,13 @@ Residents can visit the URL you specify when they view your profile.
</alert>
<alert name="ReturnObjectsOwnedByUser">
<message name="message">
- Are you sure you want to return all objects owned by the
-resident '[NAME]' on this parcel of land
-back to their inventory?
+ 你是否确定返还居民 '[NAME]'
+在这地块上拥有的所有物体到他的库存？
-Objects: [N]
+物体: [N]个
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -488,12 +544,13 @@ Objects: [N]
</alert>
<alert name="ReturnObjectsOwnedBySelf">
<message name="message">
- 你是否确定愿意归还你在这块土地上拥有的所有东东至你的库存？
+ 你是否确定愿意返还你在这块土地上
+拥有的所有物体至你的库存？
-东东: [N]
+物体: [N]个
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -501,15 +558,16 @@ Objects: [N]
</alert>
<alert name="ReturnObjectsNotOwnedBySelf">
<message name="message">
- 你是否确定愿意归还在这块土地上所有不属于你自己的东东至它们主人的库存?
-已经转让给别的社团的，可移动的东东将被归还至它们原先的主人处。
+ 你是否确定返还在这块土地上所有不属于你自己的物体至
+它们主人的库存?已经转让给别的社团的，可转让的物体将
+被归还至它们原先的主人处。
-*警告* 这项操作将删除已转让至别的社团的不可移动的东东。
+*警告* 这项操作将删除该社团所分享的不可转让的物体！
-东东: [N]
+物体: [N]个
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -517,18 +575,17 @@ Objects: [N]
</alert>
<alert name="ReturnObjectsNotOwnedByUser">
<message name="message">
- Are you sure you want to return all objects NOT owned
-by [NAME] on this parcel of land back to their owner's inventory?
-Transferable objects deeded to a group will be
-returned to their previous owners.
+ 你是否确定返还在这块土地上所有*不*属于居民 [NAME] 的物体至
+它们主人的库存? 已经转让给别的社团的，可转让的物体将
+被归还至它们原先的主人处。
-*WARNING* This will delete the non-transferable objects
-deeded to the group!
+*警告* 这项操作将删除该社团所分享的不可转让的物体！
+
-Objects: [N]
+物体: [N]个
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -536,11 +593,10 @@ Objects: [N]
</alert>
<alert name="ReturnAllTopObjects">
<message name="message">
- Are you sure you want to return all objects
-in this region back to their owner's inventory?
+ 你确定要返还所有该区域中的物体至他们原先主人的库存中吗？
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -548,7 +604,7 @@ in this region back to their owner's inventory?
</alert>
<alert name="DisableAllTopObjects">
<message name="message">
- Are you sure you want to disable all objects in this region?
+ 你确定要禁止该区域中的所有物体吗？
</message>
<option name="Disable">
禁止
@@ -559,12 +615,14 @@ in this region back to their owner's inventory?
</alert>
<alert name="ReturnObjectsNotOwnedByGroup">
<message name="message">
- 是否归还这块土地上不由社团[NAME]分享的东东至它们的主人处？
+ 是否归还这块土地上不由
+社团 [NAME] 分享的物体
+至它们的主人处？
-对象: [N]
+物体: [N]个
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
@@ -572,9 +630,9 @@ in this region back to their owner's inventory?
</alert>
<alert name="UnableToDisableOutsideScripts">
<message name="message">
- 无法废除外部脚本。
-这整块区域都是正常状态(不安全).
-脚本必须被允许运行，枪才能够工作。
+ 无法禁用外部脚本。
+整块区域都是已启用伤害(不安全)。
+脚本必须被允许运行，才能使用武器。
</message>
</alert>
<alert name="MustBeInParcel">
@@ -585,7 +643,7 @@ in this region back to their owner's inventory?
</alert>
<alert name="PromptRecipientEmail">
<message name="message">
- 请键入接受者的电子邮件地址。
+ 请键入收件人的电子邮件地址。
</message>
</alert>
<alert name="PromptSelfEmail">
@@ -593,41 +651,30 @@ in this region back to their owner's inventory?
请键入你的电子邮件地址。
</message>
</alert>
- <alert name="ErrorProcessingSnapshot">
+ <alert name="PromptMissingSubjMsg">
<message name="message">
- 处理快照数据错误
+ 以默认标题或内容用电子邮件发送快照吗？
</message>
- </alert>
- <alert name="ConfirmNotecardSave">
- <message name="message">
- 只有保存这张提示卡之后，此项物品才可以复制或查看。是否保存提示卡？
- </message>
- <option name="Save">
- 是的，请保存
+ <option name="OK">
+ 确定
</option>
<option name="Cancel">
- 取消保存
+ 取消
</option>
</alert>
- <alert name="RemoveMultipleFromFriends">
+ <alert name="ErrorProcessingSnapshot">
<message name="message">
- 你希望从好友列表中移除若干好友吗？
+ 处理快照数据错误
</message>
- <option name="Remove">
- 是的，我要移除
- </option>
- <option name="Cancel">
- 取消
- </option>
</alert>
<alert name="ErrorEncodingSnapshot">
<message name="message">
- 编码快照错误!
+ 编码快照时发生错误
</message>
</alert>
<alert name="ErrorUploadingPostcard">
<message name="message">
- 上传明信片时出错，出于以下原因: [REASON]。
+ 发送快照时出现问题，出于以下原因: [REASON]。
</message>
</alert>
<alert name="ErrorUploadingReportScreenshot">
@@ -637,99 +684,78 @@ in this region back to their owner's inventory?
</alert>
<alert name="MustAgreeToLogIn">
<message name="message">
- 你必须同意服务协议才能继续登陆至[SECOND_LIFE]。
+ 你必须同意服务协议才能继续登陆至 [SECOND_LIFE]。
</message>
</alert>
<alert name="CouldNotPutOnOutfit">
<message name="message">
- 无法装载配置。
-配置文件夹不包含衣物，
+ 无法装载装束。
+装束文件夹中没有衣物、身体部位、或附件。
</message>
</alert>
<alert name="CannotWearTrash">
<message name="message">
- 无法使用垃圾栏内的衣物或身体部位。
+ 无法使用垃圾箱内的衣物或身体部位。
</message>
</alert>
<alert name="CannotWearInfoNotComplete">
<message name="message">
- 无法使用该物品，因为其完整信息显示其暂不可用。请稍候再试。
+ 无法穿上该物品，因为它还没有加载完。请稍候再试。
</message>
</alert>
- <alert name="MustHaveAccountToLogInNoLinks">
+ <alert name="MustHaveAccountToLogIn">
<message name="message">
- 你必须先创建一个新帐户才能登陆到[SECOND_LIFE].
+ 哎呀！有什么地方没填上。
+您必须输入您的化身的名和姓。
+
+您需要一个帐户才能进入[SECOND_LIFE]。您希望现在创建一个吗？
</message>
<option name="OK">
- OK
+ 创建新帐户
</option>
<option name="Cancel">
- 取消
+ 再试一次吧…
</option>
</alert>
- <alert name="MustHaveAccountToLogIn">
+ <alert name="AddClassified">
<message name="message">
- 你必须先创建一个新帐户才能登陆到[SECOND_LIFE].
+ 分类广告会在查找名录的 '分类广告' 栏目里保留一周时间。
+
-现在到www.secondlife.com注册新帐户?
+填写你的广告，然后点击 '发布...'，即会添加广告至广告名录中。
+当点击发布时，你将被要求支付发布广告费用。 大额支付意味着你的广告会在名单较前的地方出现，并且当用关键词查找时，你的广告也出现在查询结果较高的位置上。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
</option>
+ <ignore name="ignore">
+ 添加新分类广告时
+ </ignore>
</alert>
- <alert name="GrantedModifyRights">
- <message name="message">
- 你已经被授予特权，你可以任意修改[FIRST_NAME] [LAST_NAME]的东东。
- </message>
- </alert>
- <alert name="RevokedModifyRights">
- <message name="message">
- 你的特权已经被撤回，你不可以再任意修改[FIRST_NAME] [LAST_NAME]的东东。
- </message>
- </alert>
- <alert name="InvalidTerrainBitDepth">
- <message name="message">
- 无法设定区域的质地:
-
-目标质地 [TEXTURE_NUM] 的色彩格式[TEXTURE_BIT_DEPTH]无效.
-
-请把目前的目标质地[TEXTURE_NUM]更替为24比特 512x512分辨率，或者更小的显示图片，然后点击 "设置".
- </message>
- </alert>
- <alert name="InvalidTerrainSize">
- <message name="message">
- 无法设置区域的质地:
-
-目标质地[TEXTURE_NUM]的尺寸 [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]过大.
-
-请把目前的目标质地[TEXTURE_NUM]替换成24比特 512x512分辨率或者更小的显示图片，然后点击 "设置".
- </message>
- </alert>
- <alert name="AddClassified">
+ <alert name="DeleteClassified">
<message name="message">
- 分类广告会在查找名录的'Classified'栏目里保留一周时间。
-
-
-填写你的广告,然后点击'发布...'，既添加广告至广告名录中。
-当点击发布时，你将被要求支付发布广告费用. 大额支付意味着你的广告会在名单较前的地方出现，并且当用关键词查找时，你的广告也出现在查询结果较高的位置上。
+ 删除分类广告 '[名称]'?
+将不会退还已付的费用。
</message>
- <option name="OK">
- OK
+ <option name="Delete">
+ 删除
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="DeleteClassified">
+ <alert name="ClassifiedSave">
<message name="message">
- Delete分类 '[名称]'?
-付款后不会退费。
+ 保存对分类广告 [NAME] 的修改?
</message>
- <option name="Delete">
- 删除
+ <option name="Save">
+ 保存
+ </option>
+ <option name="Don'tSave">
+ 不要保存
</option>
<option name="Cancel">
取消
@@ -737,7 +763,7 @@ in this region back to their owner's inventory?
</alert>
<alert name="DeleteAvatarPick">
<message name="message">
- 删除挑选 [挑选]?
+ 删除收藏 [PICK]?
</message>
<option name="Delete">
删除
@@ -749,10 +775,10 @@ in this region back to their owner's inventory?
<alert name="DisplayChangeRestart">
<message name="message">
有一些你执行的显示设置的改变
-会要求[SECOND_LIFE]立即关闭，
-这会导致进程中的所有工作丢失。
+需要 [SECOND_LIFE] 立即关闭，
+这会导致进行中的所有工作丢失。
-应用改变并退出
+应用更改并退出？
</message>
<option name="ApplyandQuit">
应用并退出
@@ -763,10 +789,10 @@ in this region back to their owner's inventory?
</alert>
<alert name="PromptGoToEventsPage">
<message name="message">
- 是否跳至[SECOND_LIFE]事件网页?
+ 是否转到 [SECOND_LIFE] 事件网页?
</message>
<option name="GotoPage">
- 回主页
+ 打开网页
</option>
<option name="Cancel">
取消
@@ -779,25 +805,36 @@ in this region back to their owner's inventory?
</alert>
<alert name="SelectItemToView">
<message name="message">
- 请选择一个物品兰来查看。
+ 请选择需要查看的提案。
</message>
</alert>
<alert name="SelectProposalToView">
<message name="message">
- 选择查看一个提案.
+ 请选择需要查看的提案。
</message>
</alert>
<alert name="SelectHistoryItemToView">
<message name="message">
- 请选择一个历史物品来查看。
+ 请选择一个历史项目来查看。
</message>
</alert>
<alert name="ResetShowNextTimeDialogs">
<message name="message">
- Reset all 'Show next time' dialogs?
+ 您希望重新启用这些之前希望 ‘不再显示’ 的对话框吗？
</message>
<option name="OK">
- OK
+ 确定
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="SkipShowNextTimeDialogs">
+ <message name="message">
+ 您希望禁用所有可以被略过的对话框吗？
+ </message>
+ <option name="OK">
+ 确定
</option>
<option name="Cancel">
取消
@@ -805,16 +842,32 @@ in this region back to their owner's inventory?
</alert>
<alert name="CacheWillClear">
<message name="message">
- 重启[SECOND_LIFE]后将清除缓存。
+ 缓存将在重新启动 [SECOND_LIFE] 后清除。
+ </message>
+ </alert>
+ <alert name="CacheWillBeMoved">
+ <message name="message">
+ 缓存将在重新启动 [SECOND_LIFE] 后移动。
+注意: 这样将会清除缓存。
+ </message>
+ </alert>
+ <alert name="ChangeConnectionPort">
+ <message name="message">
+ 端口设定将在重新启动 [SECOND_LIFE] 后生效。
+ </message>
+ </alert>
+ <alert name="ChangeSkin">
+ <message name="message">
+ 新皮肤将在 [SECOND_LIFE] 重新启动后应用。
</message>
</alert>
<alert name="GoToAuctionPage">
<message name="message">
- 是否跳至[SECOND_LIFE]网页查看有声信息
+ 是否跳至[SECOND_LIFE]网页查看拍卖信息
或者参与投标?
</message>
<option name="GotoPage">
- 回主页
+ 打开网页
</option>
<option name="Cancel">
取消
@@ -825,10 +878,10 @@ in this region back to their owner's inventory?
保存更改?
</message>
<option name="Save">
- 存储
+ 保存
</option>
<option name="Don'tSave">
- 禁止储存
+ 不要保存
</option>
<option name="Cancel">
取消
@@ -848,31 +901,31 @@ in this region back to their owner's inventory?
</alert>
<alert name="GestureSaveFailedObjectNotFound">
<message name="message">
- 无法保存动作，因为找不到目标或相关目标。
-目标可能在范围之外或已被删除。
+ 无法保存动作，因为找不到物体或相关物体的内容。
+物体可能在范围之外或已被删除。
</message>
</alert>
<alert name="GestureSaveFailedReason">
<message name="message">
- 保存动作时出错，出于以下原因: [REASON].请稍候尝试重新保存动作。
+ 保存动作时出错，出于以下原因: [REASON]。请稍候尝试重新保存动作。
</message>
</alert>
<alert name="SaveNotecardFailObjectNotFound">
<message name="message">
- 无法保存名片，因为无法找到目标或相关目标库存。
-目标可能在范围之外或被删除。
+ 无法保存记事卡，因为找不到物体或相关物体的内容。
+物体可能在范围之外或已被删除。
</message>
</alert>
<alert name="SaveNotecardFailReason">
<message name="message">
- 保存注释卡时出错，出于以下原因: [REASON]。请稍候尝试重新保存注释卡。
+ 保存记事卡时出错，出于以下原因: [REASON]。请稍候尝试重新保存记事卡。
</message>
</alert>
<alert name="ScriptCannotUndo">
<message name="message">
无法撤销对你的脚本版本的所有更改.
你是否愿意载入服务器上次保存的版本?
-(提示: 此次操作无法撤销.)
+(***警告***: 此次操作无法撤销.)
</message>
<option name="Yes">
是
@@ -888,19 +941,19 @@ in this region back to their owner's inventory?
</alert>
<alert name="SaveScriptFailObjectNotFound">
<message name="message">
- 无法保留脚本，因为没有找到原本东东。
-东东可能在范围之外或被删除。
+ 无法保存脚本，因为找不到其所在的物体。
+该物体可能在范围之外或已被删除。
</message>
</alert>
<alert name="SaveBytecodeFailReason">
<message name="message">
- 保存汇编脚本时出错，出于以下原因: [REASON].请稍候尝试重新保存脚本。
+ 保存汇编脚本时出错，出于以下原因: [REASON]。请稍候尝试重新保存脚本。
</message>
</alert>
<alert name="CouldNotStartStopScript">
<message name="message">
- 无法开始或停脚本，因为没有找到原本东东。
-东东可能在范围之外或被删除。
+ 无法开始或停止脚本，因为找不到其所在的物体。
+该物体可能在范围之外或已被删除。
</message>
</alert>
<alert name="CannotDownloadFile">
@@ -910,23 +963,23 @@ in this region back to their owner's inventory?
</alert>
<alert name="CannotWriteEncode">
<message name="message">
- 无法解密文件 [[FILE]]
+ 无法编码文件 [[FILE]]
</message>
</alert>
<alert name="CannotWriteFile">
<message name="message">
- 无法写入文件[[FILE]]
+ 无法写入文件 [[FILE]]
</message>
</alert>
<alert name="CannotLoadWearable">
<message name="message">
- 对不起，不能载入衣服。
+ 对不起，载入衣服失败。
</message>
</alert>
<alert name="ConfirmDeleteComplicated">
<message name="message">
- 至少有一件所选东东被锁定，不可复制,或属于其他人。
-你确定要删除所有物品吗?
+ 您选择的物品中至少有一件被锁定，不可复制，或者属于其他人。
+您确定要删除所有物品吗?
</message>
<option name="Yes">
是
@@ -937,22 +990,83 @@ in this region back to their owner's inventory?
</alert>
<alert name="DisplaySettingsSafe">
<message name="message">
- 基于您的特殊安全要求，显示设置
-已经被设成安全水平模式。
+ 显示设置已调整为安全水平，因为您指定了 -safe 选项。
</message>
</alert>
+ <alert name="UnsupportedGLRequirements">
+ <message name="message">
+ 您似乎没有满足第二人生的系统需求的硬件。第二人生需要支持多重材质 (multitexture)
+的 OpenGL 显示卡。如果您满足这个条件的话，也许您需要确认已经
+安装了您的显示卡的最新驱动程序、以及操作系统的 Service Pack 和补丁。
+
+如果您还是遇到问题，请访问: http://www.secondlife.com/support
+ </message>
+ </alert>
+ <alert name="UnsupportedHardware">
+ <message name="message">
+ 警告: 您的系统没有满足第二人生的最低系统需求。如果您继续使用第二人生，您可能会得到糟糕的性能体验。不幸的是，我们无法为不支持的系统配备提供技术支持。
+
+MINSPECS
+您希望访问 [_URL] 得到更多信息吗？
+ </message>
+ <ignore name="ignore">
+ 检测到不支持的硬件时
+ </ignore>
+ <option name="Yes">
+ 是
+ </option>
+ <option name="No">
+ 否
+ </option>
+ </alert>
+ <alert name="UnsupportedGPU">
+ <message name="message">
+ - 您的显示卡没有达到最低需求。
+ </message>
+ </alert>
+ <alert name="UnsupportedCPU">
+ <message name="message">
+ - 您的 CPU(中央处理器)速度没有达到最低需求。
+ </message>
+ </alert>
+ <alert name="UnsupportedRAM">
+ <message name="message">
+ - 您的系统内存没有达到最低需求。
+ </message>
+ </alert>
+ <alert name="UnknownGPU">
+ <message name="message">
+ 您的系统中安装了一个我们所不知道的显卡。
+这经常发生于我们还没有来得及测试的新硬件上。
+第二人生将很可能正常运行，但您也许要
+调节您的图形设定到更合适的水平上。
+(编辑 > 首选项 > 图像).
+ </message>
+ <ignore name="ignore">
+ 检测到未知的显示卡时
+ </ignore>
+ </alert>
<alert name="DisplaySettingsRecommended">
<message name="message">
- 显示设置已经被设置在推荐的水平上，推荐水平是基于您计算机的系统配置得出的。
+ 基于您计算机的系统配置，显示设置已经被设置在推荐的水平上。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
+ <alert name="DisplaySettingsNoShaders">
+ <message name="message">
+ [SECOND_LIFE] 在初始化图形驱动程序时崩溃了。
+图形质量将被设为“低”以避免常见的驱动程序错误。
+这将禁用某些图形特性。
+我们建议更新您的显示卡驱动程序。
+图形质量可以在首选项 → 图像中提高。
+ </message>
+ </alert>
<alert name="CannotRequestDomain">
<message name="message">
- 无法连接到服务器.
-无法请求连接域名: [HOST]
+ 无法连接到服务器。
+无法请求域名: [HOST]
</message>
</alert>
<alert name="CannotFindDomain">
@@ -961,11 +1075,11 @@ in this region back to their owner's inventory?
这可能是网络连接故障或服务器出错
所引发的结果。
-请几分钟后再试, 或点击帮助
-获得建议和到达系统状态的网页链接。
+请稍后再试, 或点击帮助
+获得建议和到系统状态网页的链接。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
@@ -973,74 +1087,82 @@ in this region back to their owner's inventory?
</alert>
<alert name="PromptSelectServer">
<message name="message">
- 请选择一个服务器.
+ 请选择一个服务器。
无法连接至服务器[SERVER]
</message>
</alert>
<alert name="CannotConnectDNSError">
<message name="message">
无法连接到[SECOND_LIFE].
-DNS服务器无法解读。
+域名服务器无法解析主机名称。
+
请确定可以连接主页 www.secondlife.com。
-如果可以，但一直收到错误信息，
-请到技术部门并报告此项错误。
+如果可以，但一直收到该错误信息，
+请到 www.secondlife.com/support 报告此项错误。
</message>
</alert>
<alert name="CannotConnectSecurityError">
<message name="message">
无法与登陆服务器建立安全连接。
通常这意味着计算机时钟的设置不正确。
-请到控制面板选项察看时间设置，并确定时间
-和日期设定正确。
-
-如果一直收到这个错误信息，请登陆
-SecondLife.com网站，与技术支持部门联系，
-并向他们报告问题。
+
+请确定时间和日期设定正确。
+如果仍然收到这个错误信息，请到
+www.secondlife.com/support
+报告此项错误。
</message>
</alert>
<alert name="CannotConnectVerificationError">
<message name="message">
- 无法连接到[SECOND_LIFE].
+ 无法连接到 [SECOND_LIFE]。
登陆服务器无法识别自身。
+
+如果一直收到这个错误信息，请到
+www.secondlife.com/support
+报告此项错误。
</message>
</alert>
<alert name="CannotConnectUnknownErrorWindows">
<message name="message">
无法连接至[SECOND_LIFE].
-尽管我们尽了最大努力, 一些不可知的错误导致了这次连接失败.
-请尝试登陆SecondLife.com网站的技术支持部门，并报告问题，如果可能，请附上你的SecondLife.log文件，文件路径为: C:\Documents and Settings\(name)\Application Data\SecondLife\logs
+尽管我们尽了最大努力, 一些不可知的错误导致了
+这次连接失败。请尝试登陆SecondLife.com网站的
+技术支持部门，并报告问题，如果可能，请附上你的
+SecondLife.log文件，文件路径为:
+C:\Documents and Settings\(用户名)\Application Data\SecondLife\logs
非常感谢.
</message>
</alert>
<alert name="CannotConnectUnknownErrorDarwin">
<message name="message">
- 无法连接到[SECOND_LIFE].
-尽管我们做了最大努力, 仍有一些不可预知的错误发生。
-请登陆the SecondLife.com 网站，与技术支持部门
-联系并报告问题。如果有可能，请附上你的
-位于: C:Documents and Settings(name)Application DataSecondLifelogs的
-SecondLife.log文件。谢谢。
+ 无法连接到 [SECOND_LIFE]。
+尽管我们尽了最大努力, 一些不可知的错误导致了
+这次连接失败。请尝试登陆SecondLife.com网站的
+技术支持部门，并报告问题，如果可能，请附上你的
+SecondLife.log文件，文件路径为:
+~/Library/Application Support/SecondLife/logs
+谢谢。
</message>
</alert>
<alert name="CannotResolveLoginToken">
<message name="message">
- 处理你的注册证明时出错。
-请尝试重新注册一遍。
+ 处理你的登陆令牌时出错。
+请尝试重新登陆一遍。
+
如果持续收到这个错误，
-请登陆SecondLife.com 网站上的
-支持中心。
+请登陆 www.secondlife.com/support .
</message>
</alert>
<alert name="CannotConnectNoMessage">
<message name="message">
- 未知问题出现.
-（从服务器收到空白错误信息.）
+ 连接时发生未知的问题。
+（从服务器收到空白错误信息。）
-请几分钟后再试,或者点击帮助
-获得建议和到达系统状态的网页链接。
+请稍后再试, 或点击帮助
+获得建议和到系统状态网页的链接。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
@@ -1048,13 +1170,13 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="CannotConnectNoReplyFromLogin">
<message name="message">
- 无法连接。 登陆数据库没有回复。
+ 无法连接。 模拟器没有登陆回应。
请几分钟后再试, 或点击帮助
-获得建议和到达系统状态的网页链接。
+获得建议和到系统状态网页的链接。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
@@ -1062,17 +1184,17 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="CannotConnectLoginTimeout">
<message name="message">
- 等待你在世界中注册位置的时间已过。请重新尝试。
+ 等待你在世界中注册位置超时。请重新尝试。
</message>
</alert>
<alert name="FirstRunDialog">
<message name="message">
[SECOND_LIFE] 安装已完成。
-这是你第一次使用[SECOND_LIFE], 登陆前你
+如果这是你第一次使用[SECOND_LIFE], 登陆前你
需要创建一个新帐户。
-返回www.secondlife.com创建账户?
+返回 www.secondlife.com 创建账户?
</message>
<option name="NewAccount...">
新帐户...
@@ -1083,41 +1205,27 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="ClothingStillDownloading">
<message name="message">
- 你的装束仍在下载中。
-你现在可以按正常的使用这个世界，
-其他用户也可以看见你。
+ 你的化身仍在下载中。
+你现在可以正常地使用 [SECOND_LIFE]，
+其他用户也可以正常地看见你。
</message>
</alert>
<alert name="CannotResolveDomain">
<message name="message">
- 无法连接到服务器.
+ 无法连接到服务器。
无法找到域名: [DOMAIN]
+
请检查你的网络连接。
</message>
</alert>
- <alert name="CannotConnectLoginPacket">
- <message name="message">
- 无法连接。登陆服务器未收到任何登陆
-信息.
-
-请几分钟后再试, 或点击帮助
-获得建议和到达系统状态的网页链接。
- </message>
- <option name="OK">
- OK
- </option>
- <option name="Help">
- 帮助
- </option>
- </alert>
<alert name="WelcomeToSecondLife">
<message name="message">
欢迎来到[SECOND_LIFE]!
-使用箭头键来行走.
+使用方向键来行走。
-请选择男性或女性角色.
-随后可更改选择.
+请选择男性或女性角色。
+随后可更改选择。
</message>
<option name="Male">
男性
@@ -1130,9 +1238,9 @@ SecondLife.log文件。谢谢。
<message name="message">
欢迎来到[SECOND_LIFE]!
-使用箭头键来行走.
+使用方向键来行走。
-请选择男性或女性角色.
+请选择男性或女性角色。
</message>
<option name="Male">
男性
@@ -1141,40 +1249,16 @@ SecondLife.log文件。谢谢。
女性
</option>
</alert>
- <alert name="WebLaunchSupport">
- <message name="message">
- 联系[SECOND_LIFE]支持中心.
- </message>
- <option name="Gotopage">
- 翻页
- </option>
- <option name="Cancel">
- 取消
- </option>
- </alert>
- <alert name="ConfirmQuit">
- <message name="message">
- 确定退出?
- </message>
- <option name="Yes">
- 是
- </option>
- <option name="No">
- 否
- </option>
- </alert>
<alert name="RegionNoTerraforming">
<message name="message">
- 地区[REGION]不允许改变地形。
-你将需要在世界的别处购买土地
-来改变它的地形。
+ [REGION] 地区不允许改变地形。
</message>
</alert>
<alert name="CannotCopyWarning">
<message name="message">
- 你没有拿到复制此项物品的许可。
+ 你没有复制此项物品的许可。
如果送出它，你将彻底失去
-此项物品.你是否真的要
+此项物品。你是否真的要
提供这项物品?
</message>
<option name="Yes">
@@ -1186,7 +1270,7 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="CannotGiveItem">
<message name="message">
- 无法提供库存的目录内容。
+ 无法给与库存物品。
</message>
</alert>
<alert name="TransactionCancelled">
@@ -1196,20 +1280,20 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="TooManyItems">
<message name="message">
- 一次库存转移无法包括这么多物品。
+ 一次库存转移中不能给与多于 42 件物品。
</message>
</alert>
<alert name="NoItems">
<message name="message">
- 你不能提供任何物品。
+ 你没有权利传送所选的物品。
</message>
</alert>
<alert name="CannotCopyCountItems">
<message name="message">
- 你没有复制所选条目 [COUNT]次的许可。
-这些条目将从你的库存中被
-除去。
-你真的要给出这些条目吗
+ 你没有复制所选物品中的 [COUNT]件的许可。
+这些条目将从你的库存中被除去。
+
+你真的要给出这些物品吗？
</message>
<option name="Yes">
是
@@ -1220,20 +1304,36 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="CannotGiveCategory">
<message name="message">
- 无法提供库存的目录分类内容.
+ 你没有权利传送所选的文件夹。
</message>
</alert>
<alert name="FreezeAvatar">
<message name="message">
- 冻结此化身?
-他或她将暂时无法移动,交谈
+ 冻结此化身？
+他或她将暂时无法移动、交谈
+或与世界互动。
+ </message>
+ <option name="Freeze">
+ 锁定
+ </option>
+ <option name="Unfreeze">
+ 解锁
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="FreezeAvatarFullname">
+ <message name="message">
+ 冻结 [AVATAR_NAME]?
+他或她将暂时无法移动、交谈
或与世界互动。
</message>
<option name="Freeze">
锁定
</option>
<option name="Unfreeze">
- 解锁定
+ 解锁
</option>
<option name="Cancel">
取消
@@ -1241,13 +1341,27 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="EjectAvatar">
<message name="message">
- 将这个化身逐出你的地盘?
+ 将这个化身逐出你的土地?
+ </message>
+ <option name="Eject">
+ 驱除
+ </option>
+ <option name="EjectandBan">
+ 驱除并封禁
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="EjectAvatarFullname">
+ <message name="message">
+ 将 [AVATAR_NAME] 逐出你的土地?
</message>
<option name="Eject">
驱除
</option>
<option name="EjectandBan">
- 驱除并禁止
+ 驱除并封禁
</option>
<option name="Cancel">
取消
@@ -1255,29 +1369,28 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="InvalidUUID">
<message name="message">
- Not a valid uuid
+ 不是有效的 UUID
</message>
</alert>
<alert name="AcquireErrorTooManyObjects">
<message name="message">
- 获取错误: 选择的东东太多。
+ 获取错误: 选择的物体太多。
</message>
</alert>
<alert name="AcquireErrorObjectSpan">
<message name="message">
- 获取错误: 东东跨区。
-请将所有待获得东东移至
+ 获取错误: 物体处在不只一个区域内。
+请将所有待获得物体移至
同一区域。
</message>
</alert>
<alert name="TakeLockedOrNotOwnedBy">
<message name="message">
- 最少有一件东东被锁定或不属于你。
-如果有某件东东本不属于你而你却拿走了它,
-东东使用下一个主人许可证时，有可能会
-禁止你在未来修改或复制它的
-能力。
-然而,你还是可以执行目前的选择。
+ 最少有一件物体被锁定或不属于你。
+如果有某件物体本不属于你而你却拿走了它,
+下个拥有者权利将对该物体适用并可能限制
+你复制或修改它的权利。
+
你确定要拿走物品栏里的东西吗?
</message>
<option name="Yes">
@@ -1291,11 +1404,10 @@ SecondLife.log文件。谢谢。
<message name="message">
[EXTRA]
-
-登陆[URL]获得更多购买现钞的机会?
+登陆 [URL] 查询购买货币的资料？
</message>
<option name="GotoPage">
- 回主页
+ 打开网页
</option>
<option name="Cancel">
取消
@@ -1303,61 +1415,61 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="UnableToLinkObjects">
<message name="message">
- 无法连接数量为[COUNT]的东东.
-你只能连接最多数量为[MAX]的东东.
-请尝试选择数量较少的东东.
+ 无法链接 [COUNT] 个物体。
+您最多可以链接 [MAX]个物体。
</message>
</alert>
<alert name="CannotLinkIncompleteSet">
<message name="message">
- 你只能对完整东东进行连接,
-并且一次必须选定多个东东.
+ 你只能对完整的物体进行链接，
+并且一次必须选定多个物体。
</message>
</alert>
<alert name="CannotLinkModify">
<message name="message">
- 无法到达链接，因为你没有更改所有东东的许可设置。
-请确定没有东东被锁定，并且所有东东都
-归你所有。
+ 无法进行链接，因为你并不在全部所选物体上
+都有更改权利。
+
+请确定没有物体被锁定，并且所有物体都归你所有。
</message>
</alert>
<alert name="CannotLinkDifferentOwners">
<message name="message">
- 无法到达链接，因为所有东东不属于同一个人。
-请确定所选定东东全部归你所有。
+ 无法进行链接，因为并不是所有物体都属于同一个人。
+请确定所有物体都归你所有。
</message>
</alert>
<alert name="NoFileExtension">
<message name="message">
此文件没有文件拓展名: '[FILE]'
+
请确保文件有其正确的拓展名。
</message>
</alert>
<alert name="InvalidFileExtension">
<message name="message">
- 文件拓展名[EXTENSION]不可用。
-期望使用[VALIDS]
+ 无效的文件拓展名 [EXTENSION]
+期待的 [VALIDS]
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="CannotUploadSoundFile">
<message name="message">
- 由于读取文件:[FILE]，所以不能
-打开上传的声音文件。
+ 不能打开上传的声音文件 [FILE]
</message>
</alert>
<alert name="SoundFileNotRIFF">
<message name="message">
- 文件无法以 RIFF WAVE file:
-[FILE]形式打开
+ 文件不像是 RIFF WAVE 格式:
+[FILE]
</message>
</alert>
<alert name="SoundFileNotPCM">
<message name="message">
- 文件无法以 PCM WAVE 有声文件:
-[FILE]形式打开
+ 文件不像是 PCM WAVE 格式:
+[FILE]
</message>
</alert>
<alert name="SoundFileInvalidChannelCount">
@@ -1368,48 +1480,50 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="SoundFileInvalidSampleRate">
<message name="message">
- 文件中的速率不是支持样本速率(应该为44.1k):
+ 文件的频率不是支持采样频率 (必须为 44.1k):
[FILE]
</message>
</alert>
<alert name="SoundFileInvalidWordSize">
<message name="message">
- 文件中的文字尺寸不是支持文字尺寸 (应改为8 or 16比特):
+ 文件不像是支持的字长 (应该为 8 或 16 位):
[FILE]
</message>
</alert>
<alert name="SoundFileInvalidHeader">
<message name="message">
- 在WAV标题文件：[文件]中无法找到
- 'data' 模块
+ 在 WAV 文件头中无法找到 'data' 模块:
+[文件]
</message>
</alert>
<alert name="SoundFileInvalidTooLong">
<message name="message">
- 声音文件过长(最长10秒):
+ 声音文件过长 (最长 10 秒):
[FILE]
</message>
</alert>
<alert name="ProblemWithFile">
<message name="message">
- 出错文件[FILE]:
+ 文件 [FILE] 有问题:
[ERROR]
</message>
</alert>
<alert name="CannotOpenTemporarySoundFile">
<message name="message">
- 由于写入文件: [FILE]则不能打开暂时压缩声音文件。
+ 无法写入压缩的声音临时文件:
+ [FILE]
</message>
</alert>
<alert name="UnknownVorbisEncodeFailure">
<message name="message">
- 未知代码错误的文件: [FILE]
+ 对文件进行 Vorbis 编码时发生错误：
+ [FILE]
</message>
</alert>
<alert name="CorruptResourceFile">
<message name="message">
- 误用的资源文件: [FILE]
+ 崩坏的的资源文件: [FILE]
</message>
</alert>
<alert name="UnknownResourceFileVersion">
@@ -1419,155 +1533,171 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="UnableToCreateOutputFile">
<message name="message">
- 无法创造输出文件：: [FILE]
+ 无法创建输出文件: [FILE]
</message>
</alert>
<alert name="DoNotSupportBulkAnimationUpload">
<message name="message">
- 我们现在不支持大量上传动画文件.
+ 我们现在不支持大宗上传动画文件。
</message>
</alert>
<alert name="CannotAccessOutputFile">
<message name="message">
- 无法到达输出文件: [FILE]
+ 无法访问输出文件: [FILE]
</message>
</alert>
<alert name="InsufficientFundsToUploadFile">
<message name="message">
- 有足够的资金以完成[FILE]的上传:花费为 L$[COST], 结余为L$[结余]
+ 上传需要的 L$ 不够: 花费为 L$[COST], 您的结余为 L$[BALANCE]
</message>
</alert>
<alert name="InsufficientFundsToFinishUpload">
<message name="message">
- 没有足够的资金以完成[FILE]的上传:花费为 L$[COST], 结余为L$[结余]
+ 没有足够的 L$ 以完成[FILE]的上传: 花费为 L$[COST], 您的结余为 L$[BALANCE]
</message>
</alert>
<alert name="CannotUploadReason">
<message name="message">
- 无法上传文件[FILE]，导致原因为: [REASON]
+ 无法上传文件[FILE]，原因为: [REASON]
请随后重试。
</message>
</alert>
<alert name="CannotCreateLandmarkNotOwner">
<message name="message">
- 你不能在此设定路标，因为
-地主不允许这样做。
-请移动一段距离再加以设定。
+ 你不能在此设定地标，因为
+土地所有人不允许这样做。
</message>
</alert>
<alert name="CannotRecompileSelectObjectsNoScripts">
<message name="message">
- 无法实现编辑。
-选择有可用脚本的东东。
+ 无法重新编译。
+
+请选择有脚本的物体。
</message>
</alert>
<alert name="CannotRecompileSelectObjectsNoPermission">
<message name="message">
- 无法实现编辑。
-选择被你允许修改脚本的
-东东。
+ 无法重新编译。
+
+请选择你能够修改的有脚本的物体。
</message>
</alert>
<alert name="CannotResetSelectObjectsNoScripts">
<message name="message">
- 无法实现重置。
-选择有可用脚本的东东。
+ 无法重置脚本。
+
+请选择有脚本的物体。
</message>
</alert>
<alert name="CannotResetSelectObjectsNoPermission">
<message name="message">
- 无法实现重置。
-选择被你允许修改脚本的
-东东。
+ 无法重置脚本。
+
+请选择你能够修改的有脚本的物体。
</message>
</alert>
<alert name="CannotSetRunningSelectObjectsNoScripts">
<message name="message">
无法设置任何脚本为运行。
-选择具有可用脚本的东东。
+
+请选择有脚本的物体。
</message>
</alert>
<alert name="CannotSetRunningSelectObjectsNoPermission">
<message name="message">
无法设置任何脚本为运行。
-选择被你允许可以修改脚本的
-东东。
+
+请选择你能够修改的有脚本的物体。
</message>
</alert>
<alert name="CannotSetRunningNotSelectObjectsNoScripts">
<message name="message">
无法设置任何脚本为不运行。
-选择具有可用脚本的东东。
+
+请选择有脚本的物体。
</message>
</alert>
<alert name="CannotSetRunningNotSelectObjectsNoPermission">
<message name="message">
无法设置任何脚本为不运行。
-选择被你允许可以修改脚本的
-东东。
+
+请选择你能够修改的有脚本的物体。
</message>
</alert>
<alert name="NoFrontmostFloater">
<message name="message">
- No frontmost floater to save
+ 没有可保存的前置浮动框
+ </message>
+ </alert>
+ <alert name="SeachFilteredOnShortWords">
+ <message name="message">
+ 您的查询已被更改，其中过短的词被去除。
+
+最后搜索了: [FINALQUERY]
+ </message>
+ </alert>
+ <alert name="SeachFilteredOnShortWordsEmpty">
+ <message name="message">
+ 您的搜索用字太短
+所以最后并没有执行查找。
</message>
</alert>
<alert name="ColladaExportFailedUnknownServerError">
<message name="message">
- 克拉达输出失败:未知服务器错误。
+ Collada 文件输出失败: 未知服务器错误。
</message>
</alert>
<alert name="ColladaExportFailedInvalidPermissions">
<message name="message">
- 克拉达输出失败: 许可证无效或东东锁定!
+ Collada 文件输出失败: 无效权限或物体已锁定！
</message>
</alert>
<alert name="ColladaExportFailedUnknownError">
<message name="message">
- 克拉达输出失败:未知错误。
+ Collada 文件输出失败: 未知错误。
</message>
</alert>
<alert name="ObjectImportFailedTransfer">
<message name="message">
- 输入东东失败。无法传递文件。
+ 导入物体失败。无法传送文件。
</message>
</alert>
<alert name="ObjectImportFailedBadFormat">
<message name="message">
- 输入东东失败。文件不是SL接受的文件形式。
+ 导入物体失败。文件不是可接受的 SLObject 格式。
</message>
</alert>
<alert name="ObjectImportFailedUnknownError">
<message name="message">
- 东东输入失败。未知错误。
+ 导入物体失败。未知错误。
</message>
</alert>
<alert name="CouldNotTeleportReason">
<message name="message">
- 不能闪电传送。
+ 没能瞬间移动。
[REASON]
</message>
</alert>
<alert name="CannotSetLandOwnerNothingSelected">
<message name="message">
- 法设定土地拥有者：
-未选择任何对象。
+ 无法设定土地拥有者：
+未选择任何地块。
</message>
</alert>
<alert name="CannotSetLandOwnerMultipleRegions">
<message name="message">
- 无法强制土地所属，因为因为选项跨越数个
-区域。请选择一个面积较小的区域并重试。
+ 无法强制土地所有权，因为选项跨越数个
+区域。请选择较小的区域并重试。
</message>
</alert>
<alert name="ForceOwnerAuctionWarning">
<message name="message">
这块单位土地正在拍卖。如果投标已经开始，
-强制拥有将会使拍卖流产，并且很有可能
-使其他居民不快。是否强制拥有?
+强制所有权将会使拍卖流标，并且很有可能
+使其他居民不快。是否强制所有权?
</message>
<option name="Force">
- 强迫
+ 强制
</option>
<option name="Cancel">
取消
@@ -1587,7 +1717,7 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="CannotReleaseLandNothingSelected">
<message name="message">
- 无法放弃土地:
+ 无法放弃土地:
未选中任何对象。
</message>
</alert>
@@ -1609,16 +1739,22 @@ SecondLife.log文件。谢谢。
无法找到该土地所在区域。
</message>
</alert>
+ <alert name="CannotCloseFloaterBuyLand">
+ <message name="message">
+ 在第二人生完成对这次交易的估价前，
+你不能关闭“购买土地”窗口。
+ </message>
+ </alert>
<alert name="CannotDeedLandNothingSelected">
<message name="message">
无法转让土地:
-未选中任何对象.
+没有选择地块。
</message>
</alert>
<alert name="CannotDeedLandNoGroup">
<message name="message">
无法转让土地:
-没有社团.
+没有选择社团。
</message>
</alert>
<alert name="CannotDeedLandNoRegion">
@@ -1628,18 +1764,6 @@ SecondLife.log文件。谢谢。
请使用帮助 -> 报告漏洞来报告此项错误。
</message>
</alert>
- <alert name="CannotSetLandOwnerNothingSelected">
- <message name="message">
- 法设定土地拥有者：
-未选择任何对象。
- </message>
- </alert>
- <alert name="CannotBuyLandMultipleRegions">
- <message name="message">
- 无法购买土地，因为选项跨越的区域太多。
-请选择一个小一点的面积，并重试。
- </message>
- </alert>
<alert name="CannotBuyLandMultipleSelected">
<message name="message">
无法购买土地:
@@ -1647,60 +1771,27 @@ SecondLife.log文件。谢谢。
请选择一块较小的面积。
</message>
</alert>
- <alert name="CannotDeedLandMultipleSelected">
- <message name="message">
- 无法转让土地:
-选中的不同单位土地数量太多。
-请选择一块较小的面积。
- </message>
- </alert>
<alert name="RegionNotFound">
<message name="message">
没有找到此地区
</message>
</alert>
- <alert name="ParcelCanPlayMusic">
- <message name="message">
- 这个地方可以播放流动音乐。
-
-音乐要求 768 kbps 或者更快的
-网络连接速度。
-
-如果网络可用，是否播放音乐?
- </message>
- <option name="PlayMusic">
- 播放音乐
- </option>
- <option name="Disable">
- 禁止
- </option>
- </alert>
<alert name="ParcelCanPlayMedia">
<message name="message">
- T这个地方可以播放流动视频。
-
-流动视频要求768 kbps或者
-更快的网络连接速度。
-
-如果网络可用，是否播放流动视频?
+ 这个地方可以播放流媒体。
+流媒体需要较快的网络连接。
-(你可以稍候在参数选择 >音频 &视频
-下改变选项。)
+如果网络可用，是否播放流媒体?
+(你可以稍后在 首选项 > 音频和视频 中
+更改这个选项。)
</message>
- <option name="PlayMedia">
- 播放多媒体
+ <option name="PlayMusic">
+ 播放媒体
</option>
<option name="Disable">
禁止
</option>
</alert>
- <alert name="CannotBuyLandWaitingForServer">
- <message name="message">
- 无法购买土地:
-等到服务器报告花费。
-请稍候再试。
- </message>
- </alert>
<alert name="CannotDeedLandWaitingForServer">
<message name="message">
无法转让土地:
@@ -1708,109 +1799,67 @@ SecondLife.log文件。谢谢。
请稍候再试。
</message>
</alert>
- <alert name="CannotBuyLandNoPublic">
- <message name="message">
- 无法购买土地:
-选择中不包含任何公共土地。
- </message>
- </alert>
- <alert name="CannotBuyLandLandOwned">
- <message name="message">
- 无法购买土地:
-所选的土地属于另外一个用户。
-请重新选择一个较小的面积。
- </message>
- </alert>
- <alert name="CannotButLandRegionNotFound">
- <message name="message">
- 无法购买土地:
-无法找到该土地所在区域。
-请使用帮助 -> 报告漏洞来向我们报告这项错误。
- </message>
- </alert>
- <alert name="CannotBuyLandNoTransfer">
- <message name="message">
- 无法购买土地:
-区域[REGION]不允许转移土地。
- </message>
- </alert>
<alert name="CannotDeedLandNoTransfer">
<message name="message">
无法转让土地:
-区域[REGION]不允许转移土地。
- </message>
- </alert>
- <alert name="CannotBuyLandForGroupNotOfficer">
- <message name="message">
- 无法为这个社团购买土地:
-你在目前的社团里不是社团官员
-激活另一个社团请使用编辑 -> 社团...
- </message>
- </alert>
- <alert name="CannotBuyLandInsufficientFunds">
- <message name="message">
- 购买面积为[面积]平方米的土地需要L$[价格].
-你只有 L$[资产表]。
- </message>
- </alert>
- <alert name="CannotReleaseLandNothingSelected">
- <message name="message">
- 无法放弃土地:
-未选中任何对象。
+区域 [REGION] 不允许转移土地。
</message>
</alert>
<alert name="CannotReleaseLandWatingForServer">
<message name="message">
无法放弃土地:
-等待服务器报告花费。
+正等待服务器更新地块信息。
+
几秒钟后请再尝试一次。
</message>
</alert>
<alert name="CannotReleaseLandSelected">
<message name="message">
无法放弃土地:
-选中的单位土地数量太多。
-请选择一块较小的面积。
+你并不拥有所有选中的地块。
+
+请选择单个地块。
</message>
</alert>
<alert name="CannotReleaseLandDontOwn">
<message name="message">
无法放弃土地:
-你没有让出这块土地的许可证.
-你拥有的土地在游戏世界中是绿色.
+你没有让出这块土地的许可。
+你拥有的土地在世界中是绿色。
</message>
</alert>
<alert name="CannotReleaseLandRegionNotFound">
<message name="message">
无法放弃土地:
无法找到此土地所属的区域。
+
请使用帮助 -> 报告漏洞来报告这个错误。
</message>
</alert>
<alert name="CannotReleaseLandNoTransfer">
<message name="message">
无法放弃土地:
-区域[REGION]内不允许转移土地。
+区域 [REGION] 内不允许转移土地。
</message>
</alert>
<alert name="CannotReleaseLandPartialSelection">
<message name="message">
无法放弃土地:
-你必须选中全部单位土地才能使用此功能。
-尝试双击来选中全部单位土地,或者
-分割你的单位土地。
+你必须选中整个地块才能使用此功能。
+尝试双击来选中全部地块,或者
+先分割你的地块。
</message>
</alert>
<alert name="ReleaseLandWarning">
<message name="message">
- 你将放弃面积为[AREA]平方米的土地。
+ 你将放弃面积为 [AREA] 平方米的土地。
放弃该土地会将他从你拥有的土地中
-移走, 不会兑换成任何现金.
+移走, 不会兑换成任何 L$。
是否放弃土地?
</message>
<option name="Release">
- 启动
+ 确定
</option>
<option name="Cancel">
取消
@@ -1825,15 +1874,15 @@ SecondLife.log文件。谢谢。
<alert name="CannotDivideLandPartialSelection">
<message name="message">
无法划分土地:
-你选择了一整块单位土地。
-请使用点击，拖带的方法选用一块面积较小
-的土地。
+
+你选择了整块地块。
+请选择该地块的一部分。
</message>
</alert>
<alert name="LandDivideWarning">
<message name="message">
- 分割次此土地会造成单位土地一分为二，
-且每块单位土地会保留原配置。操作成功后，
+ 分割此土地会将地块一分为二，
+且每块地块会保留原配置。操作成功后，
一些设置会被重置为默认值。
是否分割土地?
@@ -1855,8 +1904,8 @@ SecondLife.log文件。谢谢。
<alert name="CannotJoinLandNoRegion">
<message name="message">
无法连接土地:
-无法找到该土地所属的区域.
-请使用帮助 -> 报告程序漏洞,让我们知道问题所在.
+无法找到该土地所属的区域。
+请使用帮助 -> 报告程序漏洞，让我们知道问题所在。
</message>
</alert>
<alert name="CannotJoinLandNothingSelected">
@@ -1868,39 +1917,49 @@ SecondLife.log文件。谢谢。
<alert name="CannotJoinLandEntireParcelSelected">
<message name="message">
无法合并土地:
-你已经选中一块完整的单位土地。
-请尝试点击并拖动，选择一块面积较大
-的区域。
+您只选择了单个地块。
+
+请选择跨两个地块的区域。
</message>
</alert>
<alert name="CannotJoinLandSelection">
<message name="message">
无法合并土地:
-你必须选择一块以上的单位土地.
-请尝试点击并拖动，选择一块面积较大
-的区域。
+您必须选择一个以上的地块。
+
+请选择跨两个地块的区域。
</message>
</alert>
<alert name="JoinLandWarning">
<message name="message">
- 连接土地需要在与所选矩形相交的所有
-单位土地外创建新的更大的单位土地。
+ 合并土地将从与所选矩形相交的所有
+地块创建新的地块。
-你必须重置新单位土地的名称和买卖
-特权。
+你必须重置这一新地块的名称和选项。
-是否连接土地?
+是否合并土地?
</message>
<option name="Join">
- 加入
+ 合并
</option>
<option name="Cancel">
取消
</option>
</alert>
+ <alert name="ConfirmNotecardSave">
+ <message name="message">
+ 只有保存这张记事卡之后，此项物品才可以复制或查看。是否保存记事卡？
+ </message>
+ <option name="Save">
+ 是的，请保存
+ </option>
+ <option name="Cancel">
+ 取消保存
+ </option>
+ </alert>
<alert name="ConfirmLandmarkCopy">
<message name="message">
- 复制此物品至你的库存?
+ 复制此地标至你的库存？
</message>
<option name="Copy">
复制
@@ -1911,7 +1970,7 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="ConfirmItemCopy">
<message name="message">
- 复制此物品至你的库存?
+ 复制此物品至你的库存？
</message>
<option name="Copy">
复制
@@ -1922,41 +1981,42 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="ResolutionSwitchFail">
<message name="message">
- 无法用[RESY]置换[RESX]
+ 切换分辨率到 [RESX] × [RESY] 失败
</message>
</alert>
<alert name="ErrorUndefinedGrasses">
<message name="message">
- 错误: 为定义草坪: [种类]
+ 错误: 未定义草坪: [SPECIES]
</message>
</alert>
<alert name="ErrorUndefinedTrees">
<message name="message">
- 错误:为定义树木: [种类]
+ 错误: 未定义树木: [SPECIES]
</message>
</alert>
<alert name="CannotSaveWearableOutOfSpace">
<message name="message">
- 无法储存'[NAME]'至衣物文档.你可能需要
-释放部分电脑存储空间后重新储存
-至衣物文档.
+ 无法储存 '[NAME]' 到装束文件。你可能需要
+释放部分电脑存储空间后重新储存。
</message>
</alert>
<alert name="CannotSaveToAssetStore">
<message name="message">
- 无法储存[NAME]至终属资产存储.
-这通常是暂时性功能障碍。请用户化后再次保存。
+ 无法储存 [NAME] 至中央资料服务器。
+这通常只是临时的问题。请自定义后再次保存。
+
如果问题依然存在，请点击
帮助/报告漏洞并提供
-客户网络设置的具体信息。
+您的网络设置的具体信息。
</message>
</alert>
<alert name="AppEarlyExit">
<message name="message">
[MESSAGE]
-我们无法修复该错误。请
-请卸载并重新安装，并再次尝试。如果错误仍存在，
+我们无法修复该错误。
+
+请卸载并重新安装，然后再次尝试。如果错误仍存在，
请登陆www.secondlife.com/support
寻求技术支持。
</message>
@@ -1966,16 +2026,15 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="YouHaveBeenLoggedOut">
<message name="message">
- 你已经退出登陆[SECOND_LIFE]:
+ 你已经退出[SECOND_LIFE]:
[MESSAGE]
-点击继续可以查看历史即时通记录和聊天记录。
-你将不能使用其他任何功能进行其它操作。
-点击退出，马上退出SECOND_LIFE]。
+您仍可以查看历史即时通记录和聊天记录。
+否则点击退出将立即关闭 [SECOND_LIFE]。
</message>
<option name="Continue">
- 继续
+ 查看聊天记录
</option>
<option name="Quit">
退出
@@ -1984,18 +2043,37 @@ SecondLife.log文件。谢谢。
<alert name="OnlyOfficerCanBuyLand">
<message name="message">
无法为社团购买土地:
-你没有为你的活动社团购买土地的许可证.
-请激活另一社团，使用编辑 -> 社团...
+你没有为你的活动社团购买土地的许可。
</message>
</alert>
<alert name="AddFriend" title="添加朋友">
<message name="message">
- 好友们可以在地图上互相追踪，并可以在线接受更新信息.
+ 好友可以互相允许对方
+在地图上找到自己，
+以及接受上线通知。
-是否发送友谊卡给[NAME]?
+是否提议 [NAME] 成为好友？
</message>
<option name="Offer">
- 接收
+ 提议
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="AddFriendWithMessage" title="添加朋友">
+ <message name="message">
+ 好友可以互相允许对方
+在地图上找到自己，
+以及接受上线通知。
+
+是否提议 [NAME] 成为好友？
+ </message>
+ <editline name="editline">
+ 我们做朋友好吗?
+ </editline>
+ <option name="Offer">
+ 提议
</option>
<option name="Cancel">
取消
@@ -2003,7 +2081,7 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="RemoveFromFriends">
<message name="message">
- 你是否要将[FIRST_NAME] [LAST_NAME] 移出你的朋友圈?
+ 你是否要将[FIRST_NAME] [LAST_NAME] 从好友列表中去除？
</message>
<option name="Remove">
移除
@@ -2012,17 +2090,26 @@ SecondLife.log文件。谢谢。
取消
</option>
</alert>
- <alert name="GodDeleteAllScriptedPublicObjectsByUser">
+ <alert name="RemoveMultipleFromFriends">
<message name="message">
- 你是否确定愿意删除以下用户
-
-
+ 你希望从好友列表中移除若干好友吗？
+ </message>
+ <option name="Remove">
+ 是的，移除
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="GodDeleteAllScriptedPublicObectsByUser">
+ <message name="message">
+ 你是否确定删除用户
** [AVATAR_NAME] **
-在其他土地上所拥有的所有副本东东？
+在所有他人所有的土地上带有脚本的所有物体？
</message>
<option name="DELETE!!">
- 删除!!
+ 全部删掉!!
</option>
<option name="Cancel">
取消
@@ -2030,15 +2117,12 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="GodDeleteAllScriptedObjectsByUser">
<message name="message">
- 你是否确定愿意删除以下用户
-
-
+ 你是否确定删除用户
** [AVATAR_NAME] **
-
-在所有土地上所拥有的所有东东(无论是否有副本)？
+在该模拟器中 <所有土地> 上带有脚本的所有物体？
</message>
<option name="!!DELETEALL!!">
- !!DELETE ALL!!
+ 全部删掉!!
</option>
<option name="Cancel">
取消
@@ -2046,15 +2130,13 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="GodDeleteAllObjectsByUser">
<message name="message">
- 你是否确定愿意删除以下用户
-
-
+ 你是否确定删除用户
** [AVATAR_NAME] **
-
-在所有土地上所拥有的所有东东(无论是否有副本)？
+在该模拟器中 <所有土地> 上的所有物体
+(无论是否带有脚本)？
</message>
<option name="!!DELETEALL!!">
- !!DELETE ALL!!
+ 全部删掉!!
</option>
<option name="Cancel">
取消
@@ -2062,36 +2144,36 @@ SecondLife.log文件。谢谢。
</alert>
<alert name="PublishGroupInfoToWeb">
<message name="message">
- 选择 "在网络上发布"选项将允许我们发布社团的名称，徽章，规章制度，头衔和创始人至[SECOND_LIFE]网站。如果你发布的内容，根据社区标准规定，涉及到成人内容，你有责任对此作出声明。
+ 选择 "在网络上发布"选项将允许我们发布社团的名称，徽章，规章制度，头衔和创始人至 [SECOND_LIFE] 网站。如果你发布的内容，根据社区标准规定，涉及到成人内容，你有责任对此作出声明。
</message>
</alert>
<alert name="ErrorEncodingSnapshot">
<message name="message">
- 编码快照错误!
+ 快照编码错误!
</message>
</alert>
<alert name="BlankClassifiedName">
<message name="message">
- 你必须为你的分类设定一个不是空白的名字。
+ 你必须给分类广告设定一个名字。
</message>
</alert>
<alert name="MinClassifiedPrice">
<message name="message">
- Price to pay for listing must be at least L$[MIN_PRICE].
+ 广告刊登出价必须大于 L$[MIN_PRICE]。
-Please enter a higher price.
+请输入一个更高的价格。
</message>
</alert>
<alert name="CantLoadVertexShaders">
<message name="message">
- 无法无法载入Vertex Shaders.
+ 无法载入顶点着色器。
</message>
</alert>
<alert name="ConfirmObjectDeleteLock">
<message name="message">
- 至少一件东东被锁定。
-然而，你可以删除当前选项。
-你确定将这些选项删除吗?
+ 您选择的物品中至少有一件被锁定。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2102,9 +2184,9 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectDeleteNoCopy">
<message name="message">
- 至少一件东东不可复制。
-然而，你可以删除当前选项。
-你确定将这些选项删除吗?
+ 您选择的物品中至少有一件不可复制。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2115,9 +2197,9 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectDeleteNoOwn">
<message name="message">
- 你并没有任何一件东东。
-但是，你可以删除目前的选择内容。
-确定删除所有选项吗?
+ 您选择的物品中至少有一件不是你的。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2128,10 +2210,10 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectDeleteLockNoCopy">
<message name="message">
- 至少一件东东被锁定。
-至少一件东东不可复制。
-然而，你可以删除目前选项。
-你确定要删除目前选项吗?
+ 您选择的物品中至少有一件被锁定，
+并且至少有一件不可复制。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2142,10 +2224,10 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectDeleteLockNoOwn">
<message name="message">
- 至少有一件东东被锁定。
-你并不是至少拥有一件东东。
-然而，你可以删除当前选项。
-你确定将这些选项删除吗?
+ 您选择的物品中至少有一件被锁定，
+并且至少有一件不是你的。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2156,10 +2238,10 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectDeleteNoCopyNoOwn">
<message name="message">
- 至少一件东东不可复制。
-你并非至少拥有一件东东。
-然而，你可以删除当前选项。
-你确定将这些选项删除吗?
+ 您选择的物品中至少有一件不可复制，
+并且至少有一件不是你的。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2170,11 +2252,11 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectDeleteLockNoCopyNoOwn">
<message name="message">
- 至少一件东东被锁定。
-至少一件东东不可复制。
-你并非至少拥有一件东东。
-然而，你可以删除当前选项。
-你确定将这些选项删除吗?
+ 您选择的物品中至少有一件被锁定，
+ 至少有一件不可复制，并且
+ 至少有一件不是你的。
+
+您确定要删除这些物体吗?
</message>
<option name="Yes">
是
@@ -2185,9 +2267,9 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectTakeLock">
<message name="message">
- 至少一件东东被锁定。
-然而，你还是可以选择当前选项。
-你确定选择这些选项吗?
+ 您选择的物品中至少有一件被锁定。
+
+您确定要拿走这些物体吗？
</message>
<option name="Yes">
是
@@ -2198,12 +2280,12 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectTakeNoOwn">
<message name="message">
- 你携带的东东并不完全是你所拥有。
-如果继续，下一个拥有者许可证的应用
-于东东将有可能限制你在未来
-修改或复制东东的能力。
-但是，你可以携带目前所选的东东。
-确定继续携带这些东东?
+ 您选择的物品中至少有一件不是你的。
+如果有某件物体本不属于你而你却拿走了它,
+下个拥有者权利将对该物体适用并可能限制
+你复制或修改它的权利。
+
+您确定要拿走这些物体吗？
</message>
<option name="Yes">
是
@@ -2214,13 +2296,13 @@ Please enter a higher price.
</alert>
<alert name="ConfirmObjectTakeLockNoOwn">
<message name="message">
- 至少有一件东东被锁定。
-你所拿走的东东并不完全属于你。
-如果继续，东东使用下一个主人许可时，有可能会
-禁止你在未来修改或复制它的
-能力。
-然而,你还是可以执行目前的选择。
-你确定要拿走物品栏里的东西吗?
+ 您选择的物品中至少有一件被锁定，
+如果有某件物体本不属于你而你却拿走了它,
+下个拥有者权利将对该物体适用并可能限制
+你复制或修改它的权利。
+但是你仍旧可以拿走当前所选项。
+
+您确定要拿走这些物体吗？
</message>
<option name="Yes">
是
@@ -2237,15 +2319,15 @@ Please enter a higher price.
</alert>
<alert name="DeedLandToGroup">
<message name="message">
- 转让这块单位土地后, 社团需要拥有并
-保留足够的土地使用信用额。
+ 转让这块地块后, 社团需要拥有并
+保留足够的土地使用额度。
-土地的消费价格不会退还给地主。
-若所转让的单位土地被售出，售出价
+土地的购买价格不会退还给所有人。
+若所转让的地块被售出，售出价
将被平均分给所有组员。
-转让这块面积为[面积]平方米的土地至社团
-'[社团名称]'?
+转让这块面积为 [AREA]平方米的土地至社团
+'[GROUP_NAME]'?
</message>
<option name="Deed">
转让
@@ -2256,18 +2338,18 @@ Please enter a higher price.
</alert>
<alert name="DeedLandToGroupWithContribution">
<message name="message">
- 转让这块单位土地后, 社团需要拥有并
-保留足够的土地使用信用额。
+ 转让这块地块后, 社团需要拥有并
+保留足够的土地使用额度。
-转让将同时包括土地从个人
- '[FIRST_NAME] [LAST_NAME]'贡献到社团处。
+转让将同时包括
+ '[FIRST_NAME] [LAST_NAME]' 对社团的土地贡献。
-土地的消费价格不会退还给地主。
-若所转让的单位土地被售出，售出价
+土地的购买价格不会退还给所有人。
+若所转让的地块被售出，售出价
将被平均分给所有组员。
-转让这块面积为[面积]平方米的土地至社团
-'[社团名称]'?
+转让这块面积为 [AREA]平方米的土地至社团
+'[GROUP_NAME]'?
</message>
<option name="Deed">
转让
@@ -2278,19 +2360,18 @@ Please enter a higher price.
</alert>
<alert name="DisplaySetToSafe">
<message name="message">
- 基于您的特殊安全要求，显示设置
-已经被设成安全水平模式。
+ 显示设置已调整为安全水平，因为您指定了 -safe 选项。
</message>
</alert>
<alert name="DisplaySetToRecommended">
<message name="message">
- 显示设置已经被设置在推荐的水平上，推荐水平是基于您计算机的系统配置得出的。
+ 基于您计算机的系统配置，显示设置已经被设置在推荐的水平上。
</message>
</alert>
<alert name="UnableToConnect">
<message name="message">
无法连接到服务器.
-无法请求连接域名: [HOST_NAME]
+无法请求域名: [HOST_NAME]
</message>
</alert>
<alert name="CanNotFindServer">
@@ -2300,10 +2381,10 @@ Please enter a higher price.
所引发的结果。
请几分钟后再试, 或点击帮助
-获得建议和到达系统状态的网页链接。
+获得建议和到系统状态网页的链接。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
@@ -2320,10 +2401,10 @@ Please enter a higher price.
无法连接到[SECOND_LIFE]
可能是系统故障。
请几分钟后再试,或者点击帮助
-获得建议和到达系统状态的网页链接。
+获得建议和到系统状态网页的链接。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
@@ -2334,11 +2415,21 @@ Please enter a higher price.
[ERROR_MESSAGE]
</message>
</alert>
+ <alert name="QuickTimeOutOfDate">
+ <ignore name="ignore">
+ QuickTime 由于过期而被禁用
+ </ignore>
+ <message name="message">
+ 由于您的系统上安装的QuickTime版本过期，视频播放已被禁用。
+
+请访问 http://www.apple.com/quicktime/ 并下载更新。
+ </message>
+ </alert>
<alert name="AvatarMoved">
<message name="message">
- Your [TYPE] location is not currently available.
+ 您 [TYPE] 位置当前不可用。
[HELP]
-You have been moved into a nearby region.
+您已被移动至附近的区域。
</message>
</alert>
<alert name="ClothingLoading">
@@ -2347,15 +2438,18 @@ You have been moved into a nearby region.
你现在可以按正常的使用这个世界，
其他用户也可以看见你。
</message>
+ <ignore name="ignore">
+ 装束下载时间太长
+ </ignore>
</alert>
<alert name="FirstRun">
<message name="message">
[SECOND_LIFE] 安装已完成。
-这是你第一次使用[SECOND_LIFE], 登陆前你
+如果这是你第一次使用[SECOND_LIFE], 登陆前你
需要创建一个新帐户。
-返回www.secondlife.com创建账户?
+返回 www.secondlife.com 创建账户?
</message>
<option name="NewAccount...">
新帐户...
@@ -2367,43 +2461,43 @@ You have been moved into a nearby region.
<alert name="SetByHostFail">
<message name="message">
无法连接到服务器.
-无法找到域名: [HOST_NAME]
+无法解析域名: [HOST_NAME]
+
请检查你的网络连接.
</message>
</alert>
<alert name="LoginPacketNeverReceived">
<message name="message">
- 无法连接。登陆服务器未收到任何登陆
-信息.
+ 我们遇到了一些连接上的麻烦。问题可能出在您的互联网连接，也可能出在第二人生的服务器。
-请几分钟后再试, 或点击帮助
-获得建议和到达系统状态的网页链接。
+请几分钟后再试, 或点击帮助连接我们的支持页面，或选择 “瞬间移动” 来尝试瞬间移动回家。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Help">
帮助
</option>
+ <option name="Teleport">
+ 瞬间移动
+ </option>
</alert>
<alert name="WelcomeNoClothes">
<message name="message">
你的角色将在数秒后出现。
-使用箭头键走动。
-
-任何时候都可以按F1键获取帮助，或学习更多关于[SECOND_LIFE]的信息.
+
+使用方向键来行走。
+任何时候都可以按 F1 键，来获取帮助或学习更多关于 [SECOND_LIFE] 的信息.
</message>
</alert>
<alert name="WelcomeChooseSex">
<message name="message">
你的角色将在数秒后出现。
-使用方向箭头键控制走路。
-
-任何时间都可以按F1键获取帮助，或者学习更多关于[SECOND_LIFE].
-
-请选择一个男性或女性的角色。
-你可以之后改变你的选择。
+使用方向键来行走。
+任何时候都可以按 F1 键，来获取帮助或学习更多关于 [SECOND_LIFE] 的信息。
+请选择男性或女性角色。
+以后还是可以改变主意的。
</message>
<option name="Male">
男性
@@ -2414,41 +2508,27 @@ You have been moved into a nearby region.
</alert>
<alert name="NotEnoughCurrency">
<message name="message">
- [NAME] L$ [PRICE] You don't have enough currency to do that.
+ [NAME] L$ [PRICE] 您没有足够的 L$ 来这样做。
</message>
</alert>
- <alert name="GrantModRights">
+ <alert name="GrantedModifyRights">
<message name="message">
- 你是否同意更改对[FIRST_NAME] [LAST_NAME]的权利?
+ 你已经被授予特权，你可以任意修改[FIRST_NAME] [LAST_NAME]的物体。
</message>
- <option name="Yes">
- 是
- </option>
- <option name="No">
- 否
- </option>
</alert>
- <alert name="RevokeModRights">
+ <alert name="RevokedModifyRights">
<message name="message">
- 你是否撤回更改[FIRST_NAME][LAST_NAME]的权利?
+ 你的特权已经被撤回，你不可以再任意修改[FIRST_NAME] [LAST_NAME]的物体。
</message>
- <option name="Yes">
- 是
- </option>
- <option name="No">
- 否
- </option>
</alert>
<alert name="FlushMapVisibilityCaches">
<message name="message">
- 这样将不停跳出地图快照缓存文件.
-
-这样实际上只对调试有用.
-
-(在此过程中,等待5分钟, 知道每个人的地图缓存在他们重新登陆后上传成功。
+ 这样将会清空该区域的地图缓存。
+这实际上只对调试有用。
+(在正式环境中，等待 5 分钟，然后所有人的地图将在他们重新登录后更新。)
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -2456,8 +2536,8 @@ You have been moved into a nearby region.
</alert>
<alert name="OnlyCopyContentsOfSingleItem">
<message name="message">
- 无法同时复制一个以上的条目.
-请仅选择一项对象，并重新尝试.
+ 无法同时复制一个以上物品的内容。
+请仅选择一项物体，并重新尝试。
</message>
<option name="OK">
好的
@@ -2468,96 +2548,58 @@ You have been moved into a nearby region.
</alert>
<alert name="KickUsersFromRegion">
<message name="message">
- 是否使此区域内所有用户闪电传运回家?
+ 是否将此区域内所有用户瞬间移动回家?
</message>
<option name="OK">
- OK
- </option>
- <option name="Cancel">
- 取消
- </option>
- </alert>
- <alert name="ReturnScriptedOnOthersLand">
- <message name="message">
- 你是否确定愿意归还主人为
-** [USER_NAME] **
-且只在在自己领地内的副本东东？
- </message>
- <option name="Return">
- 返回
+ 确定
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="ReturnScriptedOnAllLand">
+ <alert name="EstateObjectReturn">
<message name="message">
- 你是否确定不删除以下用户
-** [USER_NAME] **在区域内所有土地上的副本东东?
+ 您是否要返还
+[USER_NAME]
+拥有的物体？
</message>
<option name="Return">
- 返回
+ 返还
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="InvalidTerrainBitDepthSmall">
- <message name="message">
- 无法设置区域的材质:
-
-基本材质[TEXTURE_NUM]的像素[TEXTURE_BIT_DEPTH]无效.
-
-替换基础材质[TEXTURE_NUM]为128x128像素24位图片, 然后再次点击"设置".
- </message>
- </alert>
- <alert name="InvalidTerrainSizeSmall">
- <message name="message">
- 无法设置区域内的材质:
-
-基础材质[TEXTURE_NUM]的尺寸[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]无效.
-
-替换基础材质[TEXTURE_NUM]为128x128像素24位图片, 然后再次点击"设置".
- </message>
- </alert>
- <alert name="InvalidTerrainBitDepthLarge">
- <message name="message">
- 无法设置区域的材质:
-
-基本材质[TEXTURE_NUM]的像素[TEXTURE_BIT_DEPTH]无效.
-
-替换基础材质[TEXTURE_NUM]为512512x512像素或更小的24位图片, 然后再次点击"设置".
- </message>
- </alert>
- <alert name="InvalidTerrainWidthLarge">
+ <alert name="InvalidTerrainBitDepth">
<message name="message">
- 无法设置区域内的材质:
-
-基础材质[TEXTURE_NUM]的尺寸[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]太宽以至无效.
+ 无法设定区域的材质:
+地面材质 [TEXTURE_NUM] 的色彩深度 [TEXTURE_BIT_DEPTH] 无效。
-替换基础材质[TEXTURE_NUM]为512x512像素或更小的24位图片, 然后再次点击"设置".
+请把目前的地面材质 [TEXTURE_NUM] 替换为 24 位
+512×512 分辨率或者更小的图片，然后再次点击 ‘应用’.
</message>
</alert>
- <alert name="InvalidTerrainHeightLarge">
+ <alert name="InvalidTerrainSize">
<message name="message">
- 无法设置区域内的材质:
+ 无法设置区域的质地:
-基础材质[TEXTURE_NUM]的尺寸[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]太高以至无效.
+地面材质 [TEXTURE_NUM] 的尺寸 [TEXTURE_SIZE_X]×[TEXTURE_SIZE_Y] 过大。
-替换基础材质[TEXTURE_NUM]为512x512像素或更小的24位图片, 然后再次点击"设置".
+请把目前的地面材质 [TEXTURE_NUM] 替换为 24 位
+512×512 分辨率或者更小的图片，然后再次点击 ‘应用’.
</message>
</alert>
<alert name="RawUploadStarted">
<message name="message">
- 上载开始. 这个过程可能持续2分钟, 具体时间取决于你的网络连接速度.
+ 上载开始。这个过程可能持续2分钟, 具体时间取决于你的网络连接速度.
</message>
</alert>
<alert name="ConfirmBakeTerrain">
<message name="message">
- 是你否真的愿意烧硬当前的地形, 使得它成为地形上升或下降极值的中间值，并且默认'恢复'工具?
+ 是你否真的愿意烘烤当前的地形, 使得它成为地形上升或下降限制的中间值，以及‘恢复’工具的默认值?
</message>
<option name="Bake">
- 变硬
+ 烘烤
</option>
<option name="Cancel">
取消
@@ -2565,38 +2607,44 @@ You have been moved into a nearby region.
</alert>
<alert name="MaxAllowedAgentOnRegion">
<message name="message">
- 你只能有[MAX_AGENTS]允许的居民。
+ 你最多只能列出 [MAX_AGENTS]名允许的居民。
</message>
</alert>
<alert name="MaxAllowedGroupsOnRegion">
<message name="message">
- 你只能有[MAX_GROUPS]允许的社团。
+ 你只能有[MAX_GROUPS]个允许的社团。
</message>
<option name="Bake">
- 执行
+ 烘烤
</option>
<option name="Cancel">
取消
</option>
</alert>
+ <alert name="MaxAgentOnRegionBatch">
+ <message name="message">
+ 尝试添加 [NUM_ADDED] 名代表时失败:
+超出 [LIST_TYPE] [MAX_AGENTS]名的限制 [NUM_EXCESS]名。
+ </message>
+ </alert>
<alert name="MaxBannedAgentsOnRegion">
<message name="message">
- 你只能有[MAX_BANNED]禁止的居民。
+ 你最多只能列出 [MAX_BANNED] 名禁止的居民。
</message>
</alert>
<alert name="MaxManagersOnRegion">
<message name="message">
- 你只能有[MAX_MANAGER]禁止的居民。
+ 您最多只能有 [MAX_MANAGER]位地产管理人。
</message>
</alert>
<alert name="OwnerCanNotBeDenied">
<message name="message">
- 不能添加不动产主人至'拒绝进入' 名单.
+ 不能添加地产主人至 ‘拒绝进入’ 名单.
</message>
</alert>
<alert name="CanNotChangeAppearanceUntilLoaded">
<message name="message">
- 衣服和身体载入之前不能更改外形。
+ 衣服和身体载入之前不能更改外表。
</message>
</alert>
<alert name="ClassifiedMustBeAlphanumeric">
@@ -2606,8 +2654,8 @@ You have been moved into a nearby region.
</alert>
<alert name="CantSetBuyObject">
<message name="message">
- 无法购买东东, 因为此东东是非卖品.
-请把东东设置为待售状态并重试.
+ 不能设置购买物体, 因为此物体是非卖品。
+请把物体设置为待售状态并重试。
</message>
</alert>
<alert name="FinishedRawDownload">
@@ -2618,10 +2666,10 @@ You have been moved into a nearby region.
</alert>
<alert name="DownloadWindowsMandatory">
<message name="message">
- [SECOND_LIFE]有新版本可用。
+ [SECOND_LIFE] 有新版本可用。
[MESSAGE]
-你必须下载此更新才能运行系统。
+你必须下载此更新才能使用 [SECOND_LIFE]。
</message>
<option name="Download">
下载
@@ -2632,10 +2680,10 @@ You have been moved into a nearby region.
</alert>
<alert name="DownloadWindows">
<message name="message">
- [SECOND_LIFE]有新版本可用。
+ [SECOND_LIFE] 有新版本可用。
[MESSAGE]
-这个更新不是必须的,但我们建议下载并安装此更新，以改善画面质量和稳定性.
+这个更新不是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
</message>
<option name="Download">
下载
@@ -2646,10 +2694,10 @@ You have been moved into a nearby region.
</alert>
<alert name="DownloadWindowsReleaseForDownload">
<message name="message">
- [SECOND_LIFE]有新版本可用。
+ [SECOND_LIFE] 有新版本可用。
[MESSAGE]
-这个更新不是必须的,但我们建议下载并安装此更新，以改善画面质量和稳定性.
+这个更新不是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
</message>
<option name="Download">
下载
@@ -2663,8 +2711,8 @@ You have been moved into a nearby region.
[SECOND_LIFE]有新版本可用。
[MESSAGE]
-你必须下再次更新才能运行系统。
-是否下载更新至应用软件文件夹?
+你必须下载此更新才能使用 [SECOND_LIFE]。
+是否下载更新至应用程序文件夹?
</message>
<option name="Download">
下载
@@ -2678,9 +2726,9 @@ You have been moved into a nearby region.
[SECOND_LIFE]有新版本可用。
[MESSAGE]
-这个更新不是必须的,但我们建议下载并安装此更新，以改善画面质量和稳定性.
+这个更新不是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
-是否立刻下载至应用程序文件夹？
+是否下载更新至应用程序文件夹?
</message>
<option name="Download">
下载
@@ -2694,9 +2742,9 @@ You have been moved into a nearby region.
[SECOND_LIFE]有新版本可用。
[MESSAGE]
-这个更新不是必须的,但我们建议下载并安装此更新，以改善画面质量和稳定性.
+这个更新不是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
-是否立刻下载至应用程序文件夹？
+是否下载更新至应用程序文件夹?
</message>
<option name="Download">
下载
@@ -2707,8 +2755,8 @@ You have been moved into a nearby region.
</alert>
<alert name="DeedObjectToGroup">
<message name="message">
- 转让此东东会导致社团:
-* 收到买出东东所得的钱。
+ 转让此物体会导致社团:
+* 收到付给该物体的L$。
</message>
<option name="Deed">
转让
@@ -2716,76 +2764,103 @@ You have been moved into a nearby region.
<option name="Cancel">
取消
</option>
+ <ignore name="ignore">
+ 转让物体到社团
+ </ignore>
</alert>
- <alert name="AddClassified">
+ <alert name="WebLaunchExternalTarget">
<message name="message">
- 分类广告在‘查找一周内目录的’
-'分类'部分出现。
-
-填入你的广告, 然后点击 '发布...' ，添加广告至
-目录。
-
-点击发布时，你会被要求付款。
-付的多可以使你的广在出现在名单的较高位置, 并且
-当人们按关键词检索时，你的广告也会出现在较高位置。
+ 打开你系统的浏览器来查看该内容？
+ </message>
+ <ignore name="ignore">
+ 打开默认浏览器查看网页
+ </ignore>
+ <option name="Open">
+ 打开
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="WebLaunchJoinNow">
+ <message name="message">
+ 是否转至 www.secondlife.com 管理帐户?
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
</option>
+ <ignore name="ignore">
+ 打开浏览器管理您的帐户
+ </ignore>
</alert>
- <alert name="WebLaunchGraphicsDriver">
+ <alert name="WebLaunchBugReport101">
<message name="message">
- 你在这台计算机上的[VENDOR_LABLE] [CARD_NAME]图像驱动已经过期。
-
-这是控制你的图像卡的软件的一部分。旧的驱动可以导致3D图像程序，例如[SECOND_LIFE]运行缓慢或崩溃。
-我们强烈推荐升级 "[DRIVER_NAME]" 驱动, 免费的驱动下载在 [VENDOR_LABLE].
-
-你是否愿意登陆[SECOND_LIFE]驱动网页?
+ 访问 [SECOND_LIFE] Wiki 学习怎样正确地报告错误。
</message>
+ <ignore name="ignore">
+ 打开浏览器查看错误报告基础 Wiki
+ </ignore>
<option name="Gotopage">
- 回主页
+ 确定
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="WebLaunchGraphicsDriverIntelExtreme">
+ <alert name="WebLaunchSecurityIssues">
<message name="message">
- 你计算机上的图片处理驱动程序已经过期。
-
-这是一款控制图形卡的软件。
-旧的驱动版本可能会使3D画面的程序，例如 [SECOND_LIFE]运行缓慢甚至崩溃。
-
-我们强烈建议升级到最新版本的驱动, 可以在因特网上找到免费下载的版本。
-
-你愿意登陆[SECOND_LIFE]驱动程序网页吗?
+ 访问 [SECOND_LIFE] Wiki 学习如何正确地报告安全事件。
</message>
+ <ignore name="ignore">
+ 打开浏览器查看安全事件 Wiki
+ </ignore>
<option name="Gotopage">
- 回主页
+ 确定
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="RunningInPCI">
+ <alert name="WebLaunchQAWiki">
<message name="message">
- GL 表明系统的图像驱动正在运行PCI模式，
-该模式会减慢绘图速度。如果你正在使用PCI视频卡,
-则可以忽略这条消息。如果你正在使用 AGP视频卡，你可以
-更新你的木板驱动，获得更好的图像性能和其他一些
-3D应用程序。如果你正在使用PCI快速图像卡，你就可以使
-AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
+ 访问 [SECOND_LIFE] 质量保证 Wiki.
</message>
+ <ignore name="ignore">
+ 打开浏览器查看质量保证 Wiki
+ </ignore>
+ <option name="Gotopage">
+ 确定
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
</alert>
- <alert name="WebLaunchJoinNow">
+ <alert name="WebLaunchPublicIssue">
<message name="message">
- 是否跳至 www.secondlife.com管理帐号?
+ 访问 [SECOND_LIFE] 公开事件跟踪器，你可以在那里报告程序错误和其他事件。
</message>
- <option name="OK">
- OK
+ <ignore name="ignore">
+ 打开浏览器查看公开事件跟踪器
+ </ignore>
+ <option name="Gotopage">
+ 打开页面
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="WebLaunchPublicIssueHelp">
+ <message name="message">
+ 访问 [SECOND_LIFE] Wiki 了解如何使用公开事件跟踪器。
+ </message>
+ <ignore name="ignore">
+ 打开浏览器查看公开事件跟踪器 Wiki
+ </ignore>
+ <option name="Gotopage">
+ 打开页面
</option>
<option name="Cancel">
取消
@@ -2793,10 +2868,27 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="WebLaunchForums">
<message name="message">
- 在[SECOND_LIFE]基础知识中查找最新的小贴士和小技巧。
+ 在 [SECOND_LIFE] 知识库中查找最新的提示和技巧。
</message>
+ <ignore name="ignore">
+ 打开浏览器查看知识库
+ </ignore>
<option name="Gotopage">
- 回主页
+ 打开页面
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="WebLaunchSupport">
+ <message name="message">
+ 联系 [SECOND_LIFE] 支持中心。
+ </message>
+ <ignore name="ignore">
+ 打开浏览器联系支持中心
+ </ignore>
+ <option name="Gotopage">
+ 打开网页
</option>
<option name="Cancel">
取消
@@ -2804,10 +2896,13 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="WebLaunchSupportWiki">
<message name="message">
- 进入林登官方博客, 获取最新的新闻和咨讯.
+ 进入林登官方博客，获取最新的新闻和信息。
</message>
+ <ignore name="ignore">
+ 打开浏览器查看官方博客
+ </ignore>
<option name="Gotopage">
- 回主页
+ 打开页面
</option>
<option name="Cancel">
取消
@@ -2815,10 +2910,13 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="WebLaunchLSLGuide">
<message name="message">
- 是否跳至林登脚本语言向导以获得脚本编辑帮助?
+ 是否转至林登脚本语言向导查阅脚本编辑帮助？
</message>
+ <ignore name="ignore">
+ 打开浏览器查阅脚本编辑帮助
+ </ignore>
<option name="Gotopage">
- 回主页
+ 打开页面
</option>
<option name="Cancel">
取消
@@ -2826,10 +2924,10 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="WebLaunchLSLWiki">
<message name="message">
- 是否跳至林登脚本语言维基词典以获得编辑脚本帮助?
+ 是否跳至LSL语言首页以获得脚本编辑帮助?
</message>
<option name="Gotopage">
- 回主页
+ 打开页面
</option>
<option name="Cancel">
取消
@@ -2837,15 +2935,42 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="ReturnToOwner">
<message name="message">
- 你确定要将所选东东归还至
-它们的主人?可转移的已转让
-东东会被归还至他们原先的主人处。
-(所有归还的东东会被归还至他们上一次被保存的文件夹内。)
+ 你确定要将所选物体归还至
+它们的主人？可转移的已转让给社团的
+物体会被归还至他们原先的主人处。
-*警告* 不可转移的已转让东东会被删除!
+*警告* 不可转让的转让给社团的物体会被删除!
</message>
<option name="Return">
- 返回
+ 返还
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="ViewReleaseNotes">
+ <message name="message">
+ 是否查看第二人生发布通告？
+ </message>
+ <ignore name="ignore">
+ 查看发布通告
+ </ignore>
+ <option name="Gotopage">
+ 打开页面
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="WebLaunchReleaseNotes">
+ <message name="message">
+ 是否查看 [SECOND_LIFE] 发布通告？
+ </message>
+ <ignore name="ignore">
+ 打开浏览器查看发布通告时
+ </ignore>
+ <option name="Gotopage">
+ 确定
</option>
<option name="Cancel">
取消
@@ -2853,8 +2978,8 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="GroupLeaveConfirmOfficer">
<message name="message">
- 你目前是社团[GROUP]的官员.
-是否离开社团?
+ 你目前是社团[GROUP]的官员。
+是否离开社团？
</message>
<option name="Leave">
离开
@@ -2865,8 +2990,8 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="GroupLeaveConfirmMember">
<message name="message">
- 你目前是社团[GROUP]的成员.
-是否离开社团?
+ 你目前是社团[GROUP]的成员。
+是否离开社团？
</message>
<option name="Leave">
离开
@@ -2877,66 +3002,57 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
</alert>
<alert name="ConfirmKick">
<message name="message">
- 你真的要踢走所有用户吗?
- </message>
- </alert>
- <alert name="MuteLinden">
- <message name="message">
- 对不起,你不能屏蔽林登家的人。
+ 你*真的*要将所有用户踢下线吗？
</message>
- <option name="OK">
- OK
+ <option name="Kick">
+ 踢下所有用户
+ </option>
+ <option name="Cancel">
+ 取消
</option>
</alert>
- <alert name="MuteByName" title="通过名称屏蔽东东">
+ <alert name="MuteLinden">
<message name="message">
- 通过名字屏蔽声音只会影响对象聊天和即时消息, 不会影效果声音。
-你必须准确键入对象的名字.
+ 对不起，你不能屏蔽林登家的人。
</message>
- <editline name="editline">
- 东东名称
- </editline>
<option name="OK">
- OK
- </option>
- <option name="Cancel">
- 取消
+ 确定
</option>
</alert>
- <alert name="MuteByNameFailed" title="通过名称屏蔽东东失败">
+ <alert name="MuteByNameFailed" title="按名称屏蔽物体失败">
<message name="message">
- 你已经屏蔽了这个名字.
+ 你已经屏蔽了这个名字。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="RemoveItemWarn">
<message name="message">
- 尽管被准许, 删除库存可能会造成东东的
-损坏。你确定要删除库存中的物品吗?
+ 尽管允许, 删除内容可能会造成物体的
+损坏。你确定要删除该物品吗？
</message>
<option name="Yes">
- 是
+ 删除
</option>
<option name="No">
- 否
+ 取消
</option>
</alert>
<alert name="CantRateOwnedByGroup">
<message name="message">
- 无法鉴定东东主人,东东由社团拥有。
+ 无法为物体主人评分，物体由社团拥有。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="CantOfferCallingCard">
<message name="message">
- 目前无法提供召集卡。请稍候再试。
+ 目前无法提供名片。请稍候再试。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="CantOfferFriendship">
@@ -2944,54 +3060,57 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
目前无法建立朋友关系。请稍候再试。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="CantSetHome">
<message name="message">
- 无法在此建住宅。
-你的住宅必须建在由你或你所在社团拥有的土地上。
+ 无法把家设在这里。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="BusyModeSet">
<message name="message">
- 忙碌模式调节。
-隐藏聊天场景和即时消息。即时通
-会受到你的忙碌模式回复。拒绝所有的
-闪电传送邀请和库存邀请。
+ 已设置为忙碌模式。
+将隐藏聊天和即时消息。即时通会收到
+你的忙碌模式回复。所有瞬间移动邀请
+都会被拒绝。所有给与的物品都会放入
+你的垃圾箱。
</message>
<option name="OK">
- OK
+ 确定
</option>
+ <ignore name="ignore">
+ 设置忙碌状态
+ </ignore>
</alert>
<alert name="NoPVPDetected">
<message name="message">
- 没有发现用户与用户之间(PvP)弊端。
+ 没有发现用户与用户之间(PvP)的冲突。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="NotecardAttachPermFail">
<message name="message">
- 只有具有无限制'下一个主人'许可证的
-才可以被附在注释卡上。
+ 只有具有无限制 ‘下个拥有者’
+权利的物品才可以被附在注释卡上。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="JoinedTooManyGroupsMember">
<message name="message">
- You are a member of too many groups to join
-another one. Please leave at least one group
-before joining this one, or decline the offer.
-To leave a group select the 'My Groups..' option
-from the 'Edit' menu.
-[NAME] has invited you to join a group as a member.
+ 你已经加入了太多的社团，无法再加入
+新的社团。加入此社团之前，请至少离开
+一个旧社团, 或者拒绝新社团邀请。
+离开社团请选择'编辑'菜单下的
+'我的社团..'选项。
+[NAME]邀请你成为该社团成员。
[INVITE]
</message>
<option name="Join">
@@ -3008,7 +3127,7 @@ from the 'Edit' menu.
一个旧社团, 或者拒绝新社团邀请。
离开社团请选择'编辑'菜单下的
'我的社团..'选项。
-[NAME]邀请你成为该社团成员。
+[NAME]邀请你成为该社团官员。
[INVITE]
</message>
<option name="Join">
@@ -3020,13 +3139,13 @@ from the 'Edit' menu.
</alert>
<alert name="KickUser">
<message name="message">
- 以哪句消息踢走此人?
+ 发送下列消息并踢走此人？
</message>
<editline name="editline">
管理员已经迫使您下线。
</editline>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -3034,13 +3153,13 @@ from the 'Edit' menu.
</alert>
<alert name="KickAllUsers">
<message name="message">
- 以哪句消息踢走目前在此的每个人?
+ 发送下列消息并踢走目前连接到网格的每个人?
</message>
<editline name="editline">
管理员已经迫使您下线。
</editline>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -3048,13 +3167,13 @@ from the 'Edit' menu.
</alert>
<alert name="FreezeUser">
<message name="message">
- 用哪一条通知冻结化身?
+ 用哪一条消息通知冻结的化身?
</message>
<editline name="editline">
- 你已经被冻结。你不能移动或聊天。管理员会通过即时信息联系你。
+ 您已经被冻结。您不能移动或聊天。管理员会通过即时信息联系您。
</editline>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -3062,13 +3181,13 @@ from the 'Edit' menu.
</alert>
<alert name="UnFreezeUser">
<message name="message">
- 发送何种信息封锁该用户?
+ 用哪一条消息通知解冻的化身?
</message>
<editline name="editline">
- 你已经被解冻
+ 您已经被解冻。
</editline>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -3076,10 +3195,10 @@ from the 'Edit' menu.
</alert>
<alert name="ExpungeUser">
<message name="message">
- 输入用户的代理身份
+ 输入用户的 agent id
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -3087,13 +3206,13 @@ from the 'Edit' menu.
</alert>
<alert name="OfferTeleport">
<message name="message">
- 用以下消息提供到你所在地的闪电传送?
+ 发送下列消息并邀请瞬间移动？
</message>
<editline name="editline">
- 我要加入 [REGION]
+ 和我一起到 [REGION] 来吧！
</editline>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
@@ -3101,38 +3220,52 @@ from the 'Edit' menu.
</alert>
<alert name="OfferTeleportFromGod">
<message name="message">
- 是否神明召唤用户去你的位置?
+ 是否神明召唤用户来你的位置？
</message>
<editline name="editline">
- 我要加入 [REGION]
+ 和我一起到 [REGION] 来吧！
</editline>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="MessageEstate" title="通知在这块不动产上的每个人">
+ <alert name="TeleportFromLandmark">
+ <message name="message">
+ 你确定要瞬间移动吗？
+ </message>
+ <ignore name="ignore">
+ 使用库存中的地标瞬间移动
+ </ignore>
+ <option name="Teleport">
+ 瞬间移动
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="MessageEstate" title="通知在这块地产上的每个人">
<message name="message">
输入一条简短的通知，该声明将
-会分发给目前在你领地内的所有居民。
+会发送给目前在你地产内的所有居民。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="ChangeLindenEstate" title="更改林登拥有的不动产">
+ <alert name="ChangeLindenEstate" title="更改林登地产">
<message name="message">
- 你将要更改林登所有的私人财产(大陆,
-格子,方位, 等等.).
+ 你将要更改林登所有的地产(大陆、
+少年网格、方位岛，等等)。
-这个动作极度危险，因为它可能会影响到
- 这块大陆上, 它将改变
-上千的区域，并会使空间服务器报警。
+ 这个动作极度危险，因为它可能会在基础的层次上
+影响到用户体验。在大陆上, 它将改变
+上千的区域，并会使空间服务器噎着。
是否继续?
</message>
@@ -3143,19 +3276,17 @@ from the 'Edit' menu.
取消
</option>
</alert>
- <alert name="ChangeLindenAccess" title="更改进入林登拥有的不动产的通道">
+ <alert name="ChangeLindenAccess" title="更改林登地产准入列表">
<message name="message">
- 即将改变林登私人财产
-(大陆,格子, 方向,等等.)的准入名单.
+ 你将要更改林登所有的地产的准入列表(大陆、
+少年网格、方位岛，等等)。
-该操作非常危险， 应该仅在防止黑客把东东和
-金钱转移进或出地区的时候才能够被
-执行。
+该操作非常危险， 应该仅在利用把物体/金钱
+转移进或出某个网格的对付活儿 (hack) 时候
+才应该被执行。 它将改变上千的区域，并会
+使空间服务器噎着。
-这可能会更改上千地区，并使得
-空间服务器报警。
-
-Proceed?
+是否继续？
</message>
<option name="ChangeEstate">
更改不动产
@@ -3164,127 +3295,127 @@ Proceed?
取消
</option>
</alert>
- <alert name="EstateAllowedAgentAdd" title="选择不动产">
+ <alert name="EstateAllowedAgentAdd" title="选择地产">
<message name="message">
- 仅将此独立领地还是将[所有独立领地]列入允许名单?
+ 仅列入此地产还是[ALL_ESTATES]的允许名单?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateAllowedAgentRemove" title="选择不动产">
+ <alert name="EstateAllowedAgentRemove" title="选择地产">
<message name="message">
- 从允许名单中移除仅这块领地还是[ALL_ESTATES]?
+ 仅移出此地产还是[ALL_ESTATES]的允许名单?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateAllowedGroupAdd" title="选择不动产">
+ <alert name="EstateAllowedGroupAdd" title="选择地产">
<message name="message">
- 仅将此独立领地还是将[所有独立领地]列入社团允许名单?
+ 仅列入此地产还是[ALL_ESTATES]的社团允许名单?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateAllowedGroupRemove" title="选择不动产">
+ <alert name="EstateAllowedGroupRemove" title="选择地产">
<message name="message">
- 从社团允许名单中移除仅这块领地还是[ALL_ESTATES]?
+ 仅移出此地产还是[ALL_ESTATES]的社团允许名单?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateBannedAgentAdd" title="选择不动产">
+ <alert name="EstateBannedAgentAdd" title="选择地产">
<message name="message">
- 拒绝访问仅此领地或[所有_领地]?
+ 拒绝访问仅此领地还是[ALL_ESTATES]?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateBannedAgentRemove" title="选择不动产">
+ <alert name="EstateBannedAgentRemove" title="选择地产">
<message name="message">
- 停止拒绝进入仅这一个领地还是[ALL_ESTATES]?
+ 停止拒绝该居民进入仅这一个地产还是[ALL_ESTATES]?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateManagerAdd" title="选择不动产">
+ <alert name="EstateManagerAdd" title="选择地产">
<message name="message">
- 仅为这一个独立领地还是为所有独立领地添加独立领地经理?
+ 仅为这一个地产还是为[ALL_ESTATES]添加地产经理?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateManagerRemove" title="选择不动产">
+ <alert name="EstateManagerRemove" title="选择地产">
<message name="message">
- 仅开除此处领地的领地经理还是开除你所有领地的领地经理。
+ 仅将领地经理从这个开除从[ALL_ESTATES]开除？
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="EstateCovenantChange" title="选择不动产">
+ <alert name="EstateCovenantChange" title="选择地产">
<message name="message">
- 只改变此处不动产的合同消息还是改变[ALL_ESTATES]的合同消息?
+ 只改变此处地产的契约消息还是改变[ALL_ESTATES]的契约消息?
</message>
<option name="ThisEstate">
- 该领地
+ 该地产
</option>
<option name="AllEstates">
- 所有不动产
+ 所有地产
</option>
<option name="Cancel">
取消
@@ -3292,7 +3423,7 @@ Proceed?
</alert>
<alert name="EstateKickUser" title="确定踢出">
<message name="message">
- 将[EVIL_USER]踢出此处领地?
+ 将 [EVIL_USER] 踢出此处地产?
</message>
<option name="Kick">
踢人
@@ -3303,7 +3434,7 @@ Proceed?
</alert>
<alert name="EstateChangeCovenant">
<message name="message">
- 你是否确定改变不动产合同?
+ 你是否确定改变地产契约?
</message>
<option name="Change">
更改
@@ -3314,41 +3445,51 @@ Proceed?
</alert>
<alert name="ProblemImportingEstateCovenant">
<message name="message">
- Problem importing estate covenant.
+ 导入地产契约时出错。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
+ <alert name="ProblemAddingEstateManager">
+ <message name="message">
+ 添加地产管理人时遇到问题。 一个或多个地产的管理人列表可能已满。
+ </message>
+ </alert>
+ <alert name="ProblemAddingEstateGeneric">
+ <message name="message">
+ 添加到地产列表时遇到问题。 一个或多个地产的列表可能已满。
+ </message>
+ </alert>
<alert name="UnableToLoadNotecard">
<message name="message">
- 这次尝试无法载入注释卡所属的资产.
+ 现在暂时无法载入记事卡相关的资产。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="NotAllowedToViewNotecard">
<message name="message">
- 缺乏许可证，不能查看要求查看的和资产ID相关的注释卡
+ 缺乏权限，不能查看与要求的资产 ID 相关的记事卡
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="MissingNotecardAssetID">
<message name="message">
- 资产ID的注释信息已经从数据库中遗失 .
+ 记事卡的资产 ID 已经从数据库中遗失。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="PublishClassified">
<message name="message">
请遵记: 分类广告费用不会退还。
-是否消费L$[AMOUNT]发布广告?
+是否以L$[AMOUNT]发布广告?
</message>
<option name="Publish">
发布
@@ -3357,9 +3498,37 @@ Proceed?
取消
</option>
</alert>
+ <alert name="SetClassifiedMature">
+ <message name="message">
+ 分类广告包含成人内容吗？
+ </message>
+ <option name="Mature">
+ 包含
+ </option>
+ <option name="Not Mature">
+ 不包含
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="SetGroupMature">
+ <message name="message">
+ 社团包含成人内容吗？
+ </message>
+ <option name="Mature">
+ 包含
+ </option>
+ <option name="Not Mature">
+ 不包含
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
<alert name="ConfirmRestart" title="确定重新启动">
<message name="message">
- 你真的要在2分钟后重新进入区域吗?
+ 你真的要在2分钟后重新启动区域吗?
</message>
<option name="Restart">
重启
@@ -3374,33 +3543,31 @@ Proceed?
会分发给目前在此区域内的所有居民。
</message>
<option name="OK">
- OK
+ 确定
</option>
<option name="Cancel">
取消
</option>
</alert>
- <alert name="HelpRegionBlockTerraform" title="锁定外形">
+ <alert name="HelpRegionBlockTerraform" title="锁定地形">
<message name="message">
- 如果此项被选择并执行, 无论每单元土地的'编辑地形' 如何设置，土地所有者可能无法编辑他们自己的土地。
+ 如果选择此项, 无论每地块的'编辑地形' 如何设置，土地所有者都无法编辑他们自己的土地。
默认: 关
</message>
</alert>
<alert name="HelpRegionBlockFly" title="锁定飞翔">
<message name="message">
- 如果此框被选中,无论每单位土地设置如何，
-人们都不能在此区域内飞翔。
+ 如果选择此项,无论每个地块设置如何，
+人们都不能在此区域内飞行。
默认:关
</message>
</alert>
- <alert name="HelpRegionAllowDamage" title="允许损害">
+ <alert name="HelpRegionAllowDamage" title="允许伤害">
<message name="message">
- 忽略个别单位土地的设置，选定框使健康系统
-应用于所有单位土地。如果有遗留框
-没被查看, 个别单位土地的地主仍可以
-他们土地上的健康系统。
+ 选定框将使健康系统应用于所有地块。如果不选中这项， 个别地块
+的持有人仍可以打开他们土地上的健康系统。
默认:关
</message>
@@ -3408,76 +3575,85 @@ Proceed?
<alert name="HelpRegionAgentLimit" title="代理限制">
<message name="message">
设置此片区域内的化身数量最大值。
-注意，区域内的化身数量越多，表现的性能
+注意，区域内的化身数量越多，性能
可能就越差。
-Default: 30
+默认:40
</message>
</alert>
- <alert name="HelpRegionObjectBonus" title="奖励东东">
+ <alert name="HelpRegionObjectBonus" title="额外物体因数">
<message name="message">
- 奖励的东东是原始东东的复制品，它允许小批地打包 。
-包裹的数量范围是1到10。 每512m2设定‘1’个包裹
-允许打包117 个东东。 每512m2设定‘2’个包裹允许打包
-234个东东, 也就是前者的两倍,剩下的以此类推。 无论包裹数的
-设定值为多少，每一个区域允许的奖励东东的数量最大为
-15，000个。 一旦奖励东东的数量被设定, 就不能减少，除非
-你可以确定减少东东不会导致包裹内东东的
-删除或归还。
+ 额外物体因数是对单个地块内所允许的元件数量的倍数。
+允许的范围是1 到 10。‘1’ 代表每个 512 平方米的地块允许 117
+个物体。‘2’ 代表每个 512 平方米的地块允许 234 个物体，也就是
+2 倍，以此类推。无论额外物体是多少，每个区域所允许的物体仍是
+15,000。一旦额外物体被设置，请注意减少该设置将可能导致物体
+被返还或删除。
默认: 1.0
</message>
</alert>
<alert name="HelpRegionMaturity" title="成人内容">
<message name="message">
- 设置区域内的成人内容, 操作参照右上角
-的屏幕以及地图上弹出的小贴士。成人内容
-也会影响搜索结果 - 居民们可以选择不搜索
-成人区域内的内容。
+ 设置区域是否包含成人内容，这会显示在
+屏幕上方以及地图的提示中。该设定也会影响搜索
+结果 — 居民们可以选择不搜索成人区域内的内容。
-地图上弹出的小贴士5分钟内不会改变, 因为
-系统只是定时性的上传地图信息。
+改变这一设定可能要过一会儿才会反映到地图上。
默认:非成人级别
</message>
</alert>
<alert name="HelpRegionRestrictPushObject" title="限制推动">
<message name="message">
- 设定所有区域为限制推动区。代理商只能推动自己，或者由土地主人所设的脚本代码推动，或者由社团所属土地的脚本代码推动，这里假设土地有社团转让设置。
+ 设定所有区域为限制推动区。居民只能推动自己，或者由土地主人的脚本代码推动。
-推动功能和llPushObject() LSL功能有关.
+(推动功能和llPushObject() LSL函数有关。)
默认: 关
</message>
</alert>
- <alert name="HelpParcelChanges" title="土地连接/划分">
+ <alert name="HelpParcelChanges" title="土地合并/划分">
<message name="message">
- 设置成无论土地是否归不动产主人所有，都可以被连接或再划分。
-如果该选项未被执行:
- * 只有不动产主人和经理人有权利连接或再划分土地.
- * 他们只能连接或再划分属于这个主人的土地,或属于具有合适权利的社团的土地。
+ 该设置决定不属于地产所有人的地块是否可被合并或划分。
+如果该选项未被选择:
+ * 只有不动产主人和经理人有权利连接或再划分土地。
+ * 他们只能连接或再划分属于这个主人的土地, 或属于具有合适权利的社团的土地。
-如果选项已被执行:
+如果选项被选择:
* 所有土地的主人都可以连接或再划分他们所拥有的土地.
* 对于社团所拥有的土地, 拥有合适权利的社团可以连接或再划分土地。
-默认: 执行
+默认: 选择
+ </message>
+ </alert>
+ <alert name="HelpRegionSearch" title="Do Not Show In Search">
+ <message name="message">
+ 打开该选项将阻止地块拥有者在搜索中列出他们的地块。
+默认：关
+ </message>
+ </alert>
+ <alert name="HelpParcelSearch" title="Do Not Show In Search">
+ <message name="message">
+ 这个选项将会:
+- 在搜索结果中显示该地块
+- 显示该地块的公开物体
</message>
</alert>
<alert name="RegionMaturityChange" title="更改区域的成人指数设定">
<message name="message">
此区域内的成人内容等级已经更新。
-但是,世界地图更新时间需要大约5分钟，
-因为系统只能定期更新地图
-信息。
+但是，世界地图更新时间需要大约5分钟，
+因为系统只能定期更新地图信息。
</message>
</alert>
<alert name="HelpRegionLandResell" title="土地重新出售">
<message name="message">
不动产主人和经理人有权利出售任何不动产主人的土地。
-如果选项没有被执行,买主不能重新出售该区域内的土地。如果选项被执行，买主则可以重新出售该区域内土地。
+如果选项没有被执行, 买主不能再出售该区域内的土地。如果选项被执行，
+买主则可以再出售该区域内土地。
默认: 不允许
@@ -3485,196 +3661,181 @@ Default: 30
</alert>
<alert name="HelpEstateCovenantID" title="契约合同的资产ID">
<message name="message">
- 设置这个属于这项不动产的不动产契约协议的注释卡资产ID。
-默认: 00000000-0000-0000-0000-000000000000或没有
+ 设置该地产的地产契约记事卡资产 ID。
+默认: 00000000-0000-0000-0000-000000000000 或没有
</message>
</alert>
<alert name="HelpRegionDisableScripts" title="无效脚本">
<message name="message">
- 如果模拟表现平庸,可能是脚本问题。打开
-统计条 (Ctrl-Shift-1)。 找到模拟器物理FPS。
-如果低于45，打开位于系统条底部的
-‘时间’板。 如果脚本时间设定为每秒读25祯甚至更高, 则点击
-‘获取首要脚本'按钮。你会得到可能导致不良模拟表现的
-脚本的名称及位置。
+ 如果模拟性能平庸，可能是脚本问题。
+打开统计条 (Ctrl-Shift-1)。 找到模拟器物理FPS。如果低于
+45，打开位于系统条底部的‘时间’ 板。 如果脚本时间为 25 毫秒
+甚至更高, 则点击 ‘获取首要脚本’ 按钮。你会得到可能导致不良
+模拟表现的脚本的名称及位置。
-检查‘无效脚本'盒子然后点击 ‘应用'
-按钮，这可以暂时使该区域内所有脚本失效。 你可能
-如是做以达到标出的‘首要脚本’的位置。
- 一旦你到达那里, 就可以分析
-是否是这些脚本导致了问题。 你也许想
-联系脚本的主人或删除或归还东东。
-不检查 '无效脚本' 盒子并点击 '应用'，可以再次
-激活该区域内脚本。
+打开 ‘禁用脚本’ 选项然后点击 ‘应用’按钮，可以暂时使该区域内
+所有脚本失效。 你可能需要这样做以到达标出的 ‘首要脚本’ 的
+位置。一旦你到达那里, 就可以分析 是否是这些脚本导致了问题。 你也许想联系脚本的主人或删除或归还物体。关闭 ‘禁用脚本’ 选项
+并点击 ‘应用’，可以再次激活该区域内脚本。
默认: 关
</message>
</alert>
- <alert name="HelpRegionDisableCollisions" title="无效冲突">
+ <alert name="HelpRegionDisableCollisions" title="无效碰撞">
<message name="message">
- 如果模拟效果不好, 物理东东也可能是原因。
-打开统计条(Ctrl-Shift-1)。找到第一人称物理
-视角模拟器。 如果它小于45，打开位于系统条底部的
-系统条。 如果模拟物理时间读取速度为
-20 祯每秒或更快, 点击'获得首要Colliders' 按钮。
-你就可以获得导致模拟表现不好的东东的名称和
-物理地址。
+ 如果模拟性能平庸，可能是物理物体问题。
+打开统计条(Ctrl-Shift-1)。找到模拟器物理FPS。如果它小于45，
+打开位于统计条底部的时间一栏。 如果 ‘模拟物理时间’ 在
+20 毫秒或以上，点击 '获得首要碰撞者' 按钮。
+你将得到可能导致模拟表现不好的物体的名称和位置。
-检查 '无效冲突' 盒子 并按下 '应用'
-按钮，这样可以暂时消除东东与东东之间的冲突。要找到
-标注出的‘首要冲突源’的位置，你可能必须照上述方法
-来做。 一旦你到达该位置, 你应该调查
-该东东是否一直在与其他东东产生冲突? 你可能想
-联系东东的主人，或者删除或归还此东东。
-不检查 '无效冲突'盒子然后'应用' 以重新激活
-该区域内的冲突。
+打开 ‘禁用碰撞’ 选项然后点击 ‘应用’按钮，这样可以暂时关闭
+物体对物体的碰撞。 你可能需要这样做以到达标出的 ‘首要碰撞者’
+的位置。一旦你到达该位置，你应该调查该物体是否在与其他物体
+一直碰撞。你也许想联系脚本的主人或删除或归还物体。
+关闭 ‘禁用碰撞’ 选项并点击 ‘应用’，可以再次激活该区域内脚本。
默认: 关
</message>
</alert>
<alert name="HelpRegionDisablePhysics" title="无效物理">
<message name="message">
- 无效物理和无效冲突类似, 除了所有
-物理模拟都是无效的。这意味着不仅所有东东将不会停止
-相互冲突, 且化身们也将无法移动。
+ 无效物理和无效碰撞类似, 除了所有物理模拟
+都是无效的。这意味着不仅所有物体将会
+停止相互碰撞，且化身们也将无法移动。
-仅当无效冲突没有向地区反馈回足够的
-表现，以致无法调查物理问题或者
-'首要冲突源'时，才能使用无效物理。
+仅当无效碰撞没有向地区反馈回足够的表现，
+以致无法调查物理问题或者
+ ‘首要碰撞源’ 时，才能使用无效物理。
-完成后请确认恢复物理, 否则化身们
-还将无法移动。
+完成后请确认恢复物理, 否则化身们还将无法移动。
默认:关
</message>
</alert>
<alert name="HelpRegionTopColliders" title="首要冲击源">
<message name="message">
- 列出正在经受大量潜在的物物冲突的
-东东的名单。这些东东可能会减慢
-模拟性能。如果模拟物理的时间超过20秒，
- 选择查看 > 统计条和模拟器 > 时间 > 模拟时间 (物理)
-来查看。
+ 列出正在经受大量潜在的物物碰撞的
+物体的名单。这些物体可能会减慢
+模拟性能。选择查看 > 统计条
+然后模拟器 > 时间 > 模拟时间 (物理)
+来参考是否有至少 20 毫秒花在物理上了。
</message>
</alert>
<alert name="HelpRegionTopScripts" title="首要脚本">
<message name="message">
- 显示花费很多时间运行林登脚本语言的东东
-的名单。 这些东东可能会减慢模拟性能。
-如果脚本花费时间超过25秒，选择查看 >
-统计条和模拟器 > 时间 >脚本时间
-来查看。
+ 显示花费很多时间运行林登脚本语言的物体
+的名单。 这些物体可能会减慢模拟性能。
+选择查看 > 统计条
+然后模拟器 > 时间 > 模拟时间 (物理)
+来参考是否有至少 25 毫秒花在脚本上了。
</message>
</alert>
- <alert name="HelpRegionRestart" title="重新进入地区">
+ <alert name="HelpRegionRestart" title="重新启动地区">
<message name="message">
- 两分钟的警告之后，将会重新启动这片区域运行
-的服务器处理过程。区域内的所有居民将会
-断线。区域内的数据将会保留,并且应会在
-90秒钟以内恢复正常。
+ 两分钟的警告之后，将会重新启动这片区域的服务器进程。
+区域内的所有居民将会断线。区域内的数据将会保留，
+并且应会在 90 秒钟以内恢复正常。
-重新启动不会带来太多的性能问题，
-并且应该只有在收到指示时才用到。
+重新启动不会解决太多的性能问题，
+所以应该只有在收到指示时才用到。
</message>
</alert>
<alert name="HelpRegionWaterHeight" title="水深">
<message name="message">
- 这时水域的深度。 如果设置值是
-除去20外的任何值，并且你拥有的是临近世界
-边缘的水域，或者 '无用'
-水,那么所看见的就是一个沟渠。
+ 这是水面出现的深度。如果该值不是 20，
+并且你拥有临近世界边缘的水域或者
+‘空洞’ 水，那么将会可以看到水面断开。
默认: 20
</message>
</alert>
<alert name="HelpRegionTerrainRaise" title="地形升高">
<message name="message">
- 这个市单位土地主人能够抬高他们的
-地形，使得其高于 'baked' 地形的默认
-高度。
+ 这是地块拥有人可以将他们的
+土地升高至 ‘烘烤的’ 土地
+默认高度之上的最高值。
默认: 4
</message>
</alert>
<alert name="HelpRegionTerrainLower" title="地形降低">
<message name="message">
- 这个是单位土地的主人能够使
-他们的地形比 'baked' 地形高度低的默认
-距离。
+ 这是地块拥有人可以将他们的
+土地降低至 ‘烘烤的’ 土地
+默认高度之下的最低值。
默认: -4
</message>
</alert>
<alert name="HelpRegionUploadRaw" title="上传后缀为 RAW的地形">
<message name="message">
- 点击这个按钮可以把后缀为.RAW的文件上传到你所在的地区。
-文件必须包含正确的尺寸和通道数:
-RGB, 256x256 and 13 通路. 创建地形文件最好的
-方法就是下载已有的 RAW 文件。一个好的
-首要步骤是修复第一个通路 (陆地高度),
-并将它上传。
+ 点击这个按钮可以把后缀为 .RAW 的文件上传到你所在的地区。
+文件必须包含正确的尺寸和通道数: RGB, 256×256 和 13 个通道。
+创建地形文件最好的方法就是下载已有的 RAW 文件。一个好的
+首要步骤是修复第一个通道 (陆地高度)，并将它上传。
-上传过程需时45秒。请注意，上传地形文件
-时 *不能* 移动地上的东东,
-只有地形本身还有允许的包裹可以移动。
-这会导致东东沉入地下。
+上传过程需时 45 秒。请注意，上传地形文件 *不会* 移动
+地上的物体, 只会移动地形本身和地块相关的权限。
+这可能导致物体沉入地下。
-更多关于编辑高地区域的信息, 请登陆:
-http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
+更多编辑区域高度图的信息，请按 F1 键寻求帮助。
</message>
</alert>
<alert name="HelpRegionDownloadRaw" title="下载后缀为RAW的地形">
<message name="message">
- 点击此按钮可以下载包含土地高度数据,单位土地尺寸，
-代售单位土地状况，和此区域内单位土地许可证
-等信息的文件。当用如同Photoshop这类程序打开文件时，
- 你必须指定文件的尺寸为：
- RGB, 256x256 ，13个通路。这种地形文件只能以
-这种方式打开，而不能用别的。
-
-获取更多关于区域内田地高度的信息, 请登陆:
-http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
+ 点击此按钮可以下载包含土地高度数据，地块尺寸，
+地块出售情况，和此区域内单位土地许可证等信息
+的文件。当用如同 Photoshop 这类程序打开文件时，
+你必须指定文件的尺寸为： RGB, 256×256 ，13
+个通道。这种地形文件只能以这种方式打开，
+而不能用别的。
+
+更多编辑区域高度图的信息，请按 F1 键寻求帮助。
</message>
</alert>
- <alert name="HelpRegionUseEstateSun" title="使用领地太阳">
+ <alert name="HelpRegionUseEstateSun" title="使用地产太阳">
<message name="message">
这个选定框可以使这片区域内太阳的位置
-与领地内其他区域内太阳的位置相同。
+与地产内其他区域内太阳的位置相同。
默认:开
</message>
</alert>
<alert name="HelpRegionFixedSun" title="太阳固定">
<message name="message">
- 这个选择框设置太阳的位置固定在太阳
-滑动到此阶段时的位置，并且使得太阳无法移动。
+ 这个选择框设置太阳的位置到滑块
+所指定的位置，并且停止太阳移动。
默认: 关
</message>
</alert>
- <alert name="HelpRegionBakeTerrain" title="硬地">
+ <alert name="HelpRegionBakeTerrain" title="烘烤地形">
<message name="message">
- 这个按钮把当前地形保存为区域内心的默认模式。一旦烤干，土地将恢复成保存的形态，无论何时你或者他人使用编辑‘恢复’选贤/工具。烤干的地形同样是地形上升或下降极限的中点。
+ 这个按钮把当前地形保存为区域地形的默认值。
+ 一旦烤干，你或者他人使用编辑土地的 ‘恢复’选项时
+ 土地将恢复成保存的形态。
+ 烤干的地形也是地形上升或下降极限的中点。
</message>
</alert>
<alert name="HelpEstateEstateManager" title="不动产经理">
<message name="message">
- 领地经理是你委派的负责区域控制
-和领地调节的居民。 领地经理
-有权改变控制板内任何调解项, 除了上传,
-下载,和压缩地形。特别的, 他们有权允许
-或禁止居民进入你的领地。
+ 地产经理是你委派的负责区域控制
+和地产调节的居民。 地产经理
+有权改变控制板内任何调节项, 除了上传,
+下载, 和压缩地形。特别的, 他们有权允许
+或禁止居民进入你的地产。
-领地经理只能被领地主人雇佣或辞退
+地产经理只能被地产主人雇佣或辞退
, 不能互相之间委派。请选择你信任的
-居民作为你的领地经理, 因为他们的
+居民作为你的地产经理, 因为他们的
行为最终将由你负责。
</message>
</alert>
<alert name="HelpEstateUseGlobalTime" title="使用国际时间">
<message name="message">
- 这个选定框可以使你的领地的太阳位置
-与林登所属的'大陆'领地的太阳位置
+ 这个选定框可以使你的地产的太阳位置
+与林登所有的 ‘大陆’ 地产的太阳位置
一致。
默认: 开
@@ -3682,101 +3843,112 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
</alert>
<alert name="HelpEstateFixedSun" title="太阳固定">
<message name="message">
- 这个选择框设置太阳的位置固定在太阳
-滑动到此阶段时的位置，并且使得太阳无法移动。
+ 这个选择框设置太阳的位置到滑块
+所指定的位置，并且停止太阳移动。
</message>
</alert>
- <alert name="HelpEstateMainlandVisible" title="从此处可以看见整个大陆">
+ <alert name="HelpEstateMainlandVisible" title="从此处可以看见大陆">
<message name="message">
- 设置此处领地内的居民是否能从地图上
-看见林登所拥有的 '大陆' 领地。
+ 设置此处地产内的居民是否能从地图上
+看见林登所拥有的 ‘大陆’ 地产。
默认:可以
</message>
</alert>
<alert name="HelpEstateExternallyVisible" title="从大陆可视">
<message name="message">
- 设置在林登所拥有的'大陆'领地内的居民
-是否能从地图上看到你的领地。
+ 设置在在其他地产上的居民是否可以
+ 进入该地产而不需要在访问列表上列出。
-默认:可以
+默认: 可以
</message>
</alert>
- <alert name="HelpEstateAllowDirectTeleport" title="允许直接闪电传送">
+ <alert name="HelpEstateAllowDirectTeleport" title="允许直接瞬间移动">
<message name="message">
- 通过验证后，用户可被闪电传运至自己领地的
-任何一个点。 未通过验证时, 居民只能被闪电
-传运至最近的集合点。
+ 打开该选项后，用户可瞬间移动到你的领地的
+任何一个点。 关闭该选项时, 居民只能瞬间
+移动至最近的瞬间移动枢纽。
默认: 关
</message>
</alert>
<alert name="HelpEstateAllowResident" title="允许进入通道">
<message name="message">
- 一旦任何居民被列于此,前往这块领地的通道
-将对该名单上的居民下面名单上的社团进行限制。
-
-(如果此领地可以从大陆上看见,通道就不能对
-名单上的居民或社团进行限制,且这些控制都是无效的。
-只有 '拒绝的通道' 名单可用。
+ 对该地产的访问将仅限于以下列出的居民和社团。
+该设置仅在 “允许公众访问”关闭时有效。
</message>
</alert>
<alert name="HelpEstateAllowGroup" title="允许社团进入通道">
<message name="message">
- 一旦任何社团被列于此,前往这块领地的通道
-将对名单上的社团进行限制，and residents specifically
-allowed above.
-
-(如果此领地可以从大陆上看见,通道就不能对
-居民或社团名单进行限制,且这些控制都是无效的。
-只有 '拒绝的通道' 名单可用。)
+ 对该地产的访问将仅限列出的社团和以上列出的居民。
+该设置仅在 “允许公众访问”关闭时有效。
</message>
</alert>
- <alert name="HelpEstateBanResident" title="拒绝通过">
+ <alert name="HelpEstateBanResident" title="拒绝访问">
<message name="message">
不管以上社团的设置为什么情况，
-名单上的居民被拒绝到达您的领地。
-
-添加一位居民上此名单将把他从允许名单
-中删除。
+名单上的居民将被拒绝到达您的地产。
+ </message>
+ </alert>
+ <alert name="HelpEstateAbuseEmailAddress" title="不良行为报告电子邮件地址">
+ <message name="message">
+ 将这一项设为有效的电子邮件地址会让
+该地产上的不良行为报告送到这个地址。
+留空该项会使得不良行为报告仅发送给
+林登实验室。
+ </message>
+ </alert>
+ <alert name="HelpEstateVoiceChat" title="允许语音聊天">
+ <message name="message">
+ 允许该地产中的地块拥有自己的语音聊天频道，
+ 可以让居民与临近的其他人交谈。
+
+
+默认：关
+ </message>
+ </alert>
+ <alert name="VoiceVersionMismatch" title="语音聊天版本不符合">
+ <message name="message">
+ 该版本的第二人生与该地区的语音聊天不兼容。
+为了正常使用语音聊天你需要更新第二人生。
</message>
</alert>
<alert name="HelpEstateCovenant" title="不动产契约合同">
<message name="message">
- 设置不动产的契约合同使你可以连不动产一起出售土地。如果在不动产契约合同中没有设置，你则不能出售土地，而只能单独出售不动产。如果在买主购买之前，你不想在土地上设置任何相关的给买主的意见和规定，则这张你契约合同的注释卡可能是空的。
+ 设置不动产的契约合同使你可以出售地产中的土地。如果不动产契约合同没有设置，你则不能出售土地。如果在买主购买之前，你不想在土地上设置任何相关的给买主的意见和规定，你的契约合同的注释卡可以是空的。
一个不动产契约合同可以被用来制定规定和指导方针，表明文化信息或仅仅是你自己对未来买家的期望。它可以包含分区制度，建筑规范，支付方式选择以及任何你认为重要，并希望新主人在购买之前看到，并同意的条款。
买主必须遵守契约合同上所标出的规定，在完成消费前，买主要在是否同意的方格里画钩。不动产契约合同总是在任何设置为此的土地中关于土地对话框中可见。
</message>
</alert>
- <alert name="BuyObjectOneOnly" title="不能购买东东">
+ <alert name="BuyObjectOneOnly" title="不能购买物体">
<message name="message">
- 一次可以购买的东东不得多于一件。
-请仅选择一件东东并再试一遍。
+ 一次无法购买一个以上的物体。
+请仅选择一件物体并再试一遍。
</message>
</alert>
- <alert name="BuyObjectOneOwner" title="不能购买东东">
+ <alert name="BuyObjectOneOwner" title="不能购买物体">
<message name="message">
- 一次无法从不同主人处购买东东。
-请仅选择一件东东，再试一次。
+ 一次无法从不同主人处购买物体。
+请仅选择一件物体，再试一次。
</message>
</alert>
<alert name="BuyContentsOneOnly" title="不能购买内容">
<message name="message">
- 一次可以购买的东东不得多于一件。
-请仅选择一件东东并再试一遍。
+ 一次无法购买一个以上的物体的内容。
+请仅选择一件物体，并再试一遍。
</message>
</alert>
<alert name="BuyContentsOneOwner" title="不能购买内容">
<message name="message">
- 一次无法从不同主人处购买东东。
-请仅选择一件东东，再试一次。
+ 一次无法从不同主人处购买物体。
+请仅选择一件物体，再试一次。
</message>
</alert>
<alert name="PermYes">
<message name="message">
- 是
+ 可
</message>
</alert>
<alert name="PermNo">
@@ -3786,12 +3958,12 @@ allowed above.
</alert>
<alert name="BuyOriginal">
<message name="message">
- 是否消费L$[PRICE]购买初始东东?
-你将成为东东的主人。
+ 是否以 L$[PRICE] 购买原物体?
+你将成为物体的主人。
你将可以：
-修饰: [MODIFYPERM]
+ 修改: [MODIFYPERM]
复制: [COPYPERM]
- 重新出售或馈赠他人: [RESELLPERM]
+ 转卖或赠送: [RESELLPERM]
</message>
<option name="Buy">
购买
@@ -3802,12 +3974,12 @@ allowed above.
</alert>
<alert name="BuyOriginalNoOwner">
<message name="message">
- 是否消费L$[PRICE]购买初始东东?
-你将成为东东的主人。
+ 是否以 L$[PRICE] 购买原物体?
+你将成为物体的主人。
你将可以：
-修饰: [MODIFYPERM]
+ 修改: [MODIFYPERM]
复制: [COPYPERM]
- 重新出售或馈赠他人: [RESELLPERM]
+ 转卖或赠送: [RESELLPERM]
</message>
<option name="Buy">
购买
@@ -3818,12 +3990,12 @@ allowed above.
</alert>
<alert name="BuyCopy">
<message name="message">
- 是否消费L$[PRICE]从[OWNER]处购买一件拷贝?
-这件东东将从你的库存中.
-你可以做的有:
+ 是否以 L$[PRICE] 从 [OWNER] 购买物体的副本?
+这件物体将被复制到你的库存。
+你将可以：
修改: [MODIFYPERM]
复制: [COPYPERM]
- 重新出售或馈赠他人: [RESELLPERM]
+ 转卖或赠送: [RESELLPERM]
</message>
<option name="Buy">
购买
@@ -3834,11 +4006,12 @@ allowed above.
</alert>
<alert name="BuyCopyNoOwner">
<message name="message">
- 是否消费L$[PRICE]购买东东拷贝?
-这件东东将被复制至你的库存中.你将可以：
-修饰: [MODIFYPERM]
+ 是否以 L$[PRICE] 购买物体的副本?
+这件物体将被复制到你的库存。
+你将可以：
+ 修改: [MODIFYPERM]
复制: [COPYPERM]
- 重新出售或馈赠他人: [RESELLPERM]
+ 转卖或赠送: [RESELLPERM]
</message>
<option name="Buy">
购买
@@ -3849,8 +4022,8 @@ allowed above.
</alert>
<alert name="BuyContents">
<message name="message">
- 是否消费L$[PRICE]从[OWNER]处购买内容?
-它们将被拷贝到你的库存。
+ 是否以 L$[PRICE] 从 [OWNER] 购买内容?
+它们将被复制到你的库存。
</message>
<option name="Buy">
购买
@@ -3861,8 +4034,8 @@ allowed above.
</alert>
<alert name="BuyContentsNoOwner">
<message name="message">
- 是否消费L$[PRICE]购买内容?
-它们将被拷贝到你的库存。
+ 是否以 L$[PRICE] 购买内容?
+它们将被复制到你的库存。
</message>
<option name="Buy">
购买
@@ -3873,11 +4046,10 @@ allowed above.
</alert>
<alert name="ConfirmPurchase">
<message name="message">
- 此项处理将:
+ 此项交易将:
+ [ACTION]
-[ACTION]
-
-你确定你愿意把交易进行下去吗?
+你确定要继续购买吗？
</message>
<option name="Confirm">
确认
@@ -3888,11 +4060,10 @@ allowed above.
</alert>
<alert name="ConfirmPurchasePassword">
<message name="message">
- 此项处理将要:
-
-[ACTION]
+ 此项交易将:
+ [ACTION]
-你确定愿意把交易进行下去吗?
+你确定要继续购买吗？
请你再次键入密码并点击确定。
</message>
<option name="ConfirmPurchase">
@@ -3905,163 +4076,228 @@ allowed above.
<alert name="SetPickLocation">
<message name="message">
注意:
-你只上传了位置，其他细节还将保持原值.
+您已经更新了该收藏的
+地址，但其他的细节仍
+会保留其原来的值。
</message>
<option name="OK">
- OK
+ 确定
</option>
</alert>
<alert name="MoveInventoryFromObject">
<message name="message">
- 你已经选择 '不可复制'的库存东东。
-这些东东将被移出库存，不能被复制。
+ 你已经选择 ‘不可复制’ 的物品条目。
+这些物体将被移入库存，而不是被复制。
-确定移动库存东东吗?
+确定移动物体吗?
</message>
+ <ignore name="ignore">
+ 从物体内容中移动不可复制的条目
+ </ignore>
<option name="Move">
移动
</option>
<option name="Don'tMove">
- 禁止移动
+ 不要移动
</option>
</alert>
<alert name="MoveInventoryFromScriptedObject">
<message name="message">
- 你已经选择 '不可复制'的库存东东。
-这些东东将被移出库存，不能被复制。
-
-因为此东东已经被记录,移动它至你的
-目录可能会导致脚本故障。
+ 你已经选择 ‘不可复制’ 的物品条目。
+这些物体将被移入库存，而不是被复制。
-确定移动库存东东?
+由于此物体带有脚本，将这些条目移动到
+你的库存可能造成脚本故障。
+
+确定移动物体吗?
</message>
<option name="Move">
移动
</option>
<option name="Don'tMove">
- 禁止移动
+ 不要移动
</option>
</alert>
<alert name="ClickActionNotPayable">
<message name="message">
- 警告：购买东东选项已设定,但它仅在
-脚本被添加到金钱支付()情节时才能使用.
-这是因为居民通常希望钱一旦支付,
-购买的东东就可以使用.
+ 警告：向物体付款的动作已经设定，但它仅在
+添加了带有 money() 事件的脚本后才能工作。
</message>
+ <ignore name="ignore">
+ 在物体上设置付款动作但没有 money() 事件时
+ </ignore>
</alert>
<alert name="OpenObjectCannotCopy">
<message name="message">
- 在你允许复制的对象中没有找到项目。
+ 这个物体中没有你能够复制的项目。
</message>
</alert>
- <alert name="LoadAccountTransactions">
+ <alert name="WebLaunchAccountHistory">
<message name="message">
- 是否跳至[URL]
-查看处理细节?
+ 是否前往第二人生网站查看你的帐户记录？
</message>
- <option name="OK">
- OK
+ <ignore name="ignore">
+ 打开浏览器查看帐户记录
+ </ignore>
+ <option name="Gotopage">
+ 打开网页
</option>
<option name="Cancel">
取消
</option>
</alert>
+ <alert name="ClickOpenF1Help">
+ <message name="message">
+ 访问第二人生帮助网站吗？
+ </message>
+ <ignore name="ignore">
+ 访问第二人生帮助网站时
+ </ignore>
+ <option name="Gotopage">
+ 打开页面
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="RetryFetchInventoryDescendents">
+ <message name="message">
+ 从服务器获取库存超时。再试一次吗？
+ </message>
+ <ignore name="ignore">
+ 重试读取库存
+ </ignore>
+ <option name="Retry">
+ 重试
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="ConfirmQuit">
+ <message name="message">
+ 确定退出?
+ </message>
+ <ignore name="ignore">
+ 退出第二人生时
+ </ignore>
+ <option name="Quit">
+ 退出
+ </option>
+ <option name="Continue">
+ 继续
+ </option>
+ </alert>
<alert name="HelpReportAbuseEmailLL">
<message name="message">
- 使用这个工具可以报告违反服务和社区标准条例的操作。详情请见：
+ 使用这个工具可以报告违反服务条例和社区标准条例的操作。详情请见：
-
http://secondlife.com/corporate/tos.php
http://secondlife.com/corporate/cs.php
-
-所有对违反服务和社区标准条例的报告都会被调查并解决。你会收到一封邮件提示你解决的进展情况。同时，你可以在线查看秩序本，及时获得事件的解决情况。在线秩序本的地址是:
+所有对违反服务和社区标准条例的报告都会被调查并解决。你会
+收到一封邮件提示你解决的进展情况。同时，你可以在线查看事
+件报告，及时获得事件的解决情况。在线秩序本的地址是:
-
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
</message>
</alert>
<alert name="HelpReportAbuseEmailEO">
<message name="message">
- 重要提示: 这个报告将不会到达林登实验室处，而会发送给你目前所在区域的主人。
+ 重要提示: 这个报告将不会到达林登实验室处，而会发送给你
+目前所在区域的主人。
-
-作为一项针对于居民和游客的服务，你所在这块区域的主人有责任接受所有来自这块区域的问题报告，并有责任解决它们。林登实验室将不会调查你从所在地点提交的问题报告。这块区域的主人将遵守土地契约，解决一些基于此块区域的本地规则的报告。（查看土地土地契约，可以进入游戏
+作为一项针对于居民和游客的服务，你所在这块区域的主人有责任
+接受所有来自这块区域的问题报告，并有责任解决它们。
+林登实验室将不会调查你从所在地点提交的问题报告。
+
+这块区域的主人将遵守基于土地契约所概述的当地规则，解决报告。
+(你可以从世界菜单中选择 “关于土地” 来查看契约。)
+
+该报告的解决结果仅对该区域有效；居民对第二人生其他地方的使用
+将不会受该报告结果的影响。只有林登实验室能够限制访问整个
+第二人生。
</message>
</alert>
<alert name="HelpReportBug">
<message name="message">
- Use this tool to report technical features that do not perform
-as described or expected. All bug reports are investigated and
-resolved. No email response will be sent, you may reply to the
-auto-response email to add more details to your report.
-If you are having a technical difficulty, please contact Support at:
-
+ 这个工具只用来报告与描述或预期工作不一致的技术功能。请尽能提供详细资料。
+你也可以回复自动确认电子邮件来为你的报告添加更多细节。
+
+所有的错误都会被追查并评估。不会有任何电子邮件回复。
+
+如果你遇到了技术障碍，请与支持取得联系：
+
http://secondlife.com/community/support.php
+
+注意：不完整的报告将不会被调查。
</message>
</alert>
<alert name="HelpReportAbuseSelectCategory">
<message name="message">
- 请为次辱骂事件报告选择一项分类。
-
-选择一个分类可以帮助我们归档和处理辱骂事件。
+ 请为此次不良行为报告选择一项分类。
+ 选择一个分类可以帮助我们归档和处理不良行为报告。
</message>
</alert>
<alert name="HelpReportBugSelectCategory">
<message name="message">
- Please select a category for this bug.
-
-Selecting a category helps us file and process bug reports.
+ 请为此次错误报告选择一项分类。
+ 选择一个分类可以帮助我们归档和处理错误报告。
</message>
</alert>
<alert name="HelpReportAbuseAbuserNameEmpty">
<message name="message">
- 请输入辱骂者的名字.
-
-输入正确的描述可以帮助我们归档和处理辱骂事件。
+ 请输入辱骂者的名字。
+输入正确的描述可以帮助我们归档和处理不良行为报告。
</message>
</alert>
<alert name="HelpReportAbuseAbuserLocationEmpty">
<message name="message">
- 请输入辱骂事件发生的地址。
+ 请输入不良行为发生的地址。
-输入正确的描述可以帮助我们归档和处理辱骂事件。
+输入正确的描述可以帮助我们归档和处理不良行为报告。
</message>
</alert>
<alert name="HelpReportAbuseSummaryEmpty">
<message name="message">
- 请输入已发生的辱骂事件的概括。
+ 请输入不良行为的概况。
-输入对事件的正确描述可以帮助我们归档和处理辱骂事件。
+输入对事件的正确描述可以帮助我们归档和处理不良行为报告。
</message>
</alert>
<alert name="HelpReportBugSummaryEmpty">
<message name="message">
- Please enter a summary of the bug.
+ 请输入错误概况。
-Entering an accurate summary helps us file and process bug reports.
+输入对事件的正确描述可以帮助我们归档和处理错误报告。
</message>
</alert>
<alert name="HelpReportAbuseDetailsEmpty">
<message name="message">
- 请键入已发生的辱骂事件的详细描述.请尽量详细描述，包括你报告事件的名称和细节。
+ 请键入不良行为的详细描述。请尽量具体地描述，包括名字和报告事件细节。
输入对事件的正确描述可以帮助我们归档和处理辱骂事件。
</message>
</alert>
<alert name="HelpReportBugDetailsEmpty">
<message name="message">
- Please enter a detailed description of the bug.
-Be as specific as you can, including steps to reproduce the bug
-if possible.
+ 请键入错误的详细描述。
+请尽量具体地描述，可能的话包括如何再现错误的步骤。
-Entering an accurate description helps us file and process bug reports.
+输入对事件的正确描述可以帮助我们归档和处理错误报告。
</message>
</alert>
<alert name="HelpReportAbuseContainsCopyright">
<message name="message">
亲爱的居民,
+如果您将要报告知识产权侵犯，请确认您通过正确的方式报告:
+
+(1) 不良行为报告手续。您可以提交一份不良行为报告，如果您相信某位居民正在利用第二人生许可系统的漏洞，例如使用 CopyBot 或者类似的复制工具，来侵犯知识产权。不良行为调查小组负责对于违反第二人生社区标准或服务条款的行为进行调查以及实行相应的惩罚措施。但是，不良行为调查小组不负责从世界中移除内容，并且不会对这类请求作出回应。
-关于版权侵害的报告只能通过下列网页上http://secondlife.com/corporate/dmca.php描述的方式提交.
+(2) DMCA (数字千年版权协定) 或者说内容移除手续。 要请求从第二人生中去除内容，您*必须*提交一份按我们 DMCA 条例 http://secondlife.com/corporate/dmca.php 中所指出的，有效的侵权通知。
-关于版权侵害的报告，如果通过'辱骂报告'方式提交，将被系统自动忽视。如果您的报告和版权侵害无关，请关闭此窗口，并完成提交您的报告。
+如果您仍希望继续不良行为的报告，请关闭此窗口，并完成提交您的报告。
+您可能需要选择 ‘CopyBot 或利用漏洞’ 这一特定分类。
感谢您的合作,
@@ -4070,55 +4306,558 @@ Entering an accurate description helps us file and process bug reports.
</alert>
<alert name="FailedRequirementsCheck">
<message name="message">
- 以下要求的内容是丢失于[FLOATER]:
+ 以下必须的部件丢失于 [FLOATER]:
[COMPONENTS]
</message>
</alert>
<alert name="ReplaceAttachment" title="替换已经存在的附件">
<message name="message">
- 这里已经有一件东东附在了你的身体上。 你是否要用所选东东替代它？
+ 已经有一个物体附在身体的这个部位上了。 你是否要用所选物体替代它？
</message>
- <option ignore="自动换位" name="Yes">
+ <ignore name="ignore">
+ 替换已有的附件时
+ </ignore>
+ <option ignore="自动替换" name="Yes">
是
</option>
- <option ignore="永远不换位" name="No">
+ <option ignore="永远不替换" name="No">
否
</option>
</alert>
- <alert name="BusyModePay" title="繁忙模式警告">
+ <alert name="BusyModePay" title="忙碌模式警告">
<message name="message">
你在忙碌模式中, 这意味着你将不能
-收到这次交易中以找零形式
-提供的任何物品。
+收到这次交易中对方提供的任何物品。
-你是否愿意在完成处理前
-退出繁忙模式?
+你是否愿意在完成交易前
+退出忙碌模式?
</message>
- <option ignore="总使用忙碌模式" name="Yes">
+ <ignore name="ignore">
+ 忙碌模式中付款给他人或物体时
+ </ignore>
+ <option ignore="总离开忙碌模式" name="Yes">
是
</option>
- <option ignore="从不使用忙碌模式" name="No">
+ <option ignore="从不离开忙碌模式" name="No">
否
</option>
</alert>
<alert name="ConfirmEmptyTrash">
<message name="message">
- 你确定要永久性删除垃圾文件夹里的内容吗？
+ 你确定要永久性删除垃圾箱里的内容吗？
</message>
+ <ignore name="ignore">
+ 清空库存垃圾箱文件夹时
+ </ignore>
<option name="Yes">
- 使得，我要删除
+ 是的，删除
</option>
<option name="No">
不是
</option>
</alert>
+ <alert name="ConfirmClearBrowserCache">
+ <message name="message">
+ 确实要清除浏览器缓存吗？
+ </message>
+ <option name="Yes">
+ 清除
+ </option>
+ <option name="No">
+ 取消
+ </option>
+ </alert>
+ <alert name="ConfirmClearCookies">
+ <message name="message">
+ 确实要清除 Cookies 吗？
+ </message>
+ <option name="Yes">
+ 清除
+ </option>
+ <option name="No">
+ 取消
+ </option>
+ </alert>
+ <alert name="ConfirmClearMediaUrlList">
+ <message name="message">
+ 确实要清除保存的 URL 列表吗？
+ </message>
+ <option name="Yes">
+ 清除
+ </option>
+ <option name="No">
+ 取消
+ </option>
+ </alert>
<alert name="CopySLURL">
<message name="message">
以下链接已经被复制到你的剪贴板中:
[SLURL]
- 把它加入到网页里，可以让别人更容易的进入这个地点，或者直接拉入浏览器的地址栏中，让自己进入这个地点。
+ 把它加入到网页里，让别人更容易的访问这个地点，
+ 或者直接粘贴到浏览器的地址栏中自己尝试一下。
+ </message>
+ </alert>
+ <alert name="ConfirmEmptyLostAndFound">
+ <message name="message">
+ 你确定要永久性删除失物招领文件夹里的内容吗？
+ </message>
+ <ignore name="ignore">
+ 清空库存失物招领文件夹时
+ </ignore>
+ <option name="Yes">
+ Yes
+ </option>
+ <option name="No">
+ No
+ </option>
+ </alert>
+ <alert name="GraphicsPreferencesHelp">
+ <message name="message">
+ 该面板控制窗口尺寸和分辨率，以及客户端图形质量。你可以选择四种图像等级：低、中、高和极高。你也可以选择自定义，来更改以下的设置：
+
+着色器：启用或禁用各种像素着色器。
+
+反射细节：设置可以反射的物体类型。
+
+化身渲染：设置影响客户端渲染化身的选项。
+
+描绘距离: 影响离你的视角多远的物体将会被渲染在场景中。
+
+最大粒子数:设置你在屏幕上同时可见粒子的最大数目。
+
+后期处理质量：设置光辉渲染的分辨率。
+
+模型细节: 设置渲染各类物体时的细节，或者说使用三角形的数目。较高的值渲染时间较长，但会令物体显得更具细节。
+
+光照细节: 选择你想要渲染什么类型的灯光。
+
+地面细节: 选择地面材质细节量。
+ </message>
+ </alert>
+ <alert name="WLSavePresetAlert">
+ <message name="message">
+ 你希望覆盖保存的预设吗？
+ </message>
+ <option name="Save">
+ 保存
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="WLDeletePresetAlert">
+ <message name="message">
+ 你希望删除 [SKY] 吗?
+ </message>
+ <option name="Delete">
+ 删除
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="WLNoEditDefault">
+ <message name="message">
+ 你不能编辑或删除默认预设。
+ </message>
+ </alert>
+ <alert name="WLMissingSky">
+ <message name="message">
+ 该日期循环文件参考了一个不存在的天空文件: [SKY].
+ </message>
+ </alert>
+ <alert name="PPSaveEffectAlert">
+ <message name="message">
+ 后处理效果已存在。还是想要覆盖它吗？
+ </message>
+ <option name="Save">
+ 是
+ </option>
+ <option name="Cancel">
+ 否
+ </option>
+ </alert>
+ <alert name="HelpEditSky">
+ <message name="message">
+ 编辑 WindLight 滑动条创建和保存天空设定。
+ </message>
+ </alert>
+ <alert name="HelpEditDayCycle">
+ <message name="message">
+ 选择一天之内出现哪些天空。
+ </message>
+ </alert>
+ <alert name="EnvSettingsHelpButton">
+ <message name="message">
+ 这些设置调节环境在您的电脑上看起来怎么样。您的显卡需要支持大气染色器才能利用全部的设置。
+
+调节 "时间" 滑块来在本地改变一日的时间。
+
+调节 "云层覆盖" 滑块来控制云彩的多少。
+
+选择 "水色" 改变水的颜色。
+
+调节 "水雾" 控制水下的雾的浓淡。
+
+点击 "使用地产时间" 使时间返回到区域的时间并与之同步。
+
+点击 "高级天空选项" 来打开较高级天空设置的编辑器。
+
+点击 "高级水面选项" 来打开较高级水面设置的编辑器。
+ </message>
+ </alert>
+ <alert name="HelpDayCycle">
+ <message name="message">
+ 日夜周期编辑器给予你对第二人生日夜循环中天空的控制。这也是基础环境编辑器的时间滑块所使用的周期。
+
+日夜周期编辑器的基础是关键帧。它们是带有天空预设的节点 (在时间图上以灰色的点表示)。当时间流逝，WindLight 的天空 也会通过过在这些关键帧之间插值而产生变化。
+
+在时间线之上的黄色箭头表示您当前所看到天空的时间。拖动它可以看到您的天空将如何变化。您可以按右边的添加键和删除键按钮来添加或删除关键帧。
+
+您可以通过在时间线上拖动关键帧来改变其时间位置，也可以直接在关键帧设置中直接设置它的值。在关键帧设置中，您可以将关键帧与其相应的 WindLight 预设联系起来。
+
+周期长度决定一天的时间长短。将这个值设得较低 (例如，2 分钟) 意味着您整个 24 小时的时间线完成变化的时间将只有实际的两分钟！一旦您对时间线和关键帧周期满意，使用播放和停止按钮来预览结果。切记 — 您也可以拖动黄色的时间指示箭头观看天空变化。使用使用地产时间按钮将使您的全天长度与时间和地产的日夜周期同步。
+
+当您对您的日夜周期满意时，您可以使用保存测试日和读取测试日按钮将其保存。请注意，我们现在只允许一个日夜周期。
+ </message>
+ </alert>
+ <alert name="HelpBlueHorizon">
+ <message name="message">
+ 使用 红色/绿色/蓝色 (RGB) 滑块来编辑天空的颜色。您可以用强度 (I) 滑块来同时移动红绿蓝滑块。
+ </message>
+ </alert>
+ <alert name="HelpHazeHorizon">
+ <message name="message">
+ 云雾地平是调节整个场景曝光最有用的参数。它可以有效地模仿多种曝光设定，
+例如雪天白茫茫一片的场景以及曝光不足较阴暗的场景。
+ </message>
+ </alert>
+ <alert name="HelpBlueDensity">
+ <message name="message">
+ 蓝色浓度影响整个天空和雾的饱和度。如果您将强度 (I) 滑块向右移动，颜色将变得更亮、更鲜艳。如果您将其移动到最左边，颜色将变得暗淡，直到最后成为黑白。如果您想要精细的调节天空的颜色平衡，您可以使用红色/绿色/蓝色 (RGB) 滑块单独控制各个颜色的饱和度。
+ </message>
+ </alert>
+ <alert name="HelpHazeDensity">
+ <message name="message">
+ 云雾浓度控制大气中灰蒙蒙雾霾的量。在模拟含有大量烟雾和人造污染物的场景时很有效。也适于模拟雾和霭。
+ </message>
+ </alert>
+ <alert name="HelpDensityMult">
+ <message name="message">
+ 浓度乘数可以用来影响整个的大气浓度。在较低的设定上，它可以表现出 “稀薄空气” 的感受，而较高的设定将会创造厚重而浓的效果。
+ </message>
+ </alert>
+ <alert name="HelpDistanceMult">
+ <message name="message">
+ 调节 WindLight 的距离效果。设置为零将等同于关闭 WindLight 对地面和物体的作用。大于 1 的值模拟比实际更深的距离，产生更浓的气象效果。
+ </message>
+ </alert>
+ <alert name="HelpMaxAltitude">
+ <message name="message">
+ 最大高度调节 WindLight 进行气象计算时所作的高度计算。 在傍晚时分时，用它来调节日落的 ‘深度’ 很有作用。
+ </message>
+ </alert>
+ <alert name="HelpSunlightColor">
+ <message name="message">
+ 调节场景中的直射光源的亮度和颜色。
+ </message>
+ </alert>
+ <alert name="HelpSunAmbient">
+ <message name="message">
+ 调节场景中的环境光亮度和颜色。
+ </message>
+ </alert>
+ <alert name="HelpSunGlow">
+ <message name="message">
+ 尺寸滑块控制太阳的尺寸。
+聚焦滑块调节太阳在天空中模糊的程度。
+ </message>
+ </alert>
+ <alert name="HelpSceneGamma">
+ <message name="message">
+ 调节屏幕的明暗分布。
+ </message>
+ </alert>
+ <alert name="HelpStarBrightness">
+ <message name="message">
+ 调节天空中星星的亮度。
+ </message>
+ </alert>
+ <alert name="HelpTimeOfDay">
+ <message name="message">
+ 调节太阳在天空中的位置。
+类似高度。
+ </message>
+ </alert>
+ <alert name="HelpEastAngle">
+ <message name="message">
+ 调节太阳在天空中的位置。
+类似方位角。
+ </message>
+ </alert>
+ <alert name="HelpCloudColor">
+ <message name="message">
+ 编辑云的颜色。一般来说，
+建议还是白一点好，不过嘛，
+想要有点乐趣当然也没问题。
+ </message>
+ </alert>
+ <alert name="HelpCloudDetail">
+ <message name="message">
+ 控制覆盖在在主云层图像之上的细节图。X 和 Y 控制它的位置。 D (密度) 控制云看起来是蓬松还是离散。
+ </message>
+ </alert>
+ <alert name="HelpCloudDensity">
+ <message name="message">
+ 可以用 X 和 Y 滑块控制云层的位置，D (密度) 控制云层的密度。
+ </message>
+ </alert>
+ <alert name="HelpCloudCoverage">
+ <message name="message">
+ 控制云覆盖天空的量。
+ </message>
+ </alert>
+ <alert name="HelpCloudScale">
+ <message name="message">
+ 控制云层在穹顶上的大小。
+ </message>
+ </alert>
+ <alert name="HelpCloudScrollX">
+ <message name="message">
+ 控制云层在 X 轴移动的速度。
+ </message>
+ </alert>
+ <alert name="HelpCloudScrollY">
+ <message name="message">
+ 控制云层在 Y 轴移动的速度。
+ </message>
+ </alert>
+ <alert name="HelpClassicClouds">
+ <message name="message">
+ 选取该框以在渲染 WindLight 的云层同时渲染第二人生的旧云层。
+ </message>
+ </alert>
+ <alert name="HelpWaterFogColor">
+ <message name="message">
+ 控制水雾颜色。
+ </message>
+ </alert>
+ <alert name="HelpWaterFogDensity">
+ <message name="message">
+ 控制水雾浓度及水下视野范围。
+ </message>
+ </alert>
+ <alert name="HelpUnderWaterFogMod">
+ <message name="message">
+ 修饰水雾浓度指数的效果，控制水下视野范围。
+ </message>
+ </alert>
+ <alert name="HelpWaterGlow">
+ <message name="message">
+ 控制水面发光的范围。
+ </message>
+ </alert>
+ <alert name="HelpWaterNormalScale">
+ <message name="message">
+ 控制组成水面的三个小波的缩放。
+ </message>
+ </alert>
+ <alert name="HelpWaterFresnelScale">
+ <message name="message">
+ 控制不同角度反射的光量多少。
+ </message>
+ </alert>
+ <alert name="HelpWaterFresnelOffset">
+ <message name="message">
+ 控制反光强度。
+ </message>
+ </alert>
+ <alert name="HelpWaterScaleAbove">
+ <message name="message">
+ 控制水面上放折射光量的大小。
+ </message>
+ </alert>
+ <alert name="HelpWaterScaleBelow">
+ <message name="message">
+ 控制水面下方折射光量的大小。
+ </message>
+ </alert>
+ <alert name="HelpWaterBlurMultiplier">
+ <message name="message">
+ 控制水波和折射混合的方式。
+ </message>
+ </alert>
+ <alert name="HelpWaterNormalMap">
+ <message name="message">
+ 改变决定水面反射/折射的法向贴图。
+ </message>
+ </alert>
+ <alert name="HelpWaterWave1">
+ <message name="message">
+ 控制较大尺寸的法向贴图在 X 和 Y 方向上移动的速度。
+ </message>
+ </alert>
+ <alert name="HelpWaterWave2">
+ <message name="message">
+ 控制较小尺寸的法向贴图在 X 和 Y 方向上移动的速度。
+ </message>
+ </alert>
+ <alert name="NewSkyPreset">
+ <message name="message">
+ 给新的天空取一个名字。
+ </message>
+ <editline name="editline">
+ 新设定
+ </editline>
+ <option name="OK">
+ 确定
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="ExistsSkyPresetAlert">
+ <message name="message">
+ 预设已存在！
+ </message>
+ </alert>
+ <alert name="NewWaterPreset">
+ <message name="message">
+ 给新的水面取一个名字。
+ </message>
+ <editline name="editline">
+ 新设定
+ </editline>
+ <option name="OK">
+ 确定
+ </option>
+ <option name="Cancel">
+ 取消
+ </option>
+ </alert>
+ <alert name="ExistsWaterPresetAlert">
+ <message name="message">
+ 预设已存在！
+ </message>
+ </alert>
+ <alert name="WaterNoEditDefault">
+ <message name="message">
+ 您不能更改或删除默认预设。
+ </message>
+ </alert>
+ <alert name="ChatterBoxSessionStartError">
+ <message name="message">
+ 无法与 [RECIPIENT] 开始会话。
+[REASON]
+ </message>
+ <option name="OK">
+ 确定
+ </option>
+ </alert>
+ <alert name="ChatterBoxSessionStartNotVerified">
+ <message name="message">
+ 启动与 [RECIPIENT] 的聊天会话时出错。
+[REASON]
+ </message>
+ <option name="OK">
+ 确定
+ </option>
+ </alert>
+ <alert name="ChatterBoxSessionEventError">
+ <message name="message">
+ [EVENT]
+[REASON]
+ </message>
+ <option name="OK">
+ 确定
+ </option>
+ </alert>
+ <alert name="ForceCloseChatterBoxSession">
+ <message name="message">
+ 您与 [NAME] 的聊天会话必须关闭。
+[REASON]
+ </message>
+ <option name="OK">
+ 确定
+ </option>
+ </alert>
+ <alert name="Cannot_Purchase_an_Attachment">
+ <message name="message">
+ 物品作为附件时无法购买。
+ </message>
+ </alert>
+ <alert name="DebitPermissionDetails" title="About Requests for the Debit Permission">
+ <message name="message">
+ 授予该请求将给予脚本持续的从您的帐户中提取林登币 (L$) 的许可。要取消这项许可，物体的拥有者必须删除物体或重置物体中的脚本。
+ </message>
+ <option name="OK">
+ 确定
+ </option>
+ </alert>
+ <alert name="AutoWearNewClothing">
+ <message name="message">
+ 希望自动穿着您创建的衣物吗？
+ </message>
+ <ignore name="ignore">
+ 自动穿着新衣物
+ </ignore>
+ <option name="Yes">
+ 是
+ </option>
+ <option name="No">
+ 否
+ </option>
+ </alert>
+ <alert name="BadURL">
+ <message name="message">
+ 第二人生不知道怎么处理这个链接:
+ [SLURL]
+大部分链接像是这样的:
+
+secondlife:///app/agent/ae1c96b8-9bca-4e5b-9418-80e5397a2b41/about
+
+请检查拼写再试一次。
+ </message>
+ </alert>
+ <alert name="NotAgeVerified">
+ <message name="message">
+ 您需要验证年龄才能进入这个地块。
+您希望访问第二人生网站验证您的年龄吗？
+
+[_URL]
+ </message>
+ <ignore name="ignore">
+ 警告没有验证年龄时
+ </ignore>
+ <option name="Yes">
+ 是
+ </option>
+ <option name="No">
+ 否
+ </option>
+ </alert>
+ <alert name="无法进入地块: 支付信息不在案">
+ <message name="message">
+ 这个地块需要你登记支付信息然后才能访问它。
+您要访问第二人生网站来登记吗？
+
+[_URL]
+ </message>
+ <ignore name="ignore">
+ 警告缺少支付信息
+ </ignore>
+ <option name="Yes">
+ 是
+ </option>
+ <option name="No">
+ 否
+ </option>
+ </alert>
+ <alert name="MissingString">
+ <message name="message">
+ strings.xml 中找不到字符串 [STRING_NAME]
</message>
</alert>
</alerts>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index bee9def..6fe2b40 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,32 +1,35 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_about" title="关于第二人生">
<text_editor name="credits_editor">
- 第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ and many others.
+ 第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ 以及更多人。
感谢以下居民，他们的帮助保证了这次第二人生的版本是有史以来最出色的: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel at 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 at cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+ 3Dconnexion SDK Copyright © 1992-2007 3Dconnexion
+ APR Copyright © 2000-2004 The Apache Software Foundation
+ cURL Copyright © 1996-2002, Daniel Stenberg, (daniel at haxx.se)
+ DBus/dbus-glib Copyright © 2002, 2003 CodeFactory AB / Copyright © 2003, 2004 Red Hat, Inc.
+ expat Copyright © 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+ FreeType Copyright © 1996-2002, The FreeType Project (www.freetype.org).
+ GL Copyright © 1999-2004 Brian Paul.
+ Havok.com(TM) Copyright © 1999-2001, Telekinesys Research Limited.
+ jpeg2000 Copyright © 2001, David Taubman, The University of New South Wales (UNSW)
+ jpeglib Copyright © 1991-1998, Thomas G. Lane.
+ ogg/vorbis Copyright © 2001, Xiphophorus
+ OpenSSL Copyright © 1998-2002 The OpenSSL Project.
+ SDL Copyright © 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ SSLeay Copyright © 1995-1998 Eric Young (eay at cryptsoft.com)
+ xmlrpc-epi Copyright © 2000 Epinions, Inc.
+ zlib Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.
All rights reserved. 查看licenses.txt获取细节.
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+ 语音聊天音频编码: Polycom® Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
- We can only see a short distance ahead, but we can see plenty there that needs to be done. --Alan Turing
+吾所能见之途虽近，而所见需做之事已多矣。—— 亚兰·图灵
</text_editor>
+ <string name="you_are_at">
+ 您现在位于 [POSITION]
+ </string>
</floater>
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 cd85615..8f3d1da 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floaterland" title="关于土地">
<tab_container name="landtab">
- <panel label="General" name="land_general_panel">
+ <panel label="一般" name="land_general_panel">
<text type="string" length="1" name="Name:">
名字:
</text>
@@ -16,20 +16,20 @@
</text>
<button label="档案..." label_selected="档案..." name="Profile..." />
<text type="string" length="1" name="Group:">
- Group:
+ 社团:
</text>
- <button label="调节..." label_selected="调节..." name="Set..." />
+ <button label="更改..." label_selected="更改..." name="Set..." />
<check_box label="允许转让给社团" name="check deed"
- tool_tip="一个社团官员可以转让这块土地至社团，所以它将被社团和目前的土地分配情况支持。" />
- <button label="契约..." label_selected="契约..." name="Deed..."
- tool_tip="如果你是所选社团中的官员，则你可能只能转让土地." />
- <check_box label="地主义转让的形式捐献" name="check contib"
- tool_tip="当土地被转让给社团时, 前一个主人贡献足够的土地配置以支持土地的运行." />
+ tool_tip="一个社团官员可以转让这块土地至社团，使其被社团的土地配额支持。" />
+ <button label="转让..." label_selected="转让..." name="Deed..."
+ tool_tip="只有你是所选社团官员的时候才能转让土地。" />
+ <check_box label="拥有者在转让同时给出贡献" name="check contib"
+ tool_tip="当土地被转让给社团时, 前一个主人贡献足够的土地配额以支持土地的运行。" />
<text type="string" length="1" name="For Sale:">
- 待售:
+ 出售:
</text>
<text type="string" length="1" name="Not for sale.">
- 非卖状态
+ 非卖状态。
</text>
<text type="string" length="1" name="For Sale: Price L$[PRICE].">
价格: L$[PRICE].
@@ -39,38 +39,38 @@
出售给: [BUYER]
</text>
<text type="string" length="1" name="Sell with landowners objects in parcel.">
- 包括代售状态的东东.
+ 出售中包括物体。
</text>
<text type="string" length="1" name="Selling with no objects in parcel.">
- 不包括代售状态下的东东.
+ 出售中不包括物体。
</text>
<button label="取消土地出售" label_selected="取消土地出售"
name="Cancel Land Sale" />
<text type="string" length="1" name="Claimed:">
- 声明:
+ 认购时间:
</text>
- <text type="string" length="1" name="DateClaimText">
+ <text type="string" length="1" name="DateClaimText"><!--placeholder-->
星期二 八月15日 13:47:25 2006年
</text>
<text type="string" length="1" name="PriceLabel">
面积：
</text>
- <text type="string" length="1" name="PriceText">
+ <text type="string" length="1" name="PriceText"><!--placeholder-->
4048平方米.
</text>
<text type="string" length="1" name="Traffic:">
- 交通:
+ 流量:
</text>
- <text type="string" length="1" name="DwellText">
+ <text type="string" length="1" name="DwellText"><!--placeholder-->
0
</text>
<button label="购买土地..." label_selected="购买土地..." name="Buy Land..." />
<button label="为社团购买..." label_selected="为社团购买..."
name="Buy For Group..." />
- <button label="通过…购买" label_selected="通过…购买" name="Buy Pass..."
- tool_tip="通行证提供给你一个暂时通往这块土地的通道。" />
+ <button label="购买通行证..." label_selected="购买通行证..." name="Buy Pass..."
+ tool_tip="通行证让你可以暂时访问这块土地。" />
<button label="放弃土地..." label_selected="放弃土地..." name="Abandon Land..." />
- <button label="放弃土地..." label_selected="放弃土地..." name="Reclaim Land..." />
+ <button label="回认土地..." label_selected="回认土地..." name="Reclaim Land..." />
<button label="林登出售..." label_selected="林登出售..." name="Linden Sale..."
tool_tip="土地必需有主人， 设定内容以及不可被拍卖。" />
<text name="new users only">
@@ -79,9 +79,53 @@
<text name="anyone">
任何人
</text>
+ <string
+ name="area_text">
+ 面积
+ </string>
+ <string
+ name="area_size_text">
+ [AREA] 平方米
+ </string>
+ <string
+ name="auction_id_text">
+ 拍卖 ID: [ID]
+ </string>
+ <string
+ name="need_tier_to_modify">
+ 您必须确认购买才能修改这块土地。
+ </string>
+ <string
+ name="group_owned_text">
+ (社团所有)
+ </string>
+ <string
+ name="profile_text">
+ 档案...
+ </string>
+ <string
+ name="info_text">
+ 信息...
+ </string>
+ <string
+ name="public_text">
+ (公共)
+ </string>
+ <string
+ name="none_text">
+ (无)
+ </string>
+ <string
+ name="sale_pending_text">
+ (等待出售中)
+ </string>
+ <string name="no_selection_text">
+ 没有选中的地块。
+请到 世界菜单 > 关于土地 或选择另一块地块来显示详细资料。
+ </string>
</panel>
<panel label="契约合同" name="land_covenant_panel">
- <text type="string" length="1" name="covenant_timestamp_text">
+ <text type="string" length="1" name="covenant_timestamp_text"><!--placeholder, not translatable-->
上次修改时间 星期三12 月3 1日 16:00:00 1969年
</text>
<text type="string" length="1" name="region_name_lbl">
@@ -91,118 +135,159 @@
leyla
</text>
<text type="string" length="1" name="estate_name_lbl">
- 私人领地:
+ 地产:
</text>
- <text type="string" length="1" name="estate_name_text">
+ <text type="string" length="1" name="estate_name_text"><!--placeholder, not translatable-->
大陆
</text>
<text type="string" length="1" name="estate_owner_lbl">
- 不动产主人:
+ 地产主人:
</text>
- <text type="string" length="1" name="estate_owner_text">
+ <text type="string" length="1" name="estate_owner_text"><!--placeholder, not translatable-->
(无)
</text>
<text type="string" length="1" name="resellable_clause">
- 这块区域内被购买的土地可能不能被重新出售。
+ 这块区域内购买的土地不能被重新出售。
</text>
<text type="string" length="1" name="changeable_clause">
- 这块区域内被购买的土地可能不能被连接/划分。
+ 这块区域内购买的土地不能被合并/划分。
</text>
- <text_editor type="string" length="1" name="covenant_editor">
- 这块不动产没有提供任何契约合同。
+ <text_editor type="string" length="1" name="covenant_editor"><!--placeholder, not translatable-->
+ 这块地产没有提供任何契约合同。
</text_editor>
<text name="can_resell">
这块区域内被购买的土地可以被重新出售.
</text>
<text name="can_not_resell">
- 这块区域内被购买的土地可能不能被重新出售。
+ 这块区域内被购买的土地不能被重新出售。
</text>
<text name="can_change">
- 这块区域内被购买的土地可以被连接或者被划分。
+ 这块区域内被购买的土地可以被合并/划分。
</text>
<text name="can_not_change">
- 这块区域内被购买的土地可能不能被联系或者被划分。
+ 这块区域内被购买的土地不能被合并/划分。
</text>
</panel>
- <panel label="东东" name="land_objects_panel">
- <text type="string" length="1" name="Simulator primitive usage:">
- 模拟器简单用法:
+ <panel label="物体" name="land_objects_panel">
+ <text name="parcel_object_bonus">
+ 区域额外物体因数: [BONUS]
</text>
+ <text type="string" length="1" name="Simulator primitive usage:">
+ 模拟器元件使用情况:
+ </text>
+ <text
+ name="objects_available">
+ [COUNT]个, 最多 [MAX] 个 (还剩 [AVAILABLE] 个)
+ </text>
+ <string
+ name="objects_available_text">
+ [COUNT] 个, 最多 [MAX] 个 (还剩 [AVAILABLE] 个)
+ </string>
+ <string
+ name="objects_deleted_text">
+ [COUNT] 个, 最多 [MAX] 个 ([DELETED] 个将会被删除)
+ </string>
<text type="string" length="1" name="Primitives parcel supports:">
- 原始土地支柱:
+ 地块支持元件数:
+ </text>
+ <text type="string" length="1" name="object_contrib_text">
+ [COUNT] 个
</text>
<text type="string" length="1" name="Primitives on parcel:">
- 土地上所有的原始建筑:
+ 地块上的元件数:
+ </text>
+ <text type="string" length="1" name="total_objects_text">
+ [COUNT] 个
</text>
<text type="string" length="1" name="Owned by parcel owner:">
- 为土地拥有者所有:
+ 土地拥有者所有:
+ </text>
+ <text type="string" length="1" name="owner_objects_text">
+ [COUNT] 个
</text>
<button label="显示" label_selected="显示" name="ShowOwner" />
<button label="归还..." label_selected="归还..." name="ReturnOwner..."
- tool_tip="将东东归还其主人." />
+ tool_tip="将物体归还其主人。" />
<text type="string" length="1" name="Set to group:">
- 转入社团状态:
+ 设为社团的元件数:
+ </text>
+ <text type="string" length="1" name="group_objects_text">
+ [COUNT] 个
</text>
<button label="显示" label_selected="显示" name="ShowGroup" />
<button label="归还..." label_selected="归还..." name="ReturnGroup..."
- tool_tip="将东东归还其主人." />
+ tool_tip="将物体归还其主人。" />
<text type="string" length="1" name="Owned by others:">
为其他人所有:
</text>
+ <text type="string" length="1" name="other_objects_text">
+ [COUNT] 个
+ </text>
<button label="显示" label_selected="显示" name="ShowOther" />
<button label="归还..." label_selected="归还..." name="ReturnOther..."
- tool_tip="将东东归还其主人." />
+ tool_tip="将物体归还其主人。" />
<text type="string" length="1" name="Selected / sat upon:">
- 已选的/坐上去:
+ 被选择 / 被坐上的:
</text>
- <text type="string" length="1" name="Autoreturn other resident&apos;s objects (minutes, 0 for off):">
- 自动归还其他居民的东东（分钟, 0为关闭):
+ <text type="string" length="1" name="selected_objects_text">
+ [COUNT] 个
+ </text>
+ <text type="string" length="1" name="Autoreturn">
+ 自动归还其他居民的物体 (分钟, 0为关闭):
</text>
<text type="string" length="1" name="Object Owners:">
- 东东主人:
+ 物体主人:
</text>
<button label="更新名单" label_selected="更新名单" name="Refresh List" />
- <button label="归还东东..." label_selected="归还东东..."
+ <button label="归还物体..." label_selected="归还物体..."
name="Return objects..." />
+ <name_list name="owner list">
+ <column name="type"/>
+ <column name="online_status"/>
+ <column label="名称" name="name"/>
+ <column label="数目" name="count"/>
+ <column name="mostrecent"/>
+ </name_list>
<button label="" label_selected="" name="Type" tool_tip="以种类分类" />
<button label="名称" label_selected="名称" name="Name" tool_tip="以名字分类" />
- <button label="清点" label_selected="清点" name="Count" tool_tip="以点数分类" />
+ <button label="数目" label_selected="数目" name="Count" tool_tip="以数目分类" />
</panel>
- <panel label="Options" name="land_options_panel">
+ <panel label="选项" name="land_options_panel">
<text type="string" length="1" name="allow_label">
- 允许其他居民去:
+ 允许其他居民:
</text>
+ <check_box label="编辑地形" name="edit land check"
+ tool_tip="如果选中的话，谁都能编辑您的土地地形。最好是不要选中这项，因为您总可以编辑您自己的土地。"/>
+ <check_box label="创造地标" name="check landmark" />
+ <check_box label="飞翔" name="check fly" tool_tip="如果选中的话，居民可以在您的土地上飞行。如果不选中的话，他们只能飞入或飞过您的土地。"/>
<text name="allow_label2">
- 创造东东:
+ 创建物体:
</text>
- <check_box label="创造东东" name="edit objects check" />
- <check_box label="编辑地形" name="edit land check" />
- <check_box label="创造地标" name="check landmark" />
+ <check_box label="所有居民" name="edit objects check" />
<check_box label="社团" name="edit group objects check" />
<text name="allow_label3">
- 进入东东:
+ 带入物体:
</text>
<check_box label="所有居民" name="all object entry check" />
<check_box label="社团" name="group object entry check" />
<text name="allow_label4">
运行脚本:
</text>
- <check_box label="运行社团脚本" name="check group scripts" />
- <check_box label="飞翔" name="check fly" />
- <check_box label="运行其它脚本" name="check other scripts" />
+ <check_box label="社团" name="check group scripts" />
+ <check_box label="所有居民" name="check other scripts" />
<text type="string" length="1" name="land_options_label">
土地选项:
</text>
- <check_box label="安全 (无损伤)" name="check safe" />
- <check_box label="限制推动" name="PushRestrictCheck"
- tool_tip="ll推动目标将只能通过土地主人脚本代码运行，或者通过推动源本身是脚本主人的脚本推动。" />
- <check_box label="Show in Search > Places (L$30/week) under" name="ShowDirectoryCheck" />
+ <check_box label="安全 (不会受伤)" name="check safe" tool_tip="如果选中的话，土地设置为安全，禁用格斗伤害。不选中的话，启用格斗伤害。"/>
+ <check_box label="不允许推动" name="PushRestrictCheck"
+ tool_tip="防止脚本进行推动。选中该项也许对防止在您的土地上发生扰乱行为有帮助。llPushObject 将只能通过土地主人的脚本代码运行，或者通过推动源本身是脚本所有者的脚本。" />
+ <check_box label="显示在搜索中 (L$30/周)，分类为" name="ShowDirectoryCheck" />
<combo_box name="land category">
<combo_item name="AnyCategory">
任意分类
</combo_item>
<combo_item name="LindenLocation">
- 林登家的地点
+ 林登实验室的地点
</combo_item>
<combo_item name="Adult">
成人
@@ -211,25 +296,25 @@
艺术和文化
</combo_item>
<combo_item name="Business">
- 生意
+ 商业
</combo_item>
<combo_item name="Educational">
- 教育的
+ 教育
</combo_item>
<combo_item name="Gaming">
- 博彩游戏
+ 博彩/游戏
</combo_item>
<combo_item name="Hangout">
- 临时住所
+ 聚会
</combo_item>
<combo_item name="NewcomerFriendly">
- 友好的初来者
+ 初行者友好
</combo_item>
<combo_item name="Parks&Nature">
公园和大自然
</combo_item>
<combo_item name="Residential">
- 土木建筑
+ 居住区
</combo_item>
<combo_item name="Shopping">
购物
@@ -238,29 +323,27 @@
其他
</combo_item>
</combo_box>
- <check_box label="在网上公布名单" name="PublishCheck"
- tool_tip="将你土地的信息发布到网络上去." />
<check_box label="成人内容" name="MatureCheck"
- tool_tip="你的土地信息被认为带有成人内容." />
+ tool_tip="你的土地信息或内容会被认为带有成人内容。" />
<button label="?" label_selected="?" name="?" />
<text type="string" length="1" name="Snapshot:">
快照:
</text>
<texture_picker label="" name="snapshot_ctrl" tool_tip="点击这里来选择图片" />
- <text type="string" length="1" name="Landing Point: (none)">
- 着陆点数: (none)
+ <text type="string" length="1" name="landing_point">
+ 着陆点: [LANDING]
</text>
- <button label="调节" label_selected="调节" name="Set"
- tool_tip="设置你的化身的登陆地点。此地点必须在此块土地上。" />
+ <button label="设置" label_selected="设置" name="Set"
+ tool_tip="设置访问者抵达时的着陆点。将会设置到您化身在该地块内的位置。" />
<button label="清除" label_selected="清除" name="Clear"
- tool_tip="清除登陆地点上的障碍." />
+ tool_tip="清除着陆点" />
<text type="string" length="1" name="Teleport Routing: ">
- 闪电传送路线:
+ 瞬间移动传送路线:
</text>
<combo_box name="landing type"
- tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
+ tool_tip="Teleport Routing -- 选择如何应对到你的土地的瞬间移动。">
<combo_item type="string" length="1" name="Blocked">
- 加锁
+ 不允许
</combo_item>
<combo_item type="string" length="1" name="LandingPoint">
着陆点
@@ -269,49 +352,204 @@
任意位置
</combo_item>
</combo_box>
+ <string
+ name="push_restrict_text">
+ 不允许推动
+ </string>
+ <string
+ name="push_restrict_region_text">
+ 不允许推动 (区域强制)
+ </string>
</panel>
- <panel label="Media" name="land_media_panel">
+ <panel label="媒体" name="land_media_panel">
+ <text
+ name="with media:">
+ 媒体类型:
+ </text>
+<combo_box
+ allow_text_entry="false"
+ max_chars="20"
+ name="media type"
+ tool_tip="指定该 URL 是动画，网页，或者其它媒体" />
<check_box label="Restrict spatialized sound to this parcel" name="check sound local" />
- <text type="string" length="1" name="Music URL:">
- 音乐URL:
+ <text
+ name="at URL:">
+ 媒体 URL:
+ </text>
+ <button
+ label="设置..."
+ label_selected="设置..."
+ name="set_media_url"
+ />
+ <text
+ name="Description:">
+ 描述:
</text>
<text type="string" length="1" name="Media texture:">
媒体
材质:
- </text>
+ </text>
+ <line_editor
+ name="url_description"
+ tool_tip="在播放/加载按钮旁显示的文字" />
<text type="string" length="1" name="Replace this texture:">
替换该材质:
</text>
<texture_picker label="" name="media texture" tool_tip="点击这里来选择图片" />
- <text type="string" length="1" name="with content from this URL:">
- 内容来自URL :
+ <text
+ name="replace_texture_help">
+ (点击播放按钮后使用该材质的物体将会
+显示选择的动画或网页。)
+ </text>
+ <text
+ name="Options:">
+ 媒体
+选项:
</text>
- <check_box label="自动调整内容大小 (较慢或降低图像质量)"
+ <check_box label="自动调整内容大小 "
name="media_auto_scale"
- tool_tip="检测此项将会对此小块土地的满意度自动缩减/增加。它可以轻微减慢和降低可视效果，但不会要求其他的材质缩放或排列。" />
+ tool_tip="打开此项将自动缩放该地块上的内容。其速度和质量可能会稍稍降低，但不会需要任何其他的材质缩放或对齐。" />
+ <check_box
+ label="循环播放"
+ name="media_loop"
+ tool_tip="循环播放媒体。当媒体播放完毕时，它将从开始处重新播放。" />
+ <check_box
+ initial_value="false"
+ label="隐藏媒体 URL"
+ name="hide_media_url"
+ tool_tip="打开该选项将对未经允许的土地信息察看者隐藏媒体 URL。请注意该选项不适用于 HTML 类型。" />
+ <check_box
+ initial_value="false"
+ label="隐藏音乐 URL"
+ name="hide_music_url"
+ tool_tip="打开该选项将对未经允许的土地信息察看者隐藏音乐 URL。" />
+ <text
+ name="media_size"
+ tool_tip="渲染媒体的尺寸，设为 0 使用默认值">
+ 媒体尺寸:
+ </text>
+ <spinner
+ name="media_size_width"
+ tool_tip="渲染媒体的尺寸，设为 0 使用默认值" />
+ <spinner
+ name="media_size_height"
+ tool_tip="渲染媒体的尺寸，设为 0 使用默认值" />
+ <text
+ name="pixels"
+ right="-10">
+ 像素
+ </text>
+ <text
+ name="MusicURL:">
+ 音乐 URL:
+ </text>
+ <line_editor
+ name="music_url"
+ right="-15" />
+ <text
+ name="Sound:">
+ 声音:
+ </text>
+ <check_box
+ initial_value="false"
+ label="限制空间声音到这个地块"
+ name="check sound local" />
+ <text
+ name="Voice settings:">
+ 语音:
+ </text>
+ <radio_group
+ draw_border="true"
+ name="parcel_voice_channel">
+ <radio_item
+ name="Estate">
+ 使用地产空间声音频道
+ </radio_item>
+ <radio_item
+ name="Private">
+ 使用地块私有的空间声音频道
+ </radio_item>
+ <radio_item
+ name="Disabled">
+ 在此地块禁用空间声音
+ </radio_item>
+ </radio_group>
</panel>
- <panel label="Access" name="land_access_panel">
+ <panel label="访问" name="land_access_panel">
+ <check_box label="允许公众访问" name="public_access"/>
<text type="string" length="1" name="Limit access to this parcel to:">
- 限制进入该土地的通道:
- </text>
- <check_box label="社团: (无)" name="GroupCheck" />
- <check_box label="化身: (0 项被列出, 最多300位)" name="AccessCheck" />
- <button label="添加..." label_selected="添加..." name="Add..." />
- <button label="移除" label_selected="移除" name="Remove" />
- <check_box label="通过允许的暂时通道出售:" name="PassCheck" />
- <spinner label="林登币标价:" name="PriceSpin" />
+ 对该地块的访问
+ </text>
+ <text
+ name="Only Allow">
+ 禁止以下居民访问:
+ </text>
+ <check_box
+ initial_value="false"
+ label="没有给林登实验室提供支付信息的居民"
+ name="limit_payment"
+ tool_tip="禁止未识别的居民进入。" />
+ <check_box
+ initial_value="false"
+ label="没有年龄确认为成年人的居民"
+ name="limit_age_verified"
+ tool_tip="禁止没有验证年龄的居民进入。详细信息参见 support.secondlife.com 。" />
+ <string
+ name="estate_override">
+ 这些选项中的一个或多个在地产级别被设定
+ </string>
+ <check_box
+ label="允许社团访问: [GROUP]"
+ name="GroupCheck"
+ tool_tip="请在一般标签页中设定社团。"/>
+ <check_box
+ initial_value="false"
+ label="向以下出售通行证"
+ name="PassCheck"
+ tool_tip="允许临时访问该地块" />
+ <combo_box
+ name="pass_combo">
+ <combo_item
+ name="Anyone"
+ value="anyone">
+ 任何人
+ </combo_item>
+ <combo_item
+ name="Group"
+ value="group">
+ 社团
+ </combo_item>
+ </combo_box>
+ <spinner label="L$ 标价:" name="PriceSpin" />
<spinner label="访问时间:" name="HoursSpin" />
- </panel>
- <panel label="Ban" name="land_ban_panel">
- <check_box label="阻止以下化身: (0位被列出, 最多300位)" name="LandBanCheck" />
- <button label="添加..." label_selected="添加..." name="Add..." />
- <button label="移除" label_selected="移除" name="Remove" />
- <text type="string" length="1" name="Deny by Payment Status:">
- 被支付情况信息拒绝:
- </text>
- <check_box label="否认文件中的没有完成支付的信息" name="DenyAnonymousCheck" />
- <check_box label="否认文件中的支付信息" name="DenyIdentifiedCheck" />
- <check_box label="否认使用过的支付信息" name="DenyTransactedCheck" />
+
+ <text
+ initial_value="false"
+ label="总是允许"
+ name="AllowedText">
+ 被允许的居民
+ </text>
+ <name_list
+ name="AccessList"
+ tool_tip="(已列出 [LISTED] 名, 最多[MAX] 名)" />
+ <button label="添加..." label_selected="添加..." name="add_allowed" />
+ <button label="删除" label_selected="删除" name="remove_allowed" />
+ <text
+ label="Ban"
+ name="BanCheck">
+ 被禁止的居民
+ </text>
+ <name_list
+ name="BannedList"
+ tool_tip="(已列出 [LISTED] 名, 最多[MAX] 名)" />
+ <button
+ label="添加..."
+ label_selected="添加..."
+ name="add_banned" />
+ <button
+ label="删除"
+ label_selected="删除"
+ name="remove_banned" />
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_account_history.xml b/indra/newview/skins/default/xui/zh/floater_account_history.xml
deleted file mode 100644
index 00f1aeb..0000000
--- a/indra/newview/skins/default/xui/zh/floater_account_history.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="money history floater" title="账户历史记录">
- <button label="更多细节..." label_selected="更多细节..." name="details_btn" />
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_active_speakers.xml b/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
new file mode 100644
index 0000000..14ab2e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="active_speakers"
+ title="活跃的说话人">
+ <panel
+ name="active_speakers_panel">
+ <scroll_list
+ name="speakers_list">
+ <column
+ label="名字"
+ name="speaker_name" />
+ </scroll_list>
+ <panel
+ name="volume_container"
+ right="-10">
+ <button
+ label=""
+ name="mute_btn"
+ toggle="true"
+ tool_tip="屏蔽该居民的语音" />
+ </panel>
+ </panel>
+</floater>
\ No newline at end of file
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 4133242..cd41a43 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -6,36 +6,18 @@
<text name="description_label">
描述:
</text>
- <spinner label="优先" name="priority"
- tool_tip="可在不顾及此动画的模式下控制其它动画。" />
- <text name="preview_label">
- 预览
- </text>
- <combo_box label="" name="preview_base_anim"
- tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
- <combo_item name="Standing">
- 站立
- </combo_item>
- <combo_item name="Walking">
- 步行
- </combo_item>
- <combo_item name="Sitting">
- 坐下
- </combo_item>
- <combo_item name="Flying">
- 起飞
- </combo_item>
- </combo_box>
- <check_box label="绕圈飞行" name="loop_check" tool_tip="使此动画循环播放." />
- <spinner label="In(%)" name="loop_in_point"
- tool_tip="在动画设置一点用以返还循环到此点。" />
- <spinner label="出局(%)" name="loop_out_point"
- tool_tip="在动画设置一点用以停止循环。" />
+ <spinner label="优先级" name="priority"
+ tool_tip="控制哪些动画可以被该动画覆盖。" />
+ <check_box label="循环" name="loop_check" tool_tip="使此动画循环播放." />
+ <spinner label="始 (%)" name="loop_in_point"
+ tool_tip="选择循环后返回的点。" />
+ <spinner label="终 (%)" name="loop_out_point"
+ tool_tip="选择循环结束的点。" />
<text name="hand_label">
手势
</text>
<combo_box label="" name="hand_pose_combo"
- tool_tip="Controls what hands do during animation.">
+ tool_tip="控制动画中手的动作。">
<combo_item name="Spread">
伸展
</combo_item>
@@ -43,49 +25,48 @@
放松
</combo_item>
<combo_item name="PointBoth">
- 两者都指
+ 两手都指
</combo_item>
<combo_item name="Fist">
- 手部
+ 握拳
</combo_item>
<combo_item name="RelaxedLeft">
- 放松左边
+ 左手放松
</combo_item>
<combo_item name="PointLeft">
- 指左边
+ 左手指
</combo_item>
<combo_item name="FistLeft">
- 左手
+ 左手握拳
</combo_item>
<combo_item name="RelaxedRight">
- 放松右边
+ 右手放松
</combo_item>
<combo_item name="PointRight">
- 指右边
+ 右手指
</combo_item>
<combo_item name="FistRight">
- 右手
+ 右手握拳
</combo_item>
<combo_item name="SaluteRight">
- 向右敬礼
+ 右手敬礼
</combo_item>
<combo_item name="Typing">
- T键入
+ 打字中
</combo_item>
<combo_item name="PeaceRight">
- 和平权利
+ 右手和平
</combo_item>
</combo_box>
<text name="emote_label">
表情
</text>
- <combo_box label="" name="emote_combo"
- tool_tip="Controls what face does during animation.">
+ <combo_box label="" name="emote_combo" >
<combo_item name="[None]">
[None]
</combo_item>
<combo_item name="Aaaaah">
- 啊
+ 啊啊啊
</combo_item>
<combo_item name="Afraid">
害怕
@@ -118,7 +99,7 @@
大笑
</combo_item>
<combo_item name="Plllppt">
- Plllppt
+ 呸
</combo_item>
<combo_item name="Repulsed">
拒绝
@@ -142,18 +123,52 @@
担心
</combo_item>
</combo_box>
- <spinner label="Ease In (sec)" name="ease_in_time"
+
+ <text name="preview_label">
+ 预览
+ </text>
+ <combo_box label="" name="preview_base_anim"
+ tool_tip="测试在化身做常见动作同时您的动画的行为">
+ <combo_item name="Standing">
+ 站立
+ </combo_item>
+ <combo_item name="Walking">
+ 步行
+ </combo_item>
+ <combo_item name="Sitting">
+ 坐下
+ </combo_item>
+ <combo_item name="Flying">
+ 起飞
+ </combo_item>
+ </combo_box>
+
+
+ <spinner label="渐入 (秒)" name="ease_in_time"
tool_tip="动画渐入的所需时间（秒）" />
- <spinner label="Ease Out (sec)" name="ease_out_time"
+ <spinner label="渐出 (秒)" name="ease_out_time"
tool_tip="动画渐出的所需时间（秒）" />
- <button label="" name="play_btn" tool_tip="播放/停止你现有的动画." />
- <button label="" name="stop_btn" tool_tip="停止动画回播" />
+ <button label="" name="play_btn" tool_tip="播放/暂停你现有的动画." />
+ <button label="" name="stop_btn" tool_tip="停止动画播放" />
<slider label="" name="playback_slider" />
<text name="bad_animation_text">
不能读取动画文件。
-
- 推荐Poser 4产生的BVH格式文件。
+
+推荐Poser 4产生的BVH格式文件。
</text>
<button label="取消" name="cancel_btn" />
<button label="上传(L$[AMOUNT])" name="ok_btn" />
+ <string name="failed_to_initialize">
+ 初始化动作失败。
+ </string>
+ <string name="anim_too_long">
+ 动画文件长度为 [LENGTH] 秒。
+
+最长允许的长度为 [MAX_LENGTH] 秒。
+ </string>
+ <string name="failed_file_read">
+ 无法读取动画文件。
+
+[STATUS]
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
index 79a24f4..6f1bd44 100644
--- a/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/indra/newview/skins/default/xui/zh/floater_auction.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="开始销售林登土地">
+<floater name="floater_auction" title="开始林登土地销售">
<check_box label="包含黄色选择条" name="fence_check" />
<combo_box name="saletype_combo">
<combo_item name="Auction">
拍卖
</combo_item>
- <combo_item name="FirstLand">
- 首次着陆
- </combo_item>
</combo_box>
<button label="快照" label_selected="快照" name="snapshot_btn" />
<button label="OK" label_selected="OK" name="ok_btn" />
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index d6172f6..4b1b64f 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -1,15 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatarpicker" title="选择人物">
- <text name="Type part of the person's name:">
+
+<floater
+ min_height="340"
+ min_width="200"
+ name="avatarpicker"
+ title="选择居民">
+ <text
+ name="instruct_search_resident_name">
键入这个人的部分姓名:
</text>
<button label="寻找" label_selected="寻找" name="Find" />
- <text name="Or select a calling card:">
+ <text
+ name="Or select their calling card:">
或者选择一张通话卡:
</text>
<button label="选择" label_selected="选择" name="Select" />
<button label="关闭" label_selected="关闭" name="Close" />
- <text name="NotFound">
- '[TEXT]'没有找到
- </text>
-</floater>
+ <string name="NotFound">
+ 没有找到 '[TEXT]'
+ </string>
+</floater>
\ No newline at end of file
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 bdb4e75..8f2ba92 100644
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatar_texture_debug" title="Avatar Textures">
+<floater name="avatar_texture_debug" title="化身材质">
<text name="">
- Baked Textures
+ 烘烤的材质
</text>
<text name="">
- Composite Textures
+ 复合材质
</text>
<texture_picker label="头部" name="baked_head" />
<texture_picker label="化妆" name="head_bodypaint" />
<texture_picker label="头发" name="hair" />
- <button label="Dump" label_selected="Dump" name="Dump" />
- <texture_picker label="眼睛" name="baked_eyes" />
- <texture_picker label="Eye" name="eye_texture" />
- <texture_picker label="Upper Body" name="baked_upper_body" />
- <texture_picker label="Upper Body Tattoo" name="upper_bodypaint" />
+ <button label="转储" label_selected="转储" name="Dump" />
+ <texture_picker label="双眼" name="baked_eyes" />
+ <texture_picker label="眼睛" name="eye_texture" />
+ <texture_picker label="上身" name="baked_upper_body" />
+ <texture_picker label="上身纹身" name="upper_bodypaint" />
<texture_picker label="内衣" name="undershirt" />
<texture_picker label="手套" name="gloves" />
<texture_picker label="衬衣" name="shirt" />
- <texture_picker label="Upper Jacket" name="upper_jacket" />
- <texture_picker label="Lower Body" name="baked_lower_body" />
- <texture_picker label="Lower Body Tattoo" name="lower_bodypaint" />
+ <texture_picker label="上身外衣" name="upper_jacket" />
+ <texture_picker label="下身" name="baked_lower_body" />
+ <texture_picker label="下身纹身" name="lower_bodypaint" />
<texture_picker label="内裤" name="underpants" />
<texture_picker label="袜子" name="socks" />
<texture_picker label="鞋子" name="shoes" />
diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml
new file mode 100644
index 0000000..0aaea0b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="beacons"
+ title="信标">
+ <panel
+ name="beacons_panel">
+ <check_box
+ name="touch_only"
+ label="有触摸脚本的物体" />
+ <check_box
+ name="scripted"
+ label="有脚本的物体" />
+ <check_box
+ name="physical"
+ label="物理物体" />
+ <check_box
+ name="sounds"
+ label="声音源" />
+ <check_box
+ name="particles"
+ label="粒子源" />
+ <check_box
+ name="highlights"
+ label="渲染高亮" />
+ <check_box
+ name="beacons"
+ label="渲染信标" />
+ <text
+ name="beacon_width_label">
+ 信标宽度:
+ </text>
+ </panel>
+</floater>
+
+
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
index 64ada24..a7b1c7e 100644
--- a/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="格子选项">
- <spinner label="格子单位 (米)"" name="GridResolution" />
- <spinner label="格子宽度 (米)" name="GridDrawSize" />
- <check_box label="Enable Sub-Unit Snapping" name="GridSubUnit" />
+<floater name="build options floater" title="网格选项">
+ <spinner label="网格单位 (米)" name="GridResolution" />
+ <spinner label="网格宽度 (米)" name="GridDrawSize" />
+ <check_box
+ initial_value="false"
+ label="启用子单位对齐"
+ name="GridSubUnit" />
+ <check_box
+ initial_value="false"
+ label="显示剖面"
+ name="GridCrossSection" />
<slider label="格子不透明度" name="GridOpacity" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index b4d265a..817965c 100644
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="撞击, 推动和敲打">
+<floater name="floater_bumps" title="碰撞、推动和敲打">
<text name="none_detected">
没有监测到
</text>
<text name="bump">
- [TIME] [FIRST] [LAST] 抛弃了你
+ [TIME] [FIRST] [LAST] 撞了你
</text>
<text name="llpushobject">
- [TIME] [FIRST] [LAST]用脚本推了你
+ [TIME] [FIRST] [LAST] 用脚本推了你
</text>
<text name="selected_object_collide">
- [TIME] [FIRST] [LAST] 用一件东东敲打了你
+ [TIME] [FIRST] [LAST] 用一件物体敲打了你
</text>
<text name="scripted_object_collide">
- [TIME] [FIRST] [LAST]用一件脚本东东敲打了你
+ [TIME] [FIRST] [LAST] 用一件有脚本物体敲打了你
</text>
<text name="physical_object_collide">
- [TIME] [FIRST] [LAST] 用一件物理东东敲打了你
+ [TIME] [FIRST] [LAST] 用一件物理的物体敲打了你
</text>
</floater>
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 079f792..2ce722e 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -1,12 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_buy_contents" title="购买内容">
<text name="contains_text">
- [NAME]包括:
+ [NAME] 包括:
</text>
<text name="buy_text">
- 购买L$[AMOUNT]于[NAME]?
+ 以 L$[AMOUNT] 从 [NAME] 处购买?
</text>
<button label="取消" label_selected="取消" name="cancel_btn" />
<button label="购买" label_selected="购买" name="buy_btn" />
<check_box label="马上穿上衣服" name="wear_check" />
+ <string
+ name="no_copy_text">
+ (不可复制)
+ </string>
+ <string
+ name="no_modify_text">
+ (不可更改)
+ </string>
+ <string
+ name="no_transfer_text">
+ (不可转让)
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index bc8b13a..e065d2a 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="购买现钞">
+<floater name="buy currency" title="购买货币">
<text name="info_buying">
- 购买现钞:
+ 购买货币:
</text>
<text name="info_cannot_buy">
现在无法购买:
@@ -10,14 +10,14 @@
你需要更多的货币:
</text>
<text name="error_message">
- 出错
+ 事情好像不大对头。
</text>
<button label="去网页" name="error_web" />
<text name="contacting">
- 联系林登X...
+ 正在连接 LindeX...
</text>
<text name="buy_action_unknown">
- 购买L$按照LindeX货币兑换比率
+ 在 LindeX 货币交换所购买 L$
</text>
<text name="buy_action">
[NAME] L$ [PRICE]
@@ -50,12 +50,15 @@
L$ [AMT]
</text>
<text name="purchase_warning_repurchase">
- 请确认只购买现钞.
+ 确认此次操作只会购买现钞。
你需要重试该操作。
</text>
<text name="purchase_warning_notenough">
- 你没有购买足够的货币，不足以购买。
+ 你没有购买足够的货币。请增加购买的额度。
</text>
<button label="购买" name="buy_btn" />
<button label="取消" name="cancel_btn" />
+ <string name="buy_currency">
+ 以大约 US$ [USD] 购买 L$ [LINDENS]
+ </string>
</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 f7336aa..06b56e8 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -7,13 +7,13 @@
(未知)
</text>
<text name="estate_name_label">
- 私人领地:
+ 地产:
</text>
<text name="estate_name_text">
(未知)
</text>
<text name="estate_owner_label">
- 不动产主人:
+ 地产主人:
</text>
<text name="estate_owner_text">
(未知)
@@ -25,17 +25,17 @@
这块区域内被购买的土地可能可以被重新出售，也可能不能被重新出售。
</text>
<text name="changeable_clause">
- 可能可以或可能不可以被连接或划分
+ 可能可以也可能不可以被合并或划分
</text>
<text name="covenant_text">
- 你必须同意这项不动产契约合同:
+ 你必须同意以下的不动产契约合同:
</text>
<text_editor name="covenant_editor">
请等待...
</text_editor>
<check_box label="我同意以上规定的合约" name="agree_covenant" />
<text name="info_parcel_label">
- 土地:
+ 地块:
</text>
<text name="info_parcel">
Scotopteryx 138,204
@@ -56,9 +56,9 @@
购买该土地将会:
</text>
<text name="error_message">
- 出错
+ 事情好像哪里出了问题。
</text>
- <button label="去网页" name="error_web" />
+ <button label="打开网页" name="error_web" />
<text name="account_action">
你将升级至优先级会员。
</text>
@@ -90,66 +90,75 @@
你有L$2,100.
</text>
<text name="currency_action">
- 购买更多L$
+ 购买额外的 L$
</text>
<line_editor name="currency_amt">
1000
</line_editor>
<text name="currency_est">
- for approx. US$ [AMOUNT2]
+ 以大约 US$ [AMOUNT2]
</text>
<text name="currency_balance">
你有L$2,100.
</text>
- <check_box label="Remove Group Contribution On Purchase" name="remove_contribution" />
+ <check_box
+ label="从团队配额贡献中撤去 [AMOUNT] 平方米。"
+ name="remove_contribution"
+ visible="false" />
<button label="购买" name="buy_btn" />
<button label="取消" name="cancel_btn" />
<text name="can_resell">
- 可能被重新出售.
+ 可以被重新出售。
</text>
<text name="can_not_resell">
- 可能不会被重新出售.
+ 不可以被重新出售。
</text>
<text name="can_change">
- 可能被连接或划分.
+ 可以被合并或划分。
</text>
<text name="can_not_change">
- 可能不会被连接或划分.
+ 不可以被合并或划分。
</text>
<text name="cant_buy_for_group">
- 你没有为目前你的社团购买土地的许可证。
+ 你没有为目前你的社团购买土地的许可。
</text>
<text name="no_land_selected">
没有选择任何土地
</text>
<text name="multiple_parcels_selected">
- 选择了多种不同类型的土地。请尝试选择一块较小的土地。
+ 选择了多个不同的地块。请尝试选择一块较小的土地。
</text>
<text name="no_permission">
- 你没有为目前你的社团购买土地的许可证。
+ 你没有为目前你的社团购买土地的许可。
</text>
<text name="parcel_not_for_sale">
- 所选择的土地不在待售状态.
+ 所选择的土地是非卖的。
</text>
<text name="group_already_owns">
- 这个社团已经拥有了这块土地.
+ 社团已经拥有了这块土地。
</text>
<text name="you_already_own">
- 你已经拥有了这块土地.
+ 你已经拥有了这块土地。
</text>
<text name="set_to_sell_to_other">
- 所选的土地被设置成转卖至其他社团。
+ 所选的土地被设置成转卖至他方。
</text>
<text name="no_public_land">
- 所选中的土地中没有公共区域.
+ 所选中的土地中没有公共区域。
</text>
<text name="not_owned_by_you">
- 你选择了一块由其他人占有的土地.请尝试选择一块较小的土地.
+ 你选择了一块由其他人占有的土地。请尝试选择一块较小的土地。
+ </text>
+ <text name="for_first_time_group">
+ 这块土地将为第一次购买者保留。你不能为社团购买它。
+ </text>
+ <text name="for_first_time">
+ 这块土地将为第一次购买者保留。你已经拥有自己的土地了。
</text>
<text name="processing">
- Processing your purchase...
+ 处理购买中...
-(This may take a minute or two.)
+(可能要等待一两分钟。)
</text>
<text name="fetching_error">
在获取土地购买信息的时候出现错误。
@@ -178,44 +187,55 @@
<text name="first_purchase">
这是你第一次购买土地，并且是你唯一一次能够购买'第一块土地'的机会.
</text>
+ <text name="first_time_but_not_first_land">
+ 这是你第一次购买土地，但你购买的不是为第一次购买土地的用户保留的土地。你可以使用查询功能，定位一块更便宜的 '第一块土地'的代售土地.
+ </text>
<text name="land_holdings">
- 你拥有[BUYER]平方米的土地.
+ 你拥有[BUYER]平方米的土地。
</text>
<text name="pay_to_for_land">
- 支付L$ [AMOUNT]至[SELLER]购买这块土地
+ 支付L$ [AMOUNT] 至 [SELLER] 购买这块土地
</text>
<text name="buy_for_US">
- Buy L$ [AMOUNT] for approx. US$ [AMOUNT2] ,
+ 以大约 US$ [AMOUNT2] 购买 L$ [AMOUNT] ,
</text>
<text name="parcel_meters">
这块土地的面积为[AMOUNT]平方米。
</text>
<text name="premium_land">
- 这块土地是额外奖励, 而且现在只按[AMOUNT]平方米出售。
+ 这块土地现在加价出售, 而且现在只按[AMOUNT]平方米出售。
</text>
<text name="discounted_land">
这块土地正在打折, 而且现在只按[AMOUNT]平方米出售。
</text>
<text name="meters_supports_object">
[AMOUNT]平方米
-s支持数量为[AMOUNT2]的东东
+支持[AMOUNT2]个物体
</text>
<text name="sold_with_objects">
- 和东东一起出售
+ 和物体一起出售
</text>
<text name="insufficient_land_credits">
在这次购买完成之前，社团[GROUP]将需要足够的被贡献的土地所用的信用额度，来覆盖这片土地。
</text>
<text name="have_enough_lindens">
- 你有L$ [AMOUNT],这些钱足够购买这块土地。
+ 你有L$ [AMOUNT], 这些钱足够购买这块土地。
</text>
<text name="not_enough_lindens">
- 你只有L$ [AMOUNT],你还需要 L$ [AMOUNT2] 、.
+ 你只有L$ [AMOUNT], 你还需要 L$ [AMOUNT2]。
</text>
<text name="balance_left">
- 此项消费后,你还会有L$ [AMOUNT]结余.
+ 此项消费后, 你还会有L$ [AMOUNT]结余.
</text>
<text name="balance_needed">
你需要购买至少 L$ [AMOUNT]来购买这块土地。
</text>
+ <string
+ name="no_parcel_selected">
+ (没有选择地块)
+ </string>
+ <string
+ name="buy_currency">
+ 以大约 US$ [USD] 购买 L$ [LINDENS]
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index 54c829d..b7c977c 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="contents" title="购买东东拷贝">
+<floater name="contents" title="购买物体副本">
<text name="contents_text">
以及它的内容：
</text>
<text name="buy_text">
- 购买L$[AMOUNT]于[NAME]?
+ 以 L$[AMOUNT] 从 [NAME] 处购买?
</text>
<button label="取消" label_selected="取消" name="cancel_btn" />
<button label="购买" label_selected="购买" name="buy_btn" />
+ <string name="title_buy_text">
+ 购买
+ </string>
+ <string name="title_buy_copy_text">
+ 购买复件
+ </string>
+ <string name="no_copy_text">
+ (不可复制)
+ </string>
+ <string name="no_modify_text">
+ (不可更改)
+ </string>
+ <string name="no_transfer_text">
+ (不可转让)
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
new file mode 100644
index 0000000..23c7387
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_camera.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="move floater"
+ title="">
+ <!-- 图标是代码中的自定按钮(写死的) -->
+ <string name="rotate_tooltip">围绕焦点旋转摄像机</string>
+ <string name="zoom_tooltip">朝着焦点缩放摄像机</string>
+ <string name="move_tooltip">上下左右移动摄像机</string>
+</floater>
+
+
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_history.xml b/indra/newview/skins/default/xui/zh/floater_chat_history.xml
index cae2952..fe44967 100644
--- a/indra/newview/skins/default/xui/zh/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/zh/floater_chat_history.xml
@@ -1,5 +1,39 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="聊天记录">
- <button label="屏蔽居民" label_selected="屏蔽居民" name="Mute resident" />
- <check_box label="显示屏蔽内容" name="show mutes" />
+<floater name="chat floater" title="本地聊天">
+ <string name="ringing">
+ 正在连接到世界内语音聊天...
+ </string>
+ <string name="connected">
+ 已连接。
+ </string>
+ <string name="unavailable">
+ 当前位置语音不可用。
+ </string>
+ <string name="hang_up">
+ 从世界内语音聊天断开
+ </string>
+ <layout_stack name="panels">
+ <layout_panel name="im_contents_panel" min_width="275">
+ <combo_box label="动作" name="Gesture">
+ <combo_item name="Gestures">
+ 动作
+ </combo_item>
+ </combo_box>
+ <check_box label="显示屏蔽的文字" name="show mutes" />
+ <button label="< <" label_selected="> >" name="toggle_active_speakers_btn"
+ tool_tip="显示在该即时通信会话中活动的参与者。" />
+ <panel name="chat_panel">
+ <string name="gesture_label">
+ 动作
+ </string>
+ <line_editor label="点击这里开始聊天。" name="Chat Editor" />
+ <flyout_button label="说" name="Say" tool_tip="(回车键)" >
+ <flyout_button_item name="shout_item">喊叫</flyout_button_item>
+ <flyout_button_item name="say_item">说</flyout_button_item>
+ <flyout_button_item name="whisper_item">小声说</flyout_button_item>
+ </flyout_button>
+ </panel>
+ </layout_panel>
+ </layout_stack>
</floater>
+<!--Translated for Second Life 1.21.3 -->
diff --git a/indra/newview/skins/default/xui/zh/floater_chatterbox.xml b/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
new file mode 100644
index 0000000..cff5808
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="floater_chatterbox" title="交流">
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_clothing.xml b/indra/newview/skins/default/xui/zh/floater_clothing.xml
index 3572602..1e94b01 100644
--- a/indra/newview/skins/default/xui/zh/floater_clothing.xml
+++ b/indra/newview/skins/default/xui/zh/floater_clothing.xml
@@ -2,7 +2,7 @@
<floater name="clothing" title="衣物">
<scroll_list name="clothing_list">
<column label="" name="icon" />
- <column label="Name" name="name" />
+ <column label="名称" name="name" />
</scroll_list>
<button label="脱掉" name="take_off_btn" />
<button label="穿上" name="wear_btn" />
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 b9e7b53..80c7297 100644
--- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
@@ -10,10 +10,10 @@
蓝色:
</text>
<text name="h_val_text">
- 颜色:
+ 色调:
</text>
<text name="s_val_text">
- 坐过:
+ 饱和度:
</text>
<text name="l_val_text">
亮度:
@@ -26,6 +26,6 @@
当前颜色:
</text>
<text name="(Drag below to save.)">
- (拖动下列内容以储存.)
+ (拖动到下方储存。)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
index de628aa..ecf454f 100644
--- a/indra/newview/skins/default/xui/zh/floater_critical.xml
+++ b/indra/newview/skins/default/xui/zh/floater_critical.xml
@@ -2,6 +2,8 @@
<floater name="modal container" title=" ">
<button label="继续" label_selected="继续" name="Continue" />
<button label="取消" label_selected="取消" name="Cancel" />
+ <text
+ name="tos_title"></text>
<text name="tos_heading">
请仔细阅读下列信息。
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_customize.xml b/indra/newview/skins/default/xui/zh/floater_customize.xml
index e25f38f..d798f4c 100644
--- a/indra/newview/skins/default/xui/zh/floater_customize.xml
+++ b/indra/newview/skins/default/xui/zh/floater_customize.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater customize" title="外表">
<tab_container name="customize tab container">
- <panel label="Body Parts" />
- <panel label="外形" name="Shape">
- <button label="创建新的身材" label_selected="创建新的身材"
+ <panel label="身体部位" />
+ <panel label="体型" name="Shape">
+ <button label="创建新的体型" label_selected="创建新的体型"
name="Create New" />
<button label="脱掉" label_selected="脱掉" name="Take Off" />
<button label="存储" label_selected="存储" name="Save" />
@@ -16,14 +16,22 @@
<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="Torso" />
<button label="腿部" label_selected="腿部" name="Legs" />
+ <radio_group name="sex radio">
+ <radio_item type="string" length="1" name="radio">
+ 女性
+ </radio_item>
+ <radio_item type="string" length="1" name="radio2">
+ 男性
+ </radio_item>
+ </radio_group>
<button label="随机排列" label_selected="随机排列" name="Randomize" />
<text type="string" length="1" name="title">
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -35,19 +43,13 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的体型，需从你的库存中拖拽一个新的体型至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的体型，需从你的库存中拖拽一个新的体型至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件穿着的权利。
</text>
- <radio_group name="sex radio">
- <radio_item type="string" length="1" name="radio">
- 女性
- </radio_item>
- <radio_item type="string" length="1" name="radio2">
- 男性
- </radio_item>
- </radio_group>
+
</panel>
<panel label="皮肤" name="Skin">
<button label="创建新的皮肤" label_selected="创建新的皮肤"
@@ -65,7 +67,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -74,22 +76,24 @@
[DESC]: 没有被穿着
</text>
<text type="string" length="1" name="path">
- 位于[PATH]
+ 位于 [PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的皮肤，需从你的库存中拖拽一个新的皮肤至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的皮肤，需从你的库存中拖拽一个新的皮肤至你的
+化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<texture_picker label="头部纹身" name="Head Tattoos" tool_tip="点击这里来选择图片" />
<texture_picker label="上身的纹身" name="Upper Tattoos"
tool_tip="点击这里来选择图片" />
- <texture_picker label="降低纹身" name="Lower Tattoos"
+ <texture_picker label="下身纹身" name="Lower Tattoos"
tool_tip="点击这里来选择图片" />
</panel>
<panel label="头发" name="Hair">
- <button label="传建新的头发" label_selected="传建新的头发"
+ <button label="创建新的头发" label_selected="传建新的头发"
name="Create New" />
<button label="脱掉" label_selected="脱掉" name="Take Off" />
<button label="存储" label_selected="存储" name="Save" />
@@ -98,13 +102,13 @@
<button label="颜色" label_selected="颜色" name="Color" />
<button label="风格" label_selected="风格" name="Style" />
<button label="眉毛" label_selected="眉毛" name="Eyebrows" />
- <button label="面部的" label_selected="面部的" name="Facial" />
+ <button label="胡须" label_selected="胡须" name="Facial" />
<button label="随机排列" label_selected="随机排列" name="Randomize" />
<text type="string" length="1" name="title">
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -116,15 +120,16 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的发型，需从你的库存中拖拽一个新的发型至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的发型，需从你的库存中拖拽一个新的发型至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<texture_picker label="材质" name="Texture" tool_tip="点击这里来选择图片" />
</panel>
<panel label="眼睛" name="Eyes">
- <button label="传建新的眼睛" label_selected="传建新的眼睛"
+ <button label="创建新的眼睛" label_selected="创建新的眼睛"
name="Create New" />
<button label="脱掉" label_selected="脱掉" name="Take Off" />
<button label="存储" label_selected="存储" name="Save" />
@@ -135,7 +140,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -147,14 +152,15 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的眼睛，需从你的库存中拖拽一个新的眼睛至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的眼睛，需从你的库存中拖拽一个新的眼睛至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
- <texture_picker label="爱丽丝" name="Iris" tool_tip="点击这里来选择图片" />
+ <texture_picker label="瞳孔" name="Iris" tool_tip="点击这里来选择图片" />
</panel>
- <panel label="Clothes" />
+ <panel label="服饰" />
<panel label="衬衣" name="Shirt">
<button label="创建新的衬衫" label_selected="创建新的衬衫"
name="Create New" />
@@ -166,7 +172,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -178,14 +184,15 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的衬衫，需从你的库存中拖拽一个新的衬衫至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的衬衫，需从你的库存中拖拽一个新的衬衫至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="裤子" name="Pants">
<button label="创建新的裤子" label_selected="创建新的裤子"
@@ -198,7 +205,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -210,14 +217,15 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的裤子，需从你的库存中拖拽一个新的裤子至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的裤子，需从你的库存中拖拽一个新的裤子至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="鞋子" name="Shoes">
<button label="创建新的鞋子" label_selected="创建新的鞋子"
@@ -230,7 +238,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -242,14 +250,14 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的鞋子，需从你的库存中拖拽一个新的鞋子至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的鞋子，需从你的库存中拖拽一个新的鞋子至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
- </text>
+ 你没有修改这件服饰的权利。 </text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="袜子" name="Socks">
<button label="创建新的袜子" label_selected="创建新的袜子"
@@ -262,7 +270,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -274,14 +282,15 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的袜子，需从你的库存中拖拽一个新的袜子至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的袜子，需从你的库存中拖拽一个新的袜子至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="夹克" name="Jacket">
<button label="创建新的夹克" label_selected="创建新的夹克"
@@ -294,7 +303,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -306,16 +315,17 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的夹克，需从你的库存中拖拽一个新的夹克至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的夹克，需从你的库存中拖拽一个新的夹克至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="上身的针织品" name="Upper Fabric"
+ <texture_picker label="上身材质" name="Upper Fabric"
tool_tip="点击这里来选择图片" />
- <texture_picker label="降低建筑物高度" name="Lower Fabric"
+ <texture_picker label="下身材质" name="Lower Fabric"
tool_tip="点击这里来选择图片" />
</panel>
<panel label="手套" name="Gloves">
@@ -329,7 +339,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -341,14 +351,15 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的手套，需从你的库存中拖拽一个新的手套至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的手套，需从你的库存中拖拽一个新的手套至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="内衣" name="Undershirt">
<button label="创建新的内衣" label_selected="创建新的内衣"
@@ -361,7 +372,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -373,14 +384,15 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的内衣，需从你的库存中拖拽一个新的内衣至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的内衣，需从你的库存中拖拽一个新的内衣至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="内裤" name="Underpants">
<button label="创建新的内裤" label_selected="创建新的内裤"
@@ -393,7 +405,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -405,17 +417,18 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的内裤，需从你的库存中拖拽一个新的内裤至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的内裤，需从你的库存中拖拽一个新的内裤至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
<panel label="裙子" name="Skirt">
- <button label="创建新的短裙" label_selected="创建新的短裙"
+ <button label="创建新的裙子" label_selected="创建新的短裙"
name="Create New" />
<button label="脱掉" label_selected="脱掉" name="Take Off" />
<button label="存储" label_selected="存储" name="Save" />
@@ -425,7 +438,7 @@
[DESC]
</text>
<text type="string" length="1" name="title_no_modify">
- [DESC]:不能修饰
+ [DESC]: 无法修改
</text>
<text type="string" length="1" name="title_loading">
[DESC]: 载入中...
@@ -437,17 +450,18 @@
位于[PATH]
</text>
<text type="string" length="1" name="not worn instructions">
- 要使用新的裙子，需从你的库存中拖拽一个新的裙子至你的化身上。另外的，你也可以从底稿中创建一个新的并使用。
+ 要使用新的裙子，需从你的库存中拖拽一个新的裙子至你的化身上。
+或者，你也可以从新创建一个，并穿上它。
</text>
<text type="string" length="1" name="no modify instructions">
- 你没有修改这件服饰的许可证。
+ 你没有修改这件服饰的权利。
</text>
<color_swatch label="颜色/配色" name="Color/Tint"
tool_tip="点击这里来打开色彩选择器" />
- <texture_picker label="纺织品" name="Fabric" tool_tip="点击这里来选择图片" />
+ <texture_picker label="质地" name="Fabric" tool_tip="点击这里来选择图片" />
</panel>
</tab_container>
- <button label="制造装备" label_selected="制造装备" name="Make Outfit" />
+ <button label="保存为装束" label_selected="保存为装束" name="Make Outfit" />
<button label="储存全部" label_selected="储存全部" name="Save All" />
<button label="关闭" label_selected="关闭" name="Close" />
</floater>
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
new file mode 100644
index 0000000..5c4791b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="180"
+ min_width="400"
+ name="Day Cycle Floater"
+ title="日夜周期编辑器">
+ <tab_container
+ name="Day Cycle Tabs"
+ tab_position="top">
+ <panel
+ label="日夜周期"
+ name="Day Cycle">
+ <button
+ label="?"
+ name="WLDayCycleHelp" />
+ <text
+ name="WL12am">
+ 上午12时
+ </text>
+ <text
+ name="WL3am">
+ 上午3时
+ </text>
+ <text
+ name="WL6am">
+ 上午6时
+ </text>
+ <text
+ name="WL9amHash">
+ 上午9时
+ </text>
+ <text
+ name="WL12pmHash">
+ 下午12时
+ </text>
+ <text
+ name="WL3pm">
+ 下午3时
+ </text>
+ <text
+ name="WL6pm">
+ 下午6时
+ </text>
+ <text
+ name="WL9pm">
+ 下午9时
+ </text>
+ <text
+ name="WL12am2">
+ 上午12时
+ </text>
+ <button
+ label="添加键"
+ label_selected="Add Key"
+ name="WLAddKey" />
+ <button
+ label="删除键"
+ label_selected="Delete Key"
+ name="WLDeleteKey" />
+ <text
+ name="WLCurKeyFrameText">
+ 关键帧设定:
+ </text>
+ <text
+ name="WLCurKeyTimeText">
+ 键时间:
+ </text>
+ <spinner
+ label="时"
+ name="WLCurKeyHour" />
+ <spinner
+ label="分"
+ name="WLCurKeyMin" />
+ <text
+ name="WLCurKeyTimeText2">
+ 键预设:
+ </text>
+ <combo_box
+ allow_text_entry="false"
+ label="Preset"
+ max_chars="20"
+ name="WLKeyPresets" />
+ <view_border />
+ <text
+ name="DayCycleText">
+ 捕捉:
+ </text>
+ <combo_box
+ allow_text_entry="false"
+ label="5 min"
+ max_chars="20"
+ name="WLSnapOptions" />
+ <text
+ name="DayCycleText2">
+ 周期长度:
+ </text>
+ <spinner
+ label="时"
+ name="WLLengthOfDayHour" />
+ <spinner
+ label="分"
+ name="WLLengthOfDayMin" />
+ <spinner
+ label="秒"
+ name="WLLengthOfDaySec" />
+ <text
+ name="DayCycleText3">
+ 预览:
+ </text>
+ <button
+ label="播放"
+ label_selected="Play"
+ name="WLAnimSky" />
+ <button
+ label="停止!"
+ label_selected="Stop"
+ name="WLStopAnimSky" />
+ <button
+ label="使用地产时间"
+ label_selected="使用地产时间"
+ name="WLUseLindenTime" />
+ <button
+ label="保存测试日"
+ label_selected="Save Test Day"
+ name="WLSaveDayCycle" />
+ <button
+ label="读取测试日"
+ label_selected="Load Test Day"
+ name="WLLoadDayCycle" />
+ </panel>
+ </tab_container>
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_device_settings.xml b/indra/newview/skins/default/xui/zh/floater_device_settings.xml
new file mode 100644
index 0000000..61e1556
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_device_settings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="语音聊天设备设置">
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_directory.xml b/indra/newview/skins/default/xui/zh/floater_directory.xml
index b5eb94b..98eed0f 100644
--- a/indra/newview/skins/default/xui/zh/floater_directory.xml
+++ b/indra/newview/skins/default/xui/zh/floater_directory.xml
@@ -1,36 +1,87 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="directory" title="搜索">
<tab_container name="Directory Tabs">
- <panel label="全部" name="all_panel">
- <scroll_list name="results">
- <column label="" name="icon" />
- <column label="Name" name="name" />
- <column label="Price" name="price" />
- <column label="Time (PDT)" name="date" />
- <column label="Time" name="time" />
- <column label="Traffic" name="dwell" />
- <column label="Area" name="area" />
- <column label="L$/sq.m" name="per_meter" />
- <column label="Online" name="online" />
- <column label="Members" name="members" />
- </scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
- <text name="find">
- 寻找:
- </text>
- <button label="搜索" label_selected="搜索" name="Search" />
- <check_box label="包含成人内容" name="incmature" />
- </panel>
- <panel label="分类目录" name="classified_panel">
+ <panel
+ label="All"
+ name="find_all_panel">
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
+ <button
+ label="后退"
+ name="back_btn" />
+ <button
+ label="前进"
+ name="forward_btn" />
+ <line_editor
+ label="搜索"
+ name="search_editor"
+ tool_tip="搜索第二人生" />
+ <button
+ label="搜索"
+ name="search_btn" />
+ <combo_box
+ name="Category">
+ <combo_item
+ name="AnyCategory"
+ value="All">
+ 所有分类
+ </combo_item>
+ <combo_item
+ name="Events">
+ 事件
+ </combo_item>
+ <combo_item
+ name="Groups"
+ value="Groups">
+ 社团
+ </combo_item>
+ <combo_item
+ name="People"
+ value="People">
+ 居民
+ </combo_item>
+ <combo_item
+ name="Places"
+ value="Places">
+ 地点
+ </combo_item>
+ <combo_item
+ name="Wiki"
+ value="Wiki">
+ Wiki
+ </combo_item>
+ </combo_box>
+ <check_box
+ initial_value="false"
+ label="包括成人内容"
+ name="mature_check" />
+ <text
+ name="loading_text">加载中...</text>
+ <text
+ name="done_text">完成</text>
+<!-- <text
+ name="redirect_404_url">http://secondlife.com/app/search/notfound.html</text>
+--> </panel>
+
+ <panel label="分类广告" name="classified_panel">
<scroll_list name="results">
<column label="" name="icon" />
<column label="" name="type" />
<column label="Name" name="name" />
<column label="Price" name="price" />
</scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
+ <button label="< 上一页" label_selected="< 上一页" name="< Prev" />
+ <button label="下一页 >" label_selected="下一页 >" name="Next >" />
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
<text name="find">
寻找:
</text>
@@ -52,13 +103,13 @@
特殊吸引力
</combo_item>
<combo_item name="NewProducts">
- 新物品
+ 新产品
</combo_item>
<combo_item name="Employment">
职业
</combo_item>
<combo_item name="Wanted">
- 通缉
+ 需求
</combo_item>
<combo_item name="Service">
服务
@@ -67,28 +118,39 @@
私人的
</combo_item>
</combo_box>
+ <button
+ label="浏览"
+ label_selected="浏览"
+ name="Browse" />
<button label="搜索" label_selected="搜索" name="Search" />
- <button label="地点和广告..." label_selected="地点和广告..."
+ <button label="投放广告..." label_selected="投放广告..."
name="Place an Ad..." />
<button label="删除" label_selected="删除" name="Delete" />
</panel>
- <panel label="事件或活动" name="events_panel">
+
+ <panel label="事件" name="events_panel">
<scroll_list name="results">
<column label="" name="icon" />
<column label="" name="type" />
- <column label="Name" name="name" />
- <column label="Time (PDT)" name="date" />
+ <column label="名称" name="name" />
+ <column label="时间 (PT)" name="date" />
<column label="" name="event_id" />
- <column label="Time" name="time" />
+ <column label="时间" name="time" />
</scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
+ <button label="< 上一页" label_selected="< 上一页" name="< Prev" />
+ <button label="下一页 >" label_selected="下一页 >" name="Next >" />
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
<radio_group name="date_mode">
<radio_item name="current">
- In-Progress and Upcoming
+ 当前和近期事件
</radio_item>
<radio_item name="date">
- Date
+ 日期
</radio_item>
</radio_group>
<button label="<<" label_selected="<<" name="<<"
@@ -104,7 +166,7 @@
种类列表:
</text>
<text name="text2">
- Name/Desc:
+ 名称/描述:
</text>
<combo_box name="category combo">
<combo_item name="All">
@@ -120,7 +182,7 @@
现场音乐
</combo_item>
<combo_item name="Commercial">
- 生意
+ 商业
</combo_item>
<combo_item name="Nightlife/Entertainment">
夜生活/娱乐
@@ -141,40 +203,51 @@
慈善机构
</combo_item>
<combo_item name="Miscellaneous">
- 混色
+ 其他
</combo_item>
</combo_box>
<check_box label="显示成人内容" name="incmature" />
<button label="搜索" label_selected="搜索" name="Search" tool_tip="搜索" />
<button label="删除" label_selected="删除" name="Delete" />
</panel>
- <panel label="Popular Places" name="popular_panel">
- <scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Name" name="name" />
- <column label="Traffic" name="dwell" />
- </scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
- <check_box label="只显示有图像的地点" name="incpictures" />
- <check_box label="包含成人区中的地点" name="incmature" />
- <text
- name="These are the most popular places in the world, as measured by traffic, the amount of time people spend there.">
- 这里有在第二人生世界里最流行的场所，由交通状况，和人们在那里花费的时间长短来衡量。
- </text>
+
+ <panel label="热门地点" name="showcase_panel">
+ <button label="< 上一页" label_selected="< 上一页" name="< Prev" />
+ <button label="下一页 >" label_selected="下一页 >" name="Next >" />
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
+ <button
+ label="后退"
+ name="back_btn" />
+ <button
+ label="前进"
+ name="forward_btn" />
+ <string
+ name="loading_text">加载中...</string>
+ <string
+ name="done_text">完成</string>
</panel>
- <panel label="Land Sales" name="land_sales_panel">
+ <panel label="土地出售" name="land_sales_panel">
<scroll_list name="results">
<column label="" name="icon" />
<column label="" name="type" />
- <column label="Name" name="name" />
- <column label="L$ Price" name="price" />
- <column label="Area" name="area" />
- <column label="L$/sq.m" name="per_meter" />
+ <column label="名称" name="name" />
+ <column label="L$ 价格" name="price" />
+ <column label="面积" name="area" />
+ <column label="L$/平米" name="per_meter" />
</scroll_list>
<button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
+ <button label="下一页>" label_selected="下一页>" name="Next >" />
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
<combo_box name="type">
<combo_item name="AllTypes">
所有类型
@@ -185,22 +258,22 @@
<combo_item name="ForSale">
代售
</combo_item>
- <combo_item name="FirstLand">
- 首次着陆
- </combo_item>
+ <!--<combo_item name="FirstLand">
+ 初次订阅土地
+ </combo_item>-->
<combo_item name="MainlandSales">
出售 - 大陆
</combo_item>
<combo_item name="EstateSales">
- 出售 - 土地
+ 出售 - 地产
</combo_item>
</combo_box>
<combo_box name="rating">
<combo_item name="PG&Mature">
- 成年人和在家长指导下的未成年人
+ 限制级和指导级
</combo_item>
<combo_item name="PGonly">
- 仅在家长指导下观看
+ 仅指导级
</combo_item>
<combo_item name="Matureonly">
仅成人
@@ -211,28 +284,35 @@
<button label="搜索" label_selected="搜索" name="Search" />
<text name="land">
土地可以直接用林登元购买(L$)，也可以用林登元或美元拍卖。
-想直接购买, 进入土地，在标题条上点击地点的名字。
+要直接购买, 进入土地，然后在点击菜单栏上的地点的名字。
</text>
</panel>
- <panel label="Places" name="places_panel">
+
+ <panel label="地点" name="places_panel">
<scroll_list name="results">
<column label="" name="icon" />
<column label="" name="type" />
- <column label="Name" name="name" />
- <column label="Traffic" name="dwell" />
+ <column label="名称" name="name" />
+ <column label="流量" name="dwell" />
</scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
+ <button label="< 上一页" label_selected="< 上一页" name="< Prev" />
+ <button label="下一页 >" label_selected="下一页 >" name="Next >" />
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
<text name="find">
- 寻找:
+ 查找:
</text>
- <check_box label="包含成人区中的地点" name="incmature" />
+ <check_box label="包含有限制级内容的地块" name="incmature" />
<combo_box name="Category">
<combo_item name="AnyCategory">
任意分类
</combo_item>
<combo_item name="LindenLocation">
- 林登家的地点
+ 林登实验室的地点
</combo_item>
<combo_item name="Adult">
成人
@@ -241,25 +321,25 @@
艺术和文化
</combo_item>
<combo_item name="Business">
- 生意
+ 商业
</combo_item>
<combo_item name="Educational">
- 教育的
+ 教育
</combo_item>
<combo_item name="Gaming">
- 博彩游戏
+ 博彩/游戏
</combo_item>
<combo_item name="Hangout">
- 临时住所
+ 聚会
</combo_item>
<combo_item name="NewcomerFriendly">
- 友好的初来者
+ 初行者友好
</combo_item>
<combo_item name="Parks&Nature">
- 公园和大自然
+ 公园和自然
</combo_item>
<combo_item name="Residential">
- 土木建筑
+ 居住区
</combo_item>
<combo_item name="Shopping">
购物
@@ -270,34 +350,56 @@
</combo_box>
<button label="搜索" label_selected="搜索" name="Search" />
</panel>
- <panel label="People" name="people_panel">
+
+ <panel label="居民" name="people_panel">
<scroll_list name="results">
<column label="" name="icon" />
<column label="" name="type" />
- <column label="Name" name="name" />
- <column label="Online" name="online" />
+ <column label="名字" name="name" />
+ <column label="在线" name="online" />
</scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
+ <button label="< 上一页" label_selected="< 上一页" name="< Prev" />
+ <button label="下一页 >" label_selected="下一页 >" name="Next >" />
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
<text name="find">
- 寻找:
+ 查找:
</text>
<check_box label="在线" name="online check" />
<button label="搜索" label_selected="搜索" name="Search" />
</panel>
+
<panel label="社团" name="groups_panel">
- <scroll_list name="results">
- <column label="" name="icon" />
- <column label="" name="type" />
- <column label="Name" name="name" />
- <column label="Members" name="members" />
- </scroll_list>
- <button label="< 之前" label_selected="< 之前" name="< Prev" />
- <button label="下一个>" label_selected="下一个>" name="Next >" />
+
+ <string name="searching_text">
+ 查找中……
+ </string>
+ <string name="not_found_text">
+ 什么也没找到。
+ </string>
+ <button
+ label="后退"
+ name="back_btn" />
+ <button
+ label="前进"
+ name="forward_btn" />
+ <string
+ name="loading_text">加载中...</string>
+ <string
+ name="done_text">完成</string>
<text name="find">
寻找:
</text>
- <button label="搜索" label_selected="搜索" name="Search" />
+ <button label="搜索" label_selected="搜索" name="search_btn" />
+ <check_box
+ label="包括成人社团"
+ name="mature_check" />
</panel>
+
</tab_container>
</floater>
+<!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
new file mode 100644
index 0000000..b4cb27e
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="150"
+ min_width="600"
+ name="Environment Editor Floater"
+ title="Environment Editor">
+ <text
+ name="EnvTimeText">
+ 时间
+ </text>
+ <text
+ name="EnvTimeText2">
+ 12:00 PM
+ </text>
+ <icon
+ name="EnvDayCycle" />
+ <slider
+ label=""
+ name="EnvTimeSlider"
+ value="0.0" />
+ <text
+ name="EnvCloudText">
+ 云层覆盖
+ </text>
+ <slider
+ label=""
+ name="EnvCloudSlider"
+ value="0.7" />
+ <text
+ name="EnvWaterColorText">
+ 水色
+ </text>
+ <color_swatch
+ label=""
+ name="EnvWaterColor"
+ tool_tip="Click to open Color Picker" />
+ <text
+ name="EnvWaterFogText">
+ 水雾
+ </text>
+ <button
+ label="使用地产时间"
+ name="EnvUseEstateTimeButton" />
+ <button
+ label="高级天空选项"
+ name="EnvAdvancedSkyButton" />
+ <button
+ label="高级水面选项"
+ name="EnvAdvancedWaterButton" />
+ <button
+ label="?"
+ name="EnvSettingsHelpButton" />
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 3473e35..d877b29 100644
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="表演动作">
+<floater name="gestures" title="活动的动作">
<text name="help_label">
- 使用激活命令或按命令键播放动画文件和
-声效。
+ 点击动作或按快捷键来播放动画和音效。
</text>
<scroll_list name="gesture_list">
- <column label="Trigger" name="trigger" />
- <column label="Key" name="shortcut" />
+ <column label="命令" name="trigger" />
+ <column label="按键" name="shortcut" />
<column label="" name="key" />
- <column label="Name" name="name" />
+ <column label="名称" name="name" />
</scroll_list>
<button label="新建" name="new_gesture_btn" />
<button label="库存" name="inventory_btn" />
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 8f69431..6a854ab 100644
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -1,53 +1,53 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="神仙工具">
+<floater name="godtools floater" title="神明工具">
<tab_container name="GodTools Tabs">
- <panel label="Grid" name="grid">
- <button label="提走所有用户" label_selected="提走所有用户"
+ <panel label="网格" name="grid">
+ <button label="踢走所有用户" label_selected="踢走所有用户"
name="Kick all users" />
- <button label="快速到达此处地图的快照"
- label_selected="快速到达此处地图的快照"
+ <button label="清除该区域的地图可视性缓存"
+ label_selected="清除该区域的地图可视性缓存"
name="Flush This Region's Map Visibility Caches" />
</panel>
<panel label="区域" name="region">
<text name="Sim Name:">
- 游戏中的名字:
+ 模拟器名称:
</text>
- <check_box label="序曲" name="check prelude"
- tool_tip="设定此项来使这块土地变为前面的项。" />
+ <check_box label="序章" name="check prelude"
+ tool_tip="设定该区域为序章。" />
<check_box label="太阳固定" name="check fixed sun"
- tool_tip="固定太阳的位置（例如在地区/地产）〉地形" />
- <check_box label="重新设置闪电传运上的家" name="check reset home"
- tool_tip="当居民闪电传运离开, 将会使他们的家重设在他们着陆的目的地处." />
+ tool_tip="固定太阳的位置 (和 地区/地产 > 地形 重点的设定相似)" />
+ <check_box label="瞬间移动时重设家" name="check reset home"
+ tool_tip="当居民瞬间移动离开, 将会使他们的家重设在他们着陆的目的地处." />
<check_box label="可见的" name="check visible"
- tool_tip="设定此项使此地对非神仙族可视" />
- <check_box label="毁坏" name="check damage"
- tool_tip="设定此项来在此地开启破坏模式。" />
- <check_box label="阻止交通追踪" name="block dwell"
- tool_tip="设定此项使这块土地不进行交通运算。" />
- <check_box label="锁定外形" name="block terraform"
- tool_tip="设置这里不允许人们交换他们的土地。" />
+ tool_tip="设定此项使此地对非神可视" />
+ <check_box label="伤害" name="check damage"
+ tool_tip="设定此项来在此地启用伤害。" />
+ <check_box label="阻止流量追踪" name="block dwell"
+ tool_tip="设定此项使这块土地不进行流量运算。" />
+ <check_box label="锁定地形" name="block terraform"
+ tool_tip="设定此项来禁止人们修改他们土地的地形" />
<check_box label="沙盘" name="is sandbox"
- tool_tip="套牢此处即使这是沙盒区域." />
- <button label="硬地" label_selected="硬地" name="Bake Terrain"
- tool_tip="以默认模式保存当前土地。" />
+ tool_tip="设定此处是否是沙盒区域。" />
+ <button label="烘烤" label_selected="烘烤" name="Bake Terrain"
+ tool_tip="将当前地形保存为默认值。" />
<button label="恢复地形" label_selected="恢复地形" name="Revert Terrain"
- tool_tip="以默认取代现有土地。" />
+ tool_tip="以默认值取代现有地形。" />
<button label="交换地形" label_selected="交换地形" name="Swap Terrain"
- tool_tip="将现有土地与DEFAULT互换." />
+ tool_tip="将现有土地与默认值互换。" />
<text name="estate id">
- 不动产ID:
+ 地产ID:
</text>
<text name="parent id">
- 初级ID:
+ 母区域ID:
</text>
<line_editor name="parentestate" tool_tip="这是这块区域的母区域。" />
<text name="Grid Pos: ">
- 方格收款台:
+ 网格位置
</text>
- <line_editor name="gridposx" tool_tip="这是方格x在此区域内的位置。" />
- <line_editor name="gridposy" tool_tip="这是方格y在此区域内的位置。" />
+ <line_editor name="gridposx" tool_tip="这是区域在网格x内的位置。" />
+ <line_editor name="gridposy" tool_tip="这是区域在网格y内的位置。" />
<text name="Redirect to Grid: ">
- 从新定位方格位置:
+ 重定向到网格:
</text>
<text name="billable factor text">
帐单明细:
@@ -62,21 +62,21 @@
<button label="选择区域" label_selected="选择区域" name="Select Region"
tool_tip="用土地工具选择整个地区。" />
<button label="立刻自动保存" label_selected="立刻自动保存"
- name="Autosave now" tool_tip="保存压缩状态到自动存档目录。" />
+ name="Autosave now" tool_tip="保存 gzip 压缩的状态到自动存档目录。" />
</panel>
- <panel label="东东" name="objects">
+ <panel label="物体" name="objects">
<text name="Sim Name:">
- 游戏中的名字:
+ 模拟器名称:
</text>
<text name="region name">
- 威尔士
+ Welsh
</text>
<check_box label="无效脚本" name="disable scripts"
- tool_tip="设定此项用以关闭此区域内的所有脚本文档" />
+ tool_tip="设定此项用以关闭此区域内的所有脚本" />
<check_box label="无效冲突" name="disable collisions"
tool_tip="设置这里使得这块区域内的非代理冲突无效。" />
<check_box label="无效物理" name="disable physics"
- tool_tip="设定此项用以关闭次区域内的所有物理模式。" />
+ tool_tip="设定此项以关闭此区域内的所有物理。" />
<button label="应用" label_selected="应用" name="Apply"
tool_tip="点击这里来应用以上的更改." />
<button label="设置目标" label_selected="设置目标" name="Set Target"
@@ -84,28 +84,28 @@
<text name="target_avatar_name">
(没有目标)
</text>
- <button label="删除其他土地上的选定的脚本东东"
- label_selected="删除其他土地上的选定的脚本东东"
+ <button label="删除目标于他人土地上有脚本的物体"
+ label_selected="删除目标于他人土地上有脚本的物体"
name="Delete Target's Scripted Objects On Others Land"
- tool_tip="删除所有不被土地上的目标拥有的东东。 (没有副本)东东将被归还." />
+ tool_tip="删除他人土地上目标所有有脚本的物体。(不可复制)的物体将被返还。" />
<button label="删除*任何*土地上选中的脚本东东"
label_selected="删除*任何*土地上选中的脚本东东"
name="Delete Target's Scripted Objects On *Any* Land"
- tool_tip="删除此区域内目标所属的所有脚本东东。（没有副本）东东会被返回。" />
+ tool_tip="删除该区域中目标所有有脚本的物体。(不可复制)的物体将被返还。" />
<button label="删除*所有*选中的东东"
label_selected="删除*所有*选中的东东"
name="Delete *ALL* Of Target's Objects"
- tool_tip="删除此目标在此区域内的所有东东" />
- <button label="到达最首要冲突源" label_selected="到达最首要冲突源"
+ tool_tip="删除该区域中目标所有的物体。(不可复制)的物体将被返还。" />
+ <button label="获取首要碰撞源" label_selected="取最首要碰撞源"
name="Get Top Colliders"
- tool_tip="获取一份关于东东承受最弱回收信号清单。" />
- <button label="到达首要脚本" label_selected="到达首要脚本"
+ tool_tip="获取一份短相回叫发生最多的物品的列表。" />
+ <button label="获取首要脚本" label_selected="获取首要脚本"
name="Get Top Scripts"
- tool_tip="获取一份关于最耗时脚本东东的列表。" />
+ tool_tip="获取一份最耗时脚本的列表。" />
<button label="脚本摘要" label_selected="脚本摘要" name="Scripts digest"
- tool_tip="获取一份关于所有脚本文档及其出现次数的列表。" />
+ tool_tip="获取一份所有脚本及其出现次数的列表。" />
</panel>
- <panel label="Request" name="request">
+ <panel label="请求" name="request">
<text name="Destination:">
目的地:
</text>
@@ -114,7 +114,7 @@
选项
</combo_item>
<combo_item name="AgentRegion">
- 代理区域
+ 代理所在区域
</combo_item>
</combo_box>
<text name="Request:">
@@ -122,13 +122,13 @@
</text>
<combo_box name="request">
<combo_item name="colliders<steps>">
- 冲突 <步骤>
+ 冲突者 <步骤>
</combo_item>
<combo_item name="scripts<count>,<optionalpattern>">
- 脚本 <计数>,<可选的样式>
+ 脚本 <计数>,<可选的查询文字>
</combo_item>
<combo_item name="objects<pattern>">
- 东东<式样>
+ 物体 <查询文字>
</combo_item>
<combo_item name="rez<asset_id>">
rez <财产_id>
diff --git a/indra/newview/skins/default/xui/zh/floater_group_info.xml b/indra/newview/skins/default/xui/zh/floater_group_info.xml
index 23687c8..c66d27f 100644
--- a/indra/newview/skins/default/xui/zh/floater_group_info.xml
+++ b/indra/newview/skins/default/xui/zh/floater_group_info.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- deprecated - doesn't seem to be used -->
<floater name="groupinfo" title="林登家族-社团信息">
<tab_container name="tab">
- <panel label="General" name="gen">
+ <panel label="一般" name="gen">
<text name="title_box">
社团信息
</text>
@@ -9,7 +10,7 @@
社团是你和朋友们合作的有趣的途径。
</text>
<text name="txt2">
- 社团使你拥有头衔，徽章和选举权.
+ 社团使你拥有头衔，徽章和进行选举的能力。
</text>
<text name="txt3">
任何人都可以创建社团。但每个人最多只能参加15个社团。
@@ -32,33 +33,33 @@
<check_box label="在社团名单中显示" name="sho" />
<check_box label="在社团名单中显示成员" name="sho_mem" />
<check_box label="在网上公布" name="allow_publish"
- tool_tip="将你个人的简介发布到网上." />
+ tool_tip="将简介发布到网上。" />
<button label="?" label_selected="?" name="publish_help_btn" />
<check_box label="成人" name="mature"
- tool_tip="你的档案文件被认为带有成人内容." />
+ tool_tip="您的社团档案带有成人内容。" />
</panel>
- <panel label="Titles" name="tit">
+ <panel label="头衔" name="tit">
<text name="txt">
社团头衔
</text>
<text name="txt2">
- 社团有官员和社员，他们拥有不同的头衔。
+ 社团的官员和成员都可以有特殊的头衔。
</text>
<text name="txt3">
- 在世界里，聊天时和即时通消息里，头衔出现在名字之前。
+ 头衔将在世界里、聊天时和即时通消息里出现在名字之前。
</text>
<text name="lbl">
- 官员职位:
+ 官员头衔:
</text>
<text name="lbl2">
成员头衔:
</text>
<text name="lbl3">
- 从你的库存中选取材料制作社团徽章.
+ 从库存中拖出材质来设置社团徽章。
</text>
<texture_picker name="insig" tool_tip="点击这里来选择图片" />
</panel>
- <panel label="Members" name="mem">
+ <panel label="成员" name="mem">
<text name="txt">
社团成员
</text>
@@ -76,7 +77,7 @@
</text>
<button label="驱逐成员" label_selected="驱逐成员" name="eject_member_btn" />
</panel>
- <panel label="Voting" name="voting">
+ <panel label="投票" name="voting">
<tab_container name="tab">
<panel label="Election" name="recall">
<text name="txt">
@@ -104,13 +105,13 @@
</text>
<radio_group name="majority" tool_tip="Majority of total votes needed to win.">
<radio_item name="radio">
- Simple Majority
+ 简单多数
</radio_item>
<radio_item name="radio2">
- 2/3 Majority
+ 2/3 多数
</radio_item>
<radio_item name="radio3">
- Unanimous
+ 一致同意
</radio_item>
</radio_group>
<text name="duration_lbl">
@@ -157,13 +158,13 @@
</text>
<radio_group name="majority" tool_tip="Majority of total votes needed to win.">
<radio_item name="radio">
- Simple Majority
+ 简单多数
</radio_item>
<radio_item name="radio2">
- 2/3 Majority
+ 2/3 多数
</radio_item>
<radio_item name="radio3">
- Unanimous
+ 一致同意
</radio_item>
</radio_group>
<text name="duration_lbl">
@@ -201,7 +202,7 @@
</panel>
</tab_container>
</panel>
- <panel label="Invite" name="inv">
+ <panel label="邀请" name="inv">
<text name="txt">
社团邀请
</text>
@@ -249,14 +250,14 @@
</panel>
<panel label="金钱" name="mon">
<tab_container name="group money history tab">
- <panel label="Planning" name="money panel" />
- <panel label="Details" name="money panel2">
+ <panel label="计划" name="money panel" />
+ <panel label="详细" name="money panel2">
<button label="<较早" label_selected="<较早" name="< Earlier"
tool_tip="时间返回" />
<button label="延迟 >" label_selected="延迟 >" name="Later >"
tool_tip="时间前进" />
</panel>
- <panel label="Sales" name="money panel3">
+ <panel label="出售" name="money panel3">
<button label="<较早" label_selected="<较早" name="< Earlier"
tool_tip="时间返回" />
<button label="延迟 >" label_selected="延迟 >" name="Later >"
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
new file mode 100644
index 0000000..199cbed
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater
+ name="Hardware Settings Floater"
+ title="硬件设置">
+
+ <text
+ name="Filtering:">
+ 过滤:
+ </text>
+ <check_box
+ initial_value="false"
+ label="各向异性过滤 (打开会减低速度)"
+ name="ani" />
+ <text
+ name="Antialiasing:">
+ 反锯齿:
+ </text>
+ <combo_box
+ initial_value="false"
+ label="Antialiasing"
+ name="fsaa">
+ <combo_item
+ name="FSAADisabled"
+ value="0">
+ 关闭
+ </combo_item>
+ <combo_item
+ name="2x"
+ value="2">
+ 2×
+ </combo_item>
+ <combo_item
+ name="4x"
+ value="4">
+ 4×
+ </combo_item>
+ <combo_item
+ name="8x"
+ value="8">
+ 8×
+ </combo_item>
+ <combo_item
+ name="16x"
+ value="16">
+ 16×
+ </combo_item>
+ </combo_box>
+ <spinner
+ label="Gamma:"
+ name="gamma" />
+ <text
+ name="(brightness, lower is brighter)">
+ (亮度，越低越亮, 0=使用默认值)
+ </text>
+ <spinner
+ label="夜间亮度:"
+ name="nighttime_brightness" />
+ <text name="(higher is brighter, 1.0 is default)">(越高越亮，默认为1.0)</text>
+ <text name="Enable VBO:">启用 VBO:</text>
+ <check_box
+ initial_value="true"
+ label="启用 OpenGL 顶点缓存对象(Vertex Buffer Objects)"
+ name="vbo"
+ tool_tip="较新的硬件上打开这个选项将可使性能提升。不过，较旧的硬件通常对VBO支持不佳，打开的话您可能会遇到程序崩溃。" />
+
+ <slider
+ label="材质内存 (MB):"
+ name="GrapicsCardTextureMemory"
+ tool_tip="分配给图像的内存的数量。默认为全部显卡内存。减少该选项也许可以改进性能，但也许也同时会使材质变得模糊。" />
+
+ <spinner
+ label="雾距离比率:"
+ name="fog" />
+
+ <button
+ label="确定"
+ label_selected="确定"
+ name="OK"
+ scale_image="true" />
+
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_html.xml b/indra/newview/skins/default/xui/zh/floater_html.xml
index 8c75fa7..695ca27 100644
--- a/indra/newview/skins/default/xui/zh/floater_html.xml
+++ b/indra/newview/skins/default/xui/zh/floater_html.xml
@@ -1,12 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlfloater" title="">
- <button label="返回" name="back_btn" />
- <button label="朝向" name="forward_btn" />
- <button label="重载入" name="reload_btn" />
- <button label="停止" name="stop_btn" />
- <button label="家" name="home_btn" />
- <button label="行动" name="go_btn" />
- <string name="support_page_url">
- http://secondlife.com/app/support/index_zh.html
- </string>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="htmlfloater"
+ title="">
+ <button
+ label="关闭"
+ name="close_btn"/>
+ <web_browser
+ name="html_floater_browser"/>
+ <button
+ label="后退"
+ name="back_btn" />
+ <button
+ label="前进"
+ name="forward_btn" />
+ <button
+ label="转到"
+ name="go_btn" />
</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml
new file mode 100644
index 0000000..d31798b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_hud.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="floater_hud"
+ title="教程">
+ <web_browser
+ name="floater_hud_browser"
+ start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0A读取中...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" />
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_im.xml b/indra/newview/skins/default/xui/zh/floater_im.xml
index 423e0ae..dd8716a 100644
--- a/indra/newview/skins/default/xui/zh/floater_im.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im.xml
@@ -1,9 +1,68 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="im_floater" title="即时消息通">
- <text name="only_user_message">
- 你是这个阶段唯一的用户。
- </text>
- <text name="offline_message">
- [FIRST] [LAST] 目前不在线。
- </text>
+<multi_floater
+ min_height="130"
+ min_width="350"
+ name="im_floater"
+ title="即时聊天">
+ <tab_container
+ name="Preview Tabs" />
+ <string
+ name="only_user_message">
+ 您是该会话中唯一的参与者。
+ </string>
+ <string
+ name="offline_message">
+ [FIRST] [LAST] 不在线。
+ </string>
+ <string
+ name="invite_message">
+ 点击 [BUTTON NAME] 按钮来接受/连接到该语音聊天。
+ </string>
+ <string
+ name="muted_message">
+ 您已经屏蔽了该位居民。发送消息的话将会自动解除屏蔽。
+ </string>
+
+ <string
+ name="generic_request_error">
+ 发出请求时发生错误，请等会儿再试。
+ </string>
+ <string
+ name="insufficient_perms_error">
+ 您的权限不足。
+ </string>
+ <string
+ name="session_does_not_exist_error">
+ 该会话已不存在
+ </string>
+ <string
+ name="no_ability_error">
+ 您没有那种能力。
+ </string>
+ <string
+ name="not_a_mod_error">
+ 您不是会话管理员。
+ </string>
+ <string
+ name="muted_error">
+ 一位会话管理员屏蔽了您的文字聊天。
+ </string>
+ <!-- *所有* 事件字符串都应该有 [RECIPIENT] 在其中 -->
+ <string
+ name="add_session_event">
+ 无法向与 [RECIPIENT] 的聊天会话中加入用户。
+ </string>
+ <string
+ name="message_session_event">
+ 无法将您的消息送达到与 [RECIPIENT] 的聊天会话中。
+ </string>
+ <string
+ name="removed_from_group">
+ 您已被从社团中去除。
+ </string>
+ <string
+ name="close_on_no_ability">
+ 您不再有在聊天会话中的能力。
+ </string>
</multi_floater>
+
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 e669ce0..d3bf113 100644
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -11,7 +11,7 @@
</text>
<combo_box label="衣服款式" name="clothing_type_combo">
<combo_item name="Image">
- 头像
+ 图像
</combo_item>
<combo_item name="Hair">
头发
@@ -37,12 +37,19 @@
<combo_item name="Skirt">
裙子
</combo_item>
+ <combo_item
+ name="SculptedPrim">
+ Sculpted 元件
+ </combo_item>
</combo_box>
<text name="bad_image_text">
不能读取图像。
-
- 尝试将图像按24 bit Targa方式储存。
+
+尝试将图像按24 bit Targa方式储存。
</text>
+ <check_box
+ label="使用无损压缩"
+ name="lossless_check" />
<button label="取消" name="cancel_btn" />
<button label="上传(L$[AMOUNT])" name="ok_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 2e98fd7..e4b8790 100644
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="检查东东">
+<floater name="inspect" title="审查物体">
<scroll_list name="object_list"
- tool_tip="从这份列表中选择一项东东，使它在游戏世界中被突显">
- <column label="东东名称" name="object_name" />
+ tool_tip="从这份列表中选择一项物体来在世界中突出显示它">
+ <column label="物体名称" name="object_name" />
<column label="主人名字" name="owner_name" />
- <column label="创造者名字" name="creator_name" />
- <column label="创造时间" name="creation_date" />
+ <column label="创建者名字" name="creator_name" />
+ <column label="创建时间" name="creation_date" />
</scroll_list>
<button label="查看主人档案..." name="button owner"
- tool_tip="查看被突显的东东的主人名字" />
+ tool_tip="查看突出显示物体的主人的档案" />
<button label="查看创建者档案..." name="button creator"
- tool_tip="查看被突显东东的创造者的档案" />
+ tool_tip="查看突出显示物体的创建者的档案" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index 038fa3d..dcc10e5 100644
--- a/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -1,17 +1,79 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="(未知)" name="im_floater" title="(未知)">
- <button label="档案..." label_selected="档案..." name="profile_btn" />
- <button label="关闭" label_selected="关闭" name="close_btn" />
- <text name="live_help_dialog">
- *** 欢迎来到在线帮助站,在这里，我们出色的志愿者们会协助他们的第二人生居民朋友们在第二人生里精彩的生活！ ***
-请先按F1键，进入第二人生帮助页面。如果你想要的答案不在这里，请键入你的问题，点击开始，等候若干分钟后，在线的帮助者会给你回复。
-如果您的处理过程没有结束，请不要关闭在线帮助站的页面。如果您没有得到回应，你可以一直选择重新尝试一遍。
-注意: 在线帮助者并不是林登实验室的雇员, 所以，除非回应人的姓氏为'Linden',否则回复都应视为非正式的.
- </text>
- <text name="title_string">
- Instant Message with [NAME]
- </text>
- <text name="typing_start_string">
- [NAME] is typing...
- </text>
-</floater>
+<floater
+ label="(unknown)"
+ min_height="155"
+ min_width="345"
+ name="im_floater"
+ title="(unknown)">
+ <string
+ name="ringing">
+ 正在加入语音聊天...
+ </string>
+ <string
+ name="connected">
+ 已连接，点击结束通话来挂断
+ </string>
+ <string
+ name="hang_up">
+ 连接已结束
+ </string>
+ <string
+ name="title_string">
+ 与 [NAME] 的即时通信
+ </string>
+ <string
+ name="typing_start_string">
+ [NAME] 正在输入...
+ </string>
+ <string
+ name="session_start_string">
+ 正在开始和 [NAME] 的会话，请稍候。
+ </string>
+ <string
+ name="default_text_label">
+ 点击这里开始即时聊天。
+ </string>
+ <string
+ name="answering">
+ 正在连接...
+ </string>
+ <string
+ name="default_text_label">
+ 点击这里开始即时聊天。
+ </string>
+ <button
+ label="档案..."
+ name="profile_callee_btn" />
+ <button
+ label="呼叫"
+ name="start_call_btn" />
+ <button
+ label="结束呼叫"
+ name="end_call_btn"
+ pad_right="10"
+ visible="false" />
+ <panel
+ name="speaker_controls">
+ <volume_slider
+ name="speaker_volume" />
+ <button
+ label=""
+ name="mute_btn"
+ tool_tip="静音" />
+ </panel>
+ <text_editor
+ name="im_history" />
+ <line_editor
+ label="点击这里开始即时聊天。"
+ name="chat_editor" />
+ <button
+ label="发送"
+ name="send_btn" />
+ <string
+ name="live_help_dialog">
+ *** 欢迎来到帮助请求 ***
+ 请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/
+若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
+ -=-=- 反应时间不固定，特别在高峰时期 -=-=-
+ </string>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml b/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
new file mode 100644
index 0000000..33c9612
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ default_tab_group="1"
+ label="(unknown)"
+ min_height="225"
+ min_width="265"
+ name="im_floater"
+ title="(unknown)">
+ <string
+ name="ringing">
+ 正在加入语音聊天...
+ </string>
+ <string
+ name="connected">
+ 已连接，点击结束通话来挂断
+ </string>
+ <string
+ name="hang_up">
+ 离开了语音聊天
+ </string>
+ <string
+ name="title_string">
+ 与 [NAME] 的即时通信
+ </string>
+ <string
+ name="typing_start_string">
+ [NAME] 正在输入...
+ </string>
+ <string
+ name="session_start_string">
+ 正在开始和 [NAME] 的会话，请稍候。
+ </string>
+ <string
+ name="default_text_label">
+ 点击这里开始即时聊天。
+ </string>
+ <layout_stack>
+ <layout_panel
+ name="im_contents_panel">
+ <button
+ label="呼叫"
+ name="start_call_btn" />
+ <button
+ label="结束呼叫"
+ name="end_call_btn" />
+ <button
+ name="toggle_active_speakers_btn"
+ tool_tip="显示在该即时通信会话中活动的参与者。" />
+ <line_editor
+ label="点击这里开始即时聊天。"
+ name="chat_editor" />
+ <button
+ label="发送"
+ name="send_btn" />
+ </layout_panel>
+ </layout_stack>
+ <string
+ name="live_help_dialog">
+ *** 欢迎来到帮助请求 ***
+ 请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/
+若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
+ -=-=- 反应时间不固定，特别在高峰时期 -=-=-
+ </string>
+</floater>
+
+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml b/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
new file mode 100644
index 0000000..4198c6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ label="(未知)"
+ name="im_floater"
+ title="(未知)">
+ <string
+ name="ringing">
+ 正在加入语音聊天...
+ </string>
+ <string
+ name="connected">
+ 已连接，点击结束通话来挂断
+ </string>
+ <string
+ name="hang_up">
+ 离开了语音聊天
+ </string>
+ <string
+ name="live_help_dialog"
+ wordwrap="false">
+ *** 欢迎来到帮助请求 ***
+ 请首先按 F1 参阅我们的第二人生帮助页面，或访问知识库 http://secondlife.com/knowledgebase/
+ 若你找不到所需的答案，请输入你的问题，然后等待可用的工作人员的回复。
+ -=-=- 反应时间不固定，特别在高峰时期 -=-=-
+ </string>
+ <string
+ name="title_string">
+ 与 [NAME] 的即时通信
+ </string>
+ <string
+ name="typing_start_string">
+ [NAME] 正在输入...
+ </string>
+ <string
+ name="session_start_string">
+ 正在开始和 [NAME] 的会话，请稍候。
+ </string>
+ <string
+ name="moderated_chat_label">
+ (对话受管理，语音默认关闭)
+ </string>
+ <string
+ name="default_text_label">
+ 点击这里语音聊天。
+ </string>
+ <string
+ name="muted_text_label">
+ 您的文字聊天已被社团管理员禁用。
+ </string>
+ <layout_stack
+ name="panels">
+ <layout_panel
+ name="im_contents_panel">
+ <button
+ label="社团信息"
+ name="group_info_btn" />
+ <button
+ image_overlay_alignment="left"
+ label="加入通话"
+ name="start_call_btn"
+ width="90"/>
+ <button
+ image_overlay_alignment="left"
+ label="结束通话"
+ name="end_call_btn"/>
+ <button
+ label="< <"
+ label_selected="> >"
+ name="toggle_active_speakers_btn"
+ tool_tip="显示在该即时通信会话中活动的参与者。"/>
+ <button
+ label="发送"
+ name="send_btn" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory.xml b/indra/newview/skins/default/xui/zh/floater_inventory.xml
index c231b5c..a94e09e 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory.xml
@@ -1,25 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Inventory" title="库存">
+ <search_editor
+ name="inventory search editor"
+ label="在这里输入要查找的物体" />
<tab_container name="inventory filter tabs">
- <inventory_panel label="All Items" name="All Items" />
- <inventory_panel label="Recent Items" name="Recent Items" />
+ <inventory_panel label="所有物体" name="All Items" />
+ <inventory_panel label="最近使用的物体" name="Recent Items" />
</tab_container>
<menu_bar name="Inventory Menu">
- <menu label="File" name="File">
+ <menu label="文件 " name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="打开" name="Open" />
- <menu_item_call label="新的窗口" name="New Window" />
- <menu_item_call label="显示冲突过滤器" name="Show Filters" />
+ <menu_item_call label="新建窗口" name="New Window" />
+ <menu_item_call label="显示搜索过滤器" name="Show Filters" />
+ <menu_item_call
+ label="清空过滤器"
+ name="Reset Current" />
<menu_item_call label="关闭所有文件夹" name="Close All Folders" />
<menu_item_call label="清空回收站" name="Empty Trash" />
</menu>
- <menu label="创造" name="Create">
+ <menu label="创建" name="Create">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="新的文件夹" name="New Folder" />
<menu_item_call label="新的脚本" name="New Script" />
- <menu_item_call label="新的通知" name="New Note" />
- <menu_item_call label="新的姿势" name="New Gesture" />
- <menu name="New Clothes">
+ <menu_item_call label="新的记事卡" name="New Note" />
+ <menu_item_call label="新的动作" name="New Gesture" />
+ <menu name="新建衣物">
<menu_item_call label="新的衬衫" name="New Shirt" />
<menu_item_call label="新的裤子" name="New Pants" />
<menu_item_call label="新的鞋子" name="New Shoes" />
@@ -30,23 +36,27 @@
<menu_item_call label="新的内衣" name="New Undershirt" />
<menu_item_call label="新的内裤" name="New Underpants" />
</menu>
- <menu name="New Body Parts">
+ <menu name="新建身体部位">
<menu_item_call label="新的身材" name="New Shape" />
<menu_item_call label="新的皮肤" name="New Skin" />
<menu_item_call label="新的头发" name="New Hair" />
<menu_item_call label="新的眼睛" name="New Eyes" />
</menu>
</menu>
- <menu label="Sort" name="Sort">
+ <menu label="排序" name="Sort">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_check label="通过名字" name="By Name" />
- <menu_item_check label="通过日期" name="By Date" />
- <menu_item_check label="文件夹永远通过名字查找" name="Folders Always By Name" />
+ <menu_item_check label="按名称" name="By Name" />
+ <menu_item_check label="按日期" name="By Date" />
+ <menu_item_check label="文件夹总是按名称排列" name="Folders Always By Name" />
+ <menu_item_check
+ label="系统文件夹置顶"
+ name="System Folders To Top" />
+
</menu>
- <menu label="Filters" name="Filters">
+<!-- <menu label="Filters" name="Filters">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_check label="修改流量" name="Modify Current" />
<menu_item_call label="重新设置流量" name="Reset Current" />
- </menu>
+ </menu> -->
</menu_bar>
</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 73ffedc..85ec0c9 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="库存财产条目">
+<floater name="item properties" title="物品属性">
<text name="LabelItemNameTitle">
名字:
</text>
@@ -10,64 +10,68 @@
创造者:
</text>
<text name="LabelCreatorName">
- 妮可儿 林登
+ Nicole Linden
</text>
<button label="档案..." label_selected="" name="BtnCreator" />
<text name="LabelOwnerTitle">
主人:
</text>
<text name="LabelOwnerName">
- 斯雷萨斯 林登
+ Thrax Linden
</text>
<button label="档案..." label_selected="" name="BtnOwner" />
<text name="LabelAcquiredTitle">
- 获得:
+ 获得时间:
</text>
<text name="LabelAcquiredDate">
- 星期三 5月24日12:50:46 2006
+ 2006年 5月 24日 星期三 12:50:46
</text>
<text name="OwnerLabel">
你可以：
</text>
- <check_box label="修饰" name="CheckOwnerModify" />
+ <check_box label="修改" name="CheckOwnerModify" />
<check_box label="复制" name="CheckOwnerCopy" />
- <check_box label="转卖/抛弃" name="CheckOwnerTransfer" />
- <text name="BaseMaskDebug">
- B:
+ <check_box label="转卖/赠与" name="CheckOwnerTransfer" />
+ <!--<text name="BaseMaskDebug">
+ 基:
</text>
<text name="OwnerMaskDebug">
- O:
+ 主:
</text>
<text name="GroupMaskDebug">
- G:
+ 团:
</text>
<text name="EveryoneMaskDebug">
- E:
+ 众:
</text>
<text name="NextMaskDebug">
- N:
- </text>
+ 受:
+ </text>-->
<check_box label="与社团分享" name="CheckShareWithGroup" />
<check_box label="允许任何人复制" name="CheckEveryoneCopy" />
<text name="NextOwnerLabel">
下个拥有者可以:
</text>
- <check_box label="修饰" name="CheckNextOwnerModify" />
+ <check_box label="修改" name="CheckNextOwnerModify" />
<check_box label="复制" name="CheckNextOwnerCopy" />
- <check_box label="转卖/抛弃" name="CheckNextOwnerTransfer" />
+ <check_box label="转卖/赠与" name="CheckNextOwnerTransfer" />
<text name="SaleLabel">
- 标记项目:
+ 标记项目为:
</text>
- <check_box label="代售" name="CheckPurchase" />
+ <check_box label="可出售" name="CheckPurchase" />
<radio_group name="RadioSaleType">
<radio_item name="radio">
- Original
+ 原件
</radio_item>
<radio_item name="radio2">
- 复制
+ 复制品
</radio_item>
</radio_group>
<text name="TextPrice">
价格：L$
</text>
+ <text name="unknown">(未知)</text>
+ <text name="public">(公共的)</text>
+ <text name="you_can">你可以:</text>
+ <text name="owner_can">拥有者可以:</text>
</floater>
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 706933f..46cbc1d 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
@@ -4,19 +4,19 @@
<check_box label="通话卡" name="check_calling_card" />
<check_box label="衣物" name="check_clothing" />
<check_box label="动作" name="check_gesture" />
- <check_box label="地标建筑" name="check_landmark" />
- <check_box label="笔记卡" name="check_notecard" />
- <check_box label="东东" name="check_object" />
+ <check_box label="地标" name="check_landmark" />
+ <check_box label="记事卡" name="check_notecard" />
+ <check_box label="物体" name="check_object" />
<check_box label="脚本" name="check_script" />
<check_box label="声音" name="check_sound" />
<check_box label="材质" name="check_texture" />
- <check_box label="快照" name="check_snapshot" />
+ <check_box label="截图" name="check_snapshot" />
<button label="全部" label_selected="全部" name="All" />
- <button label="都不" label_selected="都不" name="None" />
- <check_box label="永远显示文件夹" name="check_show_empty" />
+ <button label="清除" label_selected="清除" name="None" />
+ <check_box label="总是显示文件夹" name="check_show_empty" />
<check_box label="自从下线开始" name="check_since_logoff" />
<text type="string" length="1" name="- OR -">
- - OR -
+ - 或者 -
</text>
<spinner label="若干小时之前" name="spin_hours_ago" />
<spinner label="若干天前" name="spin_days_ago" />
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
new file mode 100644
index 0000000..f74922b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="floater_lagmeter"
+ title="延迟计量器">
+ <button
+ label=""
+ label_selected=""
+ name="client_lagmeter"
+ tool_tip="客户端延迟状况" />
+ <text
+ name="client">
+ 客户端:
+ </text>
+ <text
+ name="client_text"
+ right="-10">
+ 正常
+ </text>
+ <text
+ name="client_lag_cause"
+ right="-32" />
+ <button
+ label=""
+ label_selected=""
+ name="network_lagmeter"
+ tool_tip="网络延迟状况" />
+ <text
+ name="network">
+ 网络:
+ </text>
+ <text
+ name="network_text"
+ right="-10">
+ 正常
+ </text>
+ <button
+ label=""
+ label_selected=""
+ name="server_lagmeter"
+ tool_tip="服务器延迟状况" />
+ <text
+ name="server">
+ 服务器:
+ </text>
+ <text
+ name="server_text"
+ right="-10">
+ 正常
+ </text>
+ <string
+ name="max_title_msg">
+ 延迟计量器
+ </string>
+
+ <string
+ name="min_title_msg">
+ 延迟
+ </string>
+
+ <string
+ name="client_text_msg">
+ 客户端
+ </string>
+ <string
+ name="client_frame_time_window_bg_msg">
+ 正常，窗口处于后台状态
+ </string>
+ <string
+ name="client_frame_time_critical_msg">
+ 客户端每秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 以下
+ </string>
+ <string
+ name="client_frame_time_warning_msg">
+ 客户端每秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 到 [CLIENT_FRAME_RATE_WARNING] 之间
+ </string>
+ <string
+ name="client_frame_time_normal_msg">
+ 正常
+ </string>
+ <string
+ name="client_draw_distance_cause_msg">
+ 可能原因：描绘距离设置过高
+ </string>
+ <string
+ name="client_texture_loading_cause_msg">
+ 可能原因：图像加载中
+ </string>
+ <string
+ name="client_texture_memory_cause_msg">
+ 可能原因：内存中图像过多
+ </string>
+ <string
+ name="client_complex_objects_cause_msg">
+ 可能原因：场景中复杂物体过多
+ </string>
+ <string
+ name="network_text_msg">
+ 网络
+ </string>
+ <string
+ name="network_packet_loss_critical_msg">
+ 网络连接正在丢弃 [NETWORK_PACKET_LOSS_CRITICAL]% 以上的数据包
+ </string>
+ <string
+ name="network_packet_loss_warning_msg">
+ 网络连接正在丢弃 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% 的数据包
+ </string>
+ <string
+ name="network_performance_normal_msg">
+ 正常
+ </string>
+ <string
+ name="network_ping_critical_ms">
+ 600
+ </string>
+ <string
+ name="network_ping_warning_ms">
+ 300
+ </string>
+ <string
+ name="network_ping_critical_msg">
+ 连接响应时间大于 [NETWORK_PING_CRITICAL] 毫秒
+ </string>
+ <string
+ name="network_ping_warning_msg">
+ 连接响应时间介于 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒
+ </string>
+ <string
+ name="network_packet_loss_cause_msg">
+ 有可能是连接问题，或“带宽”设置过高。
+ </string>
+ <string
+ name="network_ping_cause_msg">
+ 有可能是连接问题，或正使用文件共享下载程序。
+ </string>
+ <string
+ name="server_text_msg">
+ 服务器
+ </string>
+ <string
+ name="server_single_process_max_time_ms">
+ 20
+ </string>
+ <string
+ name="server_frame_time_critical_msg">
+ 模拟器每秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 以下
+ </string>
+ <string
+ name="server_frame_time_warning_msg">
+ 模拟器每秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 和 [SERVER_FRAME_RATE_WARNING] 之间
+ </string>
+ <string
+ name="server_frame_time_normal_msg">
+ 正常
+ </string>
+ <string
+ name="server_physics_cause_msg">
+ 可能原因：物理物体过多
+ </string>
+ <string
+ name="server_scripts_cause_msg">
+ 可能原因：有脚本的物体过多
+ </string>
+ <string
+ name="server_net_cause_msg">
+ 可能原因：网络流量过大
+ </string>
+ <string
+ name="server_agent_cause_msg">
+ 可能原因：区域中移动的人太多
+ </string>
+ <string
+ name="server_images_cause_msg">
+ 可能原因：图像计算过多
+ </string>
+ <string
+ name="server_generic_cause_msg">
+ 可能原因：模拟器负载过大
+ </string>
+</floater>
+
+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
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 9d340ab..83dacc0 100644
--- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="land holdings floater" title="我的土地">
<scroll_list name="parcel list">
- <column label="Name" name="name" />
- <column label="Location" name="location" />
- <column label="Area" name="area" />
+ <column label="名称" name="name" />
+ <column label="地点" name="location" />
+ <column label="面积" name="area" />
<column label="" name="hidden" />
</scroll_list>
- <button label="闪电传送" label_selected="闪电传送" name="Teleport"
- tool_tip="闪电传运到此地的中心." />
+ <button label="瞬间移动" label_selected="瞬间移动" name="Teleport"
+ tool_tip="瞬间移动到该地的中心。" />
<button label="在地图中显示" label_selected="在地图中显示"
- name="Show on Map" tool_tip="将此地在世界地图上显示出来" />
+ name="Show on Map" tool_tip="将该地在世界地图上显示出来。" />
<text name="contrib_label">
- 向你的社团捐赠:
+ 对你的社团的配额贡献:
</text>
<scroll_list name="grant list">
- <column label="Group" name="group" />
- <column label="Area" name="area" />
+ <column label="社团" name="group" />
+ <column label="面积" name="area" />
</scroll_list>
<text name="allowed_label">
- 允许该支付方案购买土地:
+ 当前支付方案下允许的土地持有量:
</text>
<text name="allowed_text">
- 0 平方米
+ [AREA] 平方米
</text>
<text name="current_label">
- 目前土地所有者:
+ 目前持有土地量:
</text>
<text name="current_text">
- 0 平方米
+ [AREA] 平方米
</text>
<text name="available_label">
- 可以进行土地购买活动:
+ 可以购买的土地量:
</text>
<text name="available_text">
- 0 平方米
+ [AREA] 平方米
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
new file mode 100644
index 0000000..a090239
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_tear_off="true"
+ min_height="310"
+ min_width="241"
+ name="landmarkpicker"
+ title="整理: 地标">
+ <check_box
+ initial_value="true"
+ label="显示文件夹"
+ name="show_folders_check" />
+ <button
+ label="新建"
+ label_selected="新建"
+ name="New" />
+ <button
+ label="重命名"
+ label_selected="重命名"
+ name="Rename" />
+ <button
+ label="新建文件夹"
+ label_selected="新建文件夹"
+ name="NewFolder" />
+ <button
+ label="编辑"
+ label_selected="编辑"
+ name="Edit" />
+ <button
+ label="删除"
+ label_selected="删除"
+ name="Delete" />
+ <button
+ label="关闭"
+ label_selected="关闭"
+ name="Close" />
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index b7527fc..e05a577 100644
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="script ed float" title="脚本：新的脚本">
- <button label="重至" label_selected="重至" name="Reset" />
+ <button label="重置" label_selected="重置" name="Reset" />
<check_box label="运行" name="running" />
+ <string
+ name="script_running">
+ 运行
+ </string>
+ <check_box label="Mono" name="mono" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
new file mode 100644
index 0000000..6ae47af
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="script ed float"
+ title="LSL Wiki">
+ <check_box
+ label="跟随光标"
+ name="lock_check" />
+ <combo_box
+ label="锁定"
+ name="history_combo" />
+ <button
+ label="后退"
+ name="back_btn" />
+ <button
+ label="前进"
+ name="fwd_btn" />
+</floater>
+
+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
new file mode 100644
index 0000000..5477f2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="140"
+ min_width="467"
+ name="floater_about"
+ title="媒体浏览器">
+ <layout_stack
+ name="stack1"
+ top="-20">
+ <layout_panel
+ name="nav_controls">
+ <button
+ label="后退"
+ name="back" />
+ <button
+ label="前进"
+ name="forward" />
+ <button
+ label="刷新"
+ name="reload" />
+ <button
+ label="转到"
+ name="go" />
+ </layout_panel>
+ <layout_panel
+ name="parcel_owner_controls">
+ <button
+ label="当前URL设置为地块媒体地址"
+ name="assign" />
+ </layout_panel>
+ <layout_panel
+ name="external_controls">
+ <button
+ label="在我的网页浏览器中打开"
+ name="open_browser" />
+ <check_box
+ label="总在我的浏览器中打开"
+ name="open_always" />
+ <button
+ label="关闭"
+ name="close" />
+ </layout_panel>
+ </layout_stack>
+</floater>
+
+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
new file mode 100644
index 0000000..ad5aadc
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="MemLeak"
+ title="内存泄漏模拟">
+ <spinner
+ label="泄漏速度 (字节每秒):"
+ name="leak_speed" />
+ <spinner
+ label="最大泄漏内存 (MB):"
+ name="max_leak" />
+ <text
+ name="total_leaked_label">
+ 当前泄漏的内存: [SIZE] KB
+ </text>
+ <text
+ name="note_label_1">
+ [NOTE1]
+ </text>
+ <text
+ name="note_label_2">
+ [NOTE2]
+ </text>
+ <button
+ label="开始"
+ name="start_btn" />
+ <button
+ label="结束"
+ name="stop_btn" />
+ <button
+ label="释放"
+ name="release_btn" />
+ <button
+ label="关闭"
+ name="close_btn" />
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_mute.xml b/indra/newview/skins/default/xui/zh/floater_mute.xml
index dba916e..62b6f07 100644
--- a/indra/newview/skins/default/xui/zh/floater_mute.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="屏蔽居民和东东">
- <scroll_list name="mutes" tool_tip="List of currently muted residents" />
+<floater
+ name="mute floater"
+ short_title="屏蔽列表"
+ title="屏蔽居民和物体">
+<scroll_list name="mutes" tool_tip="当前屏蔽的居民列表" />
<button label="屏蔽居民..." label_selected="屏蔽居民..."
- name="Mute resident..." tool_tip="选择一个住户并屏蔽此人" />
- <button label="屏蔽名字为…的东东"
- label_selected="屏蔽名字为…的东东" name="Mute object by name..." />
+ name="Mute resident..." tool_tip="选择一个居民并屏蔽此人" />
+ <button label="按名称屏蔽物体..."
+ label_selected="按名称屏蔽物体..." name="Mute object by name..." />
<button label="解除屏蔽" label_selected="解除屏蔽" name="Unmute"
- tool_tip="从消声栏中将居民或东东删除。" />
+ tool_tip="从消声栏中将居民或物体删除。" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
new file mode 100644
index 0000000..ebeb108
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="140"
+ min_width="375"
+ name="mute by name"
+ title="按名称屏蔽物体">
+ <text
+ name="message"
+ right="380">
+ 按名称屏蔽只影响物体的公开聊天和私聊，而不会影响到声音。
+你必须准确地输入物体的名称。
+ </text>
+ <line_editor
+ name="object_name">
+ 物体名称
+ </line_editor>
+ <button
+ label="确定"
+ name="OK" />
+ <button
+ label="取消"
+ name="Cancel" />
+</floater>
+
+<!--Translated for Second Life 1.19.1 RC3 -->
diff --git a/indra/newview/skins/default/xui/zh/floater_my_friends.xml b/indra/newview/skins/default/xui/zh/floater_my_friends.xml
new file mode 100644
index 0000000..1dfaf55
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_my_friends.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="floater_my_friends"
+ title="联系人">
+ <tab_container
+ name="friends_and_groups"
+ tab_position="top"
+ tab_width="80">
+ <panel
+ filename="panel_friends.xml"
+ label="好友"
+ name="friends_panel" />
+ <panel
+ filename="panel_groups.xml"
+ label="社团"
+ name="groups_panel" />
+ </tab_container>
+</floater>
+<!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
index c7abad0..8fbbf92 100644
--- a/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
@@ -2,7 +2,7 @@
<floater name="modal container" title=" ">
<button label="存储" label_selected="存储" name="Save" />
<button label="取消" label_selected="取消" name="Cancel" />
- <check_box label="外形" name="checkbox_Shape" />
+ <check_box label="体型" name="checkbox_Shape" />
<check_box label="皮肤" name="checkbox_Skin" />
<check_box label="头发" name="checkbox_Hair" />
<check_box label="眼睛" name="checkbox_Eyes" />
@@ -17,7 +17,7 @@
<check_box label="内裤" name="checkbox_Underpants" />
<check_box label="裙子" name="checkbox_Skirt" />
<check_box label="胸部" name="checkbox_Chest" />
- <check_box label="头型" name="checkbox_Skull" />
+ <check_box label="头部" name="checkbox_Skull" />
<check_box label="左肩" name="checkbox_Left Shoulder" />
<check_box label="右肩" name="checkbox_Right Shoulder" />
<check_box label="左手" name="checkbox_Left Hand" />
@@ -30,54 +30,54 @@
<check_box label="下巴" name="checkbox_Chin" />
<check_box label="左耳" name="checkbox_Left Ear" />
<check_box label="右耳" name="checkbox_Right Ear" />
- <check_box label="左眼珠" name="checkbox_Left Eyeball" />
- <check_box label="右眼珠" name="checkbox_Right Eyeball" />
+ <check_box label="左眼" name="checkbox_Left Eyeball" />
+ <check_box label="右眼" name="checkbox_Right Eyeball" />
<check_box label="鼻子" name="checkbox_Nose" />
- <check_box label="R 提高胳膊位置" name="checkbox_R Upper Arm" />
- <check_box label="R预备" name="checkbox_R Forearm" />
- <check_box label="L 增加臂长" name="checkbox_L Upper Arm" />
- <check_box label="L 预备" name="checkbox_L Forearm" />
+ <check_box label="右上臂" name="checkbox_R Upper Arm" />
+ <check_box label="右前臂" name="checkbox_R Forearm" />
+ <check_box label="左上臂" name="checkbox_L Upper Arm" />
+ <check_box label="左前臂" name="checkbox_L Forearm" />
<check_box label="右胯" name="checkbox_Right Hip" />
- <check_box label="R 提高腿部位置" name="checkbox_R Upper Leg" />
- <check_box label="R 增加腿长" name="checkbox_R Lower Leg" />
+ <check_box label="右大腿" name="checkbox_R Upper Leg" />
+ <check_box label="右小腿" name="checkbox_R Lower Leg" />
<check_box label="左胯" name="checkbox_Left Hip" />
- <check_box label="L 增加腿长" name="checkbox_L Upper Leg" />
- <check_box label="L 缩短腿长" name="checkbox_L Lower Leg" />
+ <check_box label="左大腿" name="checkbox_L Upper Leg" />
+ <check_box label="左小腿" name="checkbox_L Lower Leg" />
<check_box label="肚子" name="checkbox_Stomach" />
<check_box label="左胸肌" name="checkbox_Left Pec" />
<check_box label="右胸肌" name="checkbox_Right Pec" />
- <check_box label="中心2" name="checkbox_Center 2" />
- <check_box label="上端右侧" name="checkbox_Top Right" />
- <check_box label="上端" name="checkbox_Top" />
- <check_box label="上端左侧" name="checkbox_Top Left" />
- <check_box label="Center中心" name="checkbox_Center" />
- <check_box label="底部左侧" name="checkbox_Bottom Left" />
- <check_box label="底部" name="checkbox_Bottom" />
- <check_box label="底部右侧" name="checkbox_Bottom Right" />
+ <check_box label="中央2" name="checkbox_Center 2" />
+ <check_box label="右上方" name="checkbox_Top Right" />
+ <check_box label="上方" name="checkbox_Top" />
+ <check_box label="左上方" name="checkbox_Top Left" />
+ <check_box label="中央" name="checkbox_Center" />
+ <check_box label="左下方" name="checkbox_Bottom Left" />
+ <check_box label="下方" name="checkbox_Bottom" />
+ <check_box label="右下方" name="checkbox_Bottom Right" />
<text type="string" length="1" name="Make New Outfit">
- 制作新的装备
+ 制作新的装束
</text>
<text type="string" length="1"
name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on. "Make New Outfit" makes a new folder and saves copies of the items you are now wearing into it.">
- 装备是一些文件夹，这些文件夹中包含服饰和一些身体躯干。
-拖拽一项装备文件夹至你的化身身上，并松开鼠标，将其保留在化身身体上。
+ 装束是包含服饰和一些身体躯干的文件夹。
+将装束文件夹拖动到化身身上来穿上它。
-"制造新的装备"会创建新的文件夹，并保存你正在使用或穿着的物品的副本在新的文件夹中。
+"制造新的装束"会创建新的文件夹，并保存你正在使用或穿着的物品的副本在新的文件夹中。
</text>
<text type="string" length="1" name="Folder name:">
文件夹名称:
</text>
<text type="string" length="1" name="Items to include in outfit:">
- 包括装备中的物品条目:
+ 装束中包括的物品:
</text>
<text type="string" length="1" name="Body Parts:">
- 躯干
+ 体形
</text>
<text type="string" length="1" name="Clothes:">
服饰:
</text>
<text type="string" length="1" name="Attachments:">
- 附属:
+ 附件:
</text>
<text type="string" length="1" name="Options:">
选项:
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
index 0ead435..e5b6528 100644
--- a/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="东东内容">
+<floater name="objectcontents" title="物体内容">
<text type="string" length="1" name="object_name">
[DESC]:
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index d065349..2691383 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -13,7 +13,7 @@
[FIRST] [LAST]
</text>
<text type="string" length="1" name="fastpay text">
- 快速支付通道:
+ 快速支付:
</text>
<text type="string" length="1" name="amount text">
数量:
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 956104f..ec56c65 100644
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -10,13 +10,13 @@
[FIRST] [LAST]
</text>
<text type="string" length="1" name="object_name_label">
- 通过东东:
+ 通过物体:
</text>
<text type="string" length="1" name="object_name_text">
...
</text>
<text type="string" length="1" name="fastpay text">
- 快速支付通道:
+ 快速支付:
</text>
<text type="string" length="1" name="amount text">
数量:
diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml
new file mode 100644
index 0000000..34840c4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_post_process.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="400"
+ min_width="300"
+ name="Post-Process Floater"
+ title="后期处理设定">
+ <tab_container
+ name="Post-Process Tabs">
+ <panel
+ label="颜色过滤器"
+ name="wmiColorFilterPanel">
+ <check_box
+ initial_value="false"
+ label="启用"
+ name="wmiColorFilterToggle" />
+ <text
+ name="wmiColorFilterBrightnessText">
+ 亮度
+ </text>
+ <text
+ name="wmiColorFilterSaturationText">
+ 饱和度
+ </text>
+ <text
+ name="wmiColorFilterContrastText">
+ 对比度
+ </text>
+ <text
+ name="wmiColorFilterBaseText">
+ 对比度基调
+ </text>
+ <slider
+ label="R"
+ name="wmiColorFilterBaseR"
+ value="1.0" />
+ <slider
+ label="G"
+ name="wmiColorFilterBaseG"
+ value="1.0" />
+ <slider
+ label="B"
+ name="wmiColorFilterBaseB"
+ value="1.0" />
+ <slider
+ label="I"
+ name="wmiColorFilterBaseI"
+ value="1.0" />
+ </panel>
+ <panel
+ label="夜间视觉"
+ name="wmiNightVisionPanel">
+ <check_box
+ label="启用"
+ name="wmiNightVisionToggle" />
+ <text
+ name="wmiNightVisionBrightMultText">
+ 光线放大倍数
+ </text>
+ <text
+ name="wmiNightVisionNoiseSizeText">
+ 噪点尺寸
+ </text>
+ <text
+ name="wmiNightVisionNoiseStrengthText">
+ 噪声强度
+ </text>
+ </panel>
+ <panel
+ label="Bloom"
+ name="wmiBloomPanel">
+ <check_box
+ initial_value="false"
+ label="Enable"
+ name="wmiBloomToggle" />
+ <text
+ name="wmiBloomExtractText">
+ 明度提取
+ </text>
+ <slider
+ label=""
+ name="wmiBloomExtract"
+ value="0.7" />
+ <text
+ name="wmiBloomSizeText">
+ 辉光尺寸
+ </text>
+ <slider
+ label=""
+ name="wmiBloomSize"
+ value="1.0" />
+ <text
+ name="wmiBloomStrengthText">
+ 辉光强度
+ </text>
+ <slider
+ label=""
+ name="wmiBloomStrength"
+ value="1.0" />
+ </panel>
+ <panel
+ label="额外选项"
+ name="Extras">
+ <button
+ label="读取效果"
+ label_selected="读取效果"
+ name="PPLoadEffect" />
+ <button
+ label="保存效果"
+ label_selected="保存效果"
+ name="PPSaveEffect" />
+ <line_editor
+ label="效果名称"
+ name="PPEffectNameEditor" />
+ </panel>
+ </tab_container>
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_postcard.xml b/indra/newview/skins/default/xui/zh/floater_postcard.xml
index dc6df6f..39934b1 100644
--- a/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_postcard.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="发送明信片">
+<floater name="Postcard" title="发送快照">
<text name="to_label">
- 接收员的邮件:
+ 收件人电子邮件地址:
</text>
<text name="from_label">
- 你的电子邮箱:
+ 你的电子邮件地址:
</text>
<text name="name_label">
你的姓名:
@@ -13,16 +13,31 @@
主题:
</text>
<text name="msg_label">
- 信息:
+ 正文:
</text>
+ <text_editor
+ name="msg_form">
+ 在这里键入你的信息。
+ </text_editor>
<check_box label="在网上公布" name="allow_publish_check"
tool_tip="将此明信片发布到网络上" />
<check_box label="成人内容" name="mature_check"
tool_tip="这张明信片包含成人内容." />
<button label="?" name="publish_help_btn" />
+ <string
+ name="default_subject">
+ 来自第二人生的明信片
+ </string>
+ <string
+ name="default_message">
+ 瞧瞧这个!
+ </string>
<text name="fine_print">
- 如果你的明信片收到者加入SL，你会得到一份额外的奖励。
+ 如果你的收件人加入SL，你会得到一份介绍奖励。
</text>
<button label="取消" name="cancel_btn" />
<button label="发送" name="send_btn" />
+ <string name="upload_message">
+ 发送中……
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 788e77c..76baeaf 100644
--- a/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Preferences" title="偏好">
<button label="关于..." label_selected="关于..." name="About..." />
- <button label="OK" label_selected="OK" name="OK" />
+ <button label="确定" label_selected="确定" name="OK" />
<button label="取消" label_selected="取消" name="Cancel" />
<button label="应用" label_selected="应用" name="Apply" />
+ <button label="帮助" label_selected="帮助" name="Help" />
+
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index 76f5e65..854c7cb 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -3,7 +3,7 @@
<text type="string" length="1" name="desc txt">
描述:
</text>
- <button label="在全世界播放" label_selected="停止" name="Anim play btn"
+ <button label="在世界中播放" label_selected="停止" name="Anim play btn"
tool_tip="播放这段动画且其他人也可以观看。" />
<button label="本地播放" label_selected="停止" name="Anim audition btn"
tool_tip="播放这段动画且仅有您可以观看。" />
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_classified.xml b/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
new file mode 100644
index 0000000..554323a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="classified_preview"
+ title="分类广告信息">
+ <panel
+ name="classified_details_panel" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
index 0cf530c..7bc2024 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="最上层泥土">
+<floater name="preview_texture" title="最上层泥土">
<button label="复制至库存" label_selected="复制至库存"
name="Copy To Inventory" />
<text type="string" length="1" name="dimensions">
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_event.xml b/indra/newview/skins/default/xui/zh/floater_preview_event.xml
new file mode 100644
index 0000000..18017a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preview_event.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="event_preview"
+ title="事件信息">
+ <panel
+ name="event_details_panel" />
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml b/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
index 699b13d..b499f9d 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
@@ -4,6 +4,6 @@
<text type="string" length="1" name="desc txt">
描述:
</text>
- <button label="闪电传送" label_selected="" name="Teleport btn" />
+ <button label="瞬间移动" label_selected="" name="Teleport btn" />
<button label="在地图中显示" label_selected="" name="Show on Map btn" />
</floater>
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 41b63d2..4dfc091 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -1,34 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gesture" title="动作">
+<floater name="gesture_preview" title="动作">
<text name="desc_label">
描述:
</text>
<text name="trigger_label">
- 引发源:
+ 命令:
</text>
<text name="replace_text"
- tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!">
+ tool_tip="将命令词用这些词替换。例如说，命令‘你好’替换为‘好呀！’ 将会将对话 ‘我想说你好’ 变成 ‘我想说好呀！’ 并同时播放动作。">
替换为:
</text>
<line_editor name="replace_editor"
- tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" />
+ tool_tip="将命令词用这些词替换。例如说，命令‘你好’替换为‘好呀！’ 将会将对话 ‘我想说你好’ 变成 ‘我想说好呀！’ 并同时播放动作。" />
<text name="key_label">
快捷键:
</text>
- <combo_box label="都不" name="modifier_combo" />
- <combo_box label="都不" name="key_combo" />
+ <combo_box label="无" name="modifier_combo" />
+ <combo_box label="无" name="key_combo" />
<text>
- 图书馆:
+ 库:
</text>
<text>
步骤:
</text>
+ <scroll_list
+ draw_border="true"
+ name="library_list">
+ Animation
+Sound
+Chat
+Wait
+ </scroll_list>
<button label="添加>>" name="add_btn" />
<button label="上移" name="up_btn" />
<button label="下移" name="down_btn" />
<button label="移除" name="delete_btn" />
<text name="help_label">
- 所有的步骤都是自行发生，除非你添加了等待步骤。
+ 所有的步骤都同时发生，
+除非你添加了等待步骤。
</text>
<radio_group name="animation_trigger_type">
<radio_item>
@@ -39,9 +48,9 @@
</radio_item>
</radio_group>
<check_box label="直到动画完成" name="wait_anim_check" />
- <check_box label="时间计算精确到秒" name="wait_time_check" />
+ <check_box label="等待时间, 以秒计" name="wait_time_check" />
<check_box label="激活" name="active_check"
- tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys. Gestures usually become inactive when there is a key binding conflict." />
+ tool_tip="激活的动作可以被命令或快捷键启动。动作一般当按键冲突时会成为不激活的状态。" />
<button label="预览" name="preview_btn" />
<button label="存储" name="save_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml b/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
new file mode 100644
index 0000000..0820df9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Linden Land, Da Boom (155, 136, 35)"
+ title=" Linden Land, Da Boom (155, 136, 35)">
+ <button label="瞬间移动" label_selected="" name="Teleport btn" />
+ <button label="在地图中显示" label_selected="" name="Show on Map btn" />
+ <button label="放弃" label_selected="" name="Discard btn" />
+ <text type="string" length="1" name="desc txt">
+ 描述:
+ </text>
+</floater>
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 feccac6..60ef174 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="preview notecard" title="注意:">
- <button label="存储" label_selected="存储" name="Save" />
+ <button label="保存" label_selected="保存" name="Save" />
<text type="string" length="1" name="desc txt">
描述:
</text>
<text_editor type="string" length="1" name="Notecard Editor">
请等待...
</text_editor>
+ <string
+ name="no_object">
+ 无法找到包含这个记事卡的物体。
+ </string>
+ <string
+ name="not_allowed">
+ 你没有查看该记事卡的权利。
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
index cfc961f..3853f05 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
@@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview notecard" title="注意:更改你的外形，第二部分">
+<floater name="preview_notecard" title="注意:更改你的外形，第二部分">
<text_editor type="string" length="1" name="Notecard Editor">
请等待...
</text_editor>
<text type="string" length="1" name="desc txt">
描述:
</text>
- <button label="保持" label_selected="保持" name="Keep" />
+ <button label="保留" label_selected="保留" name="Keep" />
<button label="放弃" label_selected="放弃" name="Discard" />
+ <string
+ name="no_object">
+ 无法找到包含这个记事卡的物体。
+ </string>
+ <string
+ name="not_allowed">
+ 你没有查看该记事卡的权利。
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index 5721b42..b5dc7c2 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview sound" title="声音: 女性嘘声2">
+<floater name="preview_sound" title="声音: 女性嘘声2">
<text type="string" length="1" name="desc txt">
描述:
</text>
- <button label="在全世界播放" label_selected="在全世界播放"
+ <button label="在世界中播放" label_selected="在世界中播放"
name="Sound play btn"
- tool_tip="播放这段音频且其他人也可听到。." />
+ tool_tip="播放这段音频且其他人也可听到。" />
<button label="本地播放" label_selected="本地播放" name="Sound audition btn"
tool_tip="播放这段音频且仅有您可以听到。" />
</floater>
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 a3b0711..c5d54e9 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="材质: 灰色金属涂抹">
+<floater name="preview_texture" title="材质: 灰色金属涂抹">
<text type="string" length="1" name="desc txt">
描述:
</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
index f4b74a9..acf1ded 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="材质: 手形">
- <text type="string" length="1" name="desc txt">
+<floater name="preview_texture" title="材质: 手形">
+ <text type="string" name="desc txt">
描述:
</text>
- <button label="保持" label_selected="保持" name="Keep" />
+ <button label="保留" label_selected="保留" name="Keep" />
<button label="放弃" label_selected="放弃" name="Discard" />
<text type="string" length="1" name="dimensions">
尺寸: [WIDTH] x [HEIGHT]
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_url.xml b/indra/newview/skins/default/xui/zh/floater_preview_url.xml
new file mode 100644
index 0000000..005a62f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preview_url.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="url_preview"
+ title="地点信息">
+ <panel
+ name="place_details_panel" />
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
index 95658da..24dc421 100644
--- a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
@@ -12,6 +12,6 @@
<text name="price_text">
广告价格(L$):
</text>
- <button label="调节价格" name="set_price_btn" />
+ <button label="设置价格" name="set_price_btn" />
<button label="取消" name="cancel_btn" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml
new file mode 100644
index 0000000..ad777f5
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_region_info.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="地区/地产" />
+
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 e59b4d3..d19b274 100644
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_report_abuse" title="报告吵架">
+<floater name="floater_report_abuse" title="举报不良行为">
<text name="reporter_title">
报告者:
</text>
@@ -9,42 +9,137 @@
<text name="pos_title">
位置:
</text>
- <texture_picker name="screenshot" />
+ <texture_picker label="截图..." name="screenshot" />
<check_box label="包含屏幕截图" name="screen_check" />
<combo_box name="category_combo"
- tool_tip="Category -- select the category that best describes this report">
- <combo_item name="Selectcategory">
- 选择一个分类
+ tool_tip="分类 -- 选择描述该报告最合适的分类">
+ <combo_item name="Select_category">
+ 选择分类
+ </combo_item>
+ <combo_item name="Age__Age_play">
+ 年龄 > 年龄扮演
+ </combo_item>
+ <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+ 年龄 > 成年人居民在 Teen Second Life 上
+ </combo_item>
+ <combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+ 年龄 > 未成年人居民在成人 Second Life 上
+ </combo_item>
+ <combo_item name="Assault__Combat_sandbox___unsafe_area">
+ 攻击 > 格斗沙盒 / 不安全地区
+ </combo_item>
+ <combo_item name="Assault__Safe_area">
+ 攻击 > 安全地区
+ </combo_item><combo_item name="Assault__Weapons_testing_sandbox">
+ 攻击 > 武器测试沙盒
+ </combo_item>
+ <combo_item name="Copyright_or_intellectual_property_violation">
+ 版权或知识产权侵犯
+ </combo_item>
+ <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+ 商业 > 没能够提供产品或服务
+ </combo_item>
+ <combo_item name="Disclosure__Real_world_information">
+ 透露 > 真实世界信息
+ </combo_item>
+ <combo_item name="Disclosure__Remotely_monitoring chat">
+ 透露 > 远处监视聊天
+ </combo_item>
+ <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+ 透露 > 第二人生信息 / 聊天 / 即时消息
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+ 扰乱秩序 > 滥用区域资源
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+ 扰乱秩序 > 滥用有脚本的物体
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Object_littering">
+ 扰乱秩序 > 乱扔物体
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Repetitive_spam">
+ 扰乱秩序 > 重复的垃圾信息
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+ 扰乱秩序 > 不需要的商业垃圾信息
+ </combo_item>
+ <combo_item name="Fraud__L$">
+ 欺骗 > L$
+ </combo_item>
+ <combo_item name="Fraud__Land">
+ 欺骗 > 土地
+ </combo_item>
+ <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+ 欺骗 > 传销，老鼠会或链式邮件
+ </combo_item>
+ <combo_item name="Fraud__US$">
+ 欺骗 > US$
+ </combo_item>
+ <combo_item name="Harassment__Advert_farms___visual_spam">
+ 骚扰 > 广告 / 视觉垃圾信息
+ </combo_item>
+ <combo_item name="Harassment__Defaming_individuals_or_groups">
+ 骚扰 > 侮辱个人或团体
+ </combo_item>
+ <combo_item name="Harassment__Impeding_movement">
+ 骚扰 > 妨碍移动
+ </combo_item>
+ <combo_item name="Harassment__Sexual_harassment">
+ 骚扰 > 性骚扰
+ </combo_item>
+ <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+ 骚扰 > 请求或诱导他人违反使用条款
+ </combo_item>
+ <combo_item name="Harassment__Verbal_abuse">
+ 骚扰 > 语言辱骂等不良行为
+ </combo_item>
+ <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+ 猥亵 > 极具攻击性的内容或行为
+ </combo_item>
+ <combo_item name="Indecency__Broadly_visible_mature_content">
+ 猥亵 > 明显可见的成人内容
+ </combo_item>
+ <combo_item name="Indecency__Inappropriate_avatar_name">
+ 猥亵 > 不妥当的化身名字
+ </combo_item>
+ <combo_item name="Indecency__Mature_content_in_PG_region">
+ 猥亵 > 成人内容位于 PG 区域内
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_Content_Removal" value="66">
+ 知识产权侵犯 > 撤除内容
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37">
+ 知识产权侵犯 > CopyBot 或者权限漏洞利用
</combo_item>
<combo_item name="Intolerance">
- 不耐性
+ 不宽容
</combo_item>
- <combo_item name="Harassment">
- 折磨
+ <combo_item name="Land__Abuse_of_sandbox_resources">
+ 土地 > 滥用沙盒资源
</combo_item>
- <combo_item name="Assault">
- 攻击
+ <combo_item name="Land__Encroachment__Objects_textures">
+ 土地 > 入侵 > 物体或材质
</combo_item>
- <combo_item name="Disclosure">
- 揭发
+ <combo_item name="Land__Encroachment__Particles">
+ 土地 > 入侵 > 粒子
</combo_item>
- <combo_item name="Indecency">
- 侵犯
+ <combo_item name="Land__Encroachment__Trees_plants">
+ 土地 > 入侵 > 树木/植被
</combo_item>
- <combo_item name="Age">
- 年纪
+ <combo_item name="Trademark_violation">
+ 商标侵害
</combo_item>
- <combo_item name="Parcel">
- 小块土地
+ <combo_item name="Wagering_gambling">
+ 赌博
</combo_item>
<combo_item name="Other">
其他
</combo_item>
</combo_box>
<button label="" label_selected="" name="pick_btn"
- tool_tip="东东拾取器 - 确认一个东东为此份报告中的一项" />
+ tool_tip="物体拾取器 - 确认一个物体为此份报告中的一项" />
<text name="select_object_label">
- 点击按钮然后点击东东:
+ 点击按钮然后点击物体:
</text>
<text name="object_name_label">
名字:
@@ -57,8 +152,12 @@
</text>
<button label="选择" label_selected="" name="select_abuser"
tool_tip="从列表中选择被辱者的姓名。" />
+ <check_box
+ label="不知道名字"
+ name="omit_abuser_name"
+ tool_tip="如果你无法提供实施不良行为的居民的名字，请选择这项。"/>
<text name="abuser_name_title2">
- 辱骂情况发生的地址:
+ 不良行为发生的地址:
</text>
<text name="sum_title">
总结:
@@ -67,11 +166,11 @@
详细:
</text>
<text name="bug_aviso">
- 请详尽的描述关于日期，地点，辱骂事件的特征，相关的聊天记录，如果可能请选择对象。
+ 请详尽的描述关于日期，地点，不良行为事件的特征，相关的聊天记录，如果可能请选择对象。
</text>
<text name="incomplete_title">
- 通知：不完整的报告将不会被调查
+ 注意：不完整的报告将不会被调查
</text>
- <button label="报告吵架" label_selected="报告吵架" 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_report_bug.xml b/indra/newview/skins/default/xui/zh/floater_report_bug.xml
index 65472d4..0a5d292 100644
--- a/indra/newview/skins/default/xui/zh/floater_report_bug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_bug.xml
@@ -10,7 +10,7 @@
位置:
</text>
<text name="select_object_label">
- 点击按钮选择一个东东:
+ 点击按钮然后点击物体:
</text>
<button label="" label_selected="" name="pick_btn"
tool_tip="东东拾取器 - 确认一个东东为此份报告中的一项" />
@@ -23,7 +23,7 @@
<check_box label="包含屏幕截图" name="screen_check" />
<texture_picker label="工作..." name="screenshot" />
<text name="category_label">
- 种类列表:
+ 分类:
</text>
<combo_box name="category_combo"
tool_tip="Category -- select the category that best describes this report">
@@ -31,7 +31,7 @@
选择一个分类
</combo_item>
<combo_item name="Building">
- 楼宇
+ 建造
</combo_item>
<combo_item name="Character">
角色
@@ -43,7 +43,7 @@
文档
</combo_item>
<combo_item name="Exploit">
- 开发
+ 漏洞
</combo_item>
<combo_item name="Graphics">
图像
@@ -52,22 +52,22 @@
库存
</combo_item>
<combo_item name="Lag">
- 滞后
+ 延迟
</combo_item>
<combo_item name="MissingContent">
遗失内容
</combo_item>
<combo_item name="LindenDollars(L$)">
- Linden Dollars (L$)
+ 林登币 (L$)
</combo_item>
<combo_item name="Permissions">
- 允许
+ 许可
</combo_item>
<combo_item name="Physics">
- 实物
+ 物理
</combo_item>
<combo_item name="Script">
- 剧本
+ 脚本
</combo_item>
<combo_item name="Sound">
音效
@@ -79,7 +79,7 @@
用户界面
</combo_item>
<combo_item name="Miscellaneous">
- 混色
+ 其他
</combo_item>
</combo_box>
<text name="sum_title">
@@ -89,14 +89,16 @@
详细:
</text>
<text_editor name="details_edit">
- 修复漏洞的途径：:
+重复漏洞发生的步骤:
-观察的结果：:
+观察到的结果:
+
+期望的结果:
</text_editor>
<text name="bug_aviso">
- If this bug allows you to do something you should not be able
-to do, especially if it impacts performance or security, please
-select the 'Exploit' category. Thank you!
+ 注意：不完整的报告将不会被调查
+ 如果这个漏洞允许你做你不应该做的事情，特别
+ 是妨碍到性能或安全，请选择漏洞一类。谢谢!
</text>
<button label="报告漏洞" label_selected="报告漏洞" name="send_btn" />
<button label="取消" label_selected="取消" name="cancel_btn" />
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
index 0d40bd7..733e192 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater name="script debug floater" title="脚本错误/警告">
<tab_container name="Preview Tabs">
- <floater label="剧本" name="all_scripts" title="所有脚本" />
+ <floater label="脚本" name="all_scripts" title="所有脚本" />
</tab_container>
</multi_floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
index 2941882..27c97aa 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
@@ -4,12 +4,39 @@
<text_editor type="string" length="1" name="Script Editor">
请等待...
</text_editor>
+ <string
+ name="loading">
+ 请等待......
+ </string>
+ <string
+ name="can_not_view">
+ 你没有权利查看该脚本。
+ </string>
+ <string
+ name="public_objects_can_not_run">
+ 公共物体不能运行脚本。
+ </string>
+ <string
+ name="script_running">
+ 运行中
+ </string>
+
+ <combo_box
+ allow_text_entry="false"
+ label="插入..."
+ max_chars="20"
+ name="Insert..." />
+
<menu_bar name="script_menu">
- <menu name="File">
+ <menu
+ label="文件"
+ name="File">
<menu_item_call label="存储" name="Save" />
<menu_item_call label="恢复所有更改" name="Revert All Changes" />
</menu>
- <menu name="Edit">
+ <menu
+ label="编辑"
+ name="Edit">
<menu_item_call label="撤销" name="Undo" />
<menu_item_call label="重置" name="Redo" />
<menu_item_separator label="-----------" name="separator" />
@@ -18,12 +45,18 @@
<menu_item_call label="粘贴" name="Paste" />
<menu_item_separator label="-----------" name="separator2" />
<menu_item_call label="全选" name="Select All" />
- <menu_item_call label="取消选定" name="Deselect" />
+ <menu_item_call label="取消选择" name="Deselect" />
<menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="查找 / 替代..." name="Search / Replace..." />
+ <menu_item_call label="查找 / 替换..." name="Search / Replace..." />
+
</menu>
- <menu name="Help">
+ <menu
+ label="帮助"
+ name="Help">
<menu_item_call label="帮助..." name="Help..." />
+ <menu_item_call
+ label="LSL Wiki 帮助..."
+ name="LSL Wiki Help..." />
</menu>
</menu_bar>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml
index 25e71d7..81ba081 100644
--- a/indra/newview/skins/default/xui/zh/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="script search" title="脚本搜索">
- <check_box label="诉讼取消" name="case_text" />
- <button label="搜索" label_selected="搜索" name="search_btn" />
+ <check_box label="不区分大小写" name="case_text" />
+ <button label="查找" label_selected="查找" name="search_btn" />
<button label="替换" label_selected="替换" name="replace_btn" />
<button label="全部替换" label_selected="全部替换" name="replace_all_btn" />
<text type="string" length="1" name="txt">
- 搜索
+ 查找
</text>
<text type="string" length="1" name="txt2">
替换
diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml
new file mode 100644
index 0000000..67d4dc4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="modal container"
+ title="">
+ <button
+ label="取消"
+ label_selected="取消"
+ name="Cancel" />
+ <text
+ name="Save item as:">
+ 请按键选择
+ </text>
+</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 08eff9b..01e4cd4 100644
--- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="sell land" title="出售土地...">
<text name="info_parcel_label">
- 土地:
+ 地块:
</text>
<text name="info_parcel">
- 土地的名称
+ PARCEL NAME
</text>
<text name="info_size_label">
尺寸:
</text>
<text name="info_size">
- [AREA]平方米
+ [AREA] 平方米
</text>
<text name="info_action">
出售这块土地:
@@ -31,37 +31,37 @@
把土地出售给:
</text>
<text name="sell_to_text">
- 选择是否把东东出售给任何人或是一个特定的人.
+ 选择是否把地块出售给任何人或是一个特定的购买者。
</text>
<combo_box name="sell_to">
<combo_item name="--selectone--">
- -- select one --
+ -- 选择用户 --
</combo_item>
<combo_item name="Anyone">
任何人
</combo_item>
<combo_item name="Specificuser:">
- 特殊用户：
+ 指定用户：
</combo_item>
</combo_box>
<button label="选择..." name="sell_to_select_agent" />
<text name="sell_objects_label">
- 是否和土地一起出售东东?
+ 土地上的物体和土地一起出售吗？
</text>
<text name="sell_objects_text">
- Land owner's transferable objects on parcel will change ownership.
+ 地块所有人在地块上的可转让的物体，其所有权将会转让。
</text>
<radio_group name="sell_objects">
<radio_item name="no">
- No, keep ownership of objects
+ 不要，保留物体的所有权
</radio_item>
<radio_item name="yes">
- Yes, sell objects with land
+ 是的，和土地一起出售物体
</radio_item>
</radio_group>
- <button label="显示东东" name="show_objects" />
+ <button label="显示物体" name="show_objects" />
<text name="nag_message_label">
- 请谨记: 所有的售出都是最后阶段.
+ 请谨记: 所有土地交易都不能撤销。
</text>
<button label="设置土地为代售状态" name="sell_btn" />
<button label="取消" name="cancel_btn" />
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index 6524191..3947669 100644
--- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
@@ -1,15 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="降低缺陷设定">
- <combo_box name="boolean_combo">
- <combo_item name="TRUE">
+<floater
+ name="settings_debug"
+ title="调试设定">
+ <combo_box
+ name="boolean_combo">
+ <combo_item
+ name="TRUE"
+ value="true">
TRUE
</combo_item>
- <combo_item name="FALSE">
+ <combo_item
+ name="FALSE"
+ value="">
FALSE
</combo_item>
</combo_box>
- <spinner label="x" name="val_spinner_1" />
- <spinner label="x" name="val_spinner_2" />
- <spinner label="x" name="val_spinner_3" />
- <spinner label="x" name="val_spinner_4" />
+ <color_swatch
+ label="颜色"
+ name="color_swatch"
+ visible="true" />
+ <button
+ label="重置为默认值"
+ name="default_btn" />
</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml b/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
new file mode 100644
index 0000000..6aeaac7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="floaterreleasemessage"
+ title="正在进入地区">
+ <button
+ label="关闭"
+ name="close_btn"/>
+ <string
+ name="in-world_help_title">
+ 世界内帮助
+ </string>
+ <string
+ name="additional_help_title">
+ 附加帮助
+ </string>
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 3fd6971..0e83c98 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -1,23 +1,52 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="Snapshot" title="快照预览">
<text name="type_label">
- 你想干什么?
+ 截图类型
</text>
- <radio_group label="快照类型" name="snapshot_type_radio">
+ <radio_group label="截图类型" name="snapshot_type_radio">
<radio_item name="postcard">
- Send a postcard
+ 通过电子邮件发送
</radio_item>
<radio_item name="texture">
- Upload a snapshot
+ 保存至库存 (L$10)
</radio_item>
<radio_item name="local">
- Save snapshot to hard drive
+ 保存至硬盘
</radio_item>
</radio_group>
<text name="type_label2">
- 你需要多大的图像?
+ 尺寸
</text>
- <combo_box label="决议" name="postcard_size_combo">
+ <text
+ name="file_size_label">
+ 文件尺寸: [SIZE] KB
+ </text>
+ <button label="刷新截图" name="new_snapshot_btn" />
+ <button label="上传 (L$10)" name="upload_btn" />
+ <button label="发送" name="send_btn" />
+ <flyout_button
+ label="保存"
+ list_position="below"
+ name="save_btn"
+ tool_tip="保存图像到文件">
+ <flyout_button_item
+ value="save">保存</flyout_button_item>
+ <flyout_button_item
+ value="save as">另存为...</flyout_button_item>
+ </flyout_button>
+ <button label="放弃" name="discard_btn" />
+ <button
+ label="更多 >>"
+ name="more_btn"
+ tool_tip="高级选项" />
+ <button
+ label="<< 较少"
+ name="less_btn"
+ tool_tip="高级选项" />
+
+
+
+ <combo_box label="分辨率" name="postcard_size_combo">
<combo_item name="640x480">
640x480
</combo_item>
@@ -31,10 +60,10 @@
当前窗口
</combo_item>
<combo_item name="Custom">
- 习惯
+ 自定义
</combo_item>
</combo_box>
- <combo_box label="决议" name="texture_size_combo">
+ <combo_box label="分辨率" name="texture_size_combo">
<combo_item name="CurrentWindow">
当前窗口
</combo_item>
@@ -48,10 +77,10 @@
大 (512x512)
</combo_item>
<combo_item name="Custom">
- 习惯
+ 自定义
</combo_item>
</combo_box>
- <combo_box label="决议" name="local_size_combo">
+ <combo_box label="分辨率" name="local_size_combo">
<combo_item name="CurrentWindow">
当前窗口
</combo_item>
@@ -74,12 +103,29 @@
1600x1200
</combo_item>
<combo_item name="Custom">
- 习惯
+ 自定义
</combo_item>
</combo_box>
+ <combo_box
+ label="格式"
+ name="local_format_combo">
+ <combo_item
+ name="PNG">
+ PNG
+ </combo_item>
+ <combo_item
+ name="JPEG">
+ JPEG
+ </combo_item>
+ <combo_item
+ name="BMP">
+ BMP
+ </combo_item>
+ </combo_box>
<spinner label="宽度" name="snapshot_width" />
<spinner label="高度" name="snapshot_height" />
- <slider label="画面质量" name="image_quality_slider" />
+ <check_box label="保持画面宽高比" name="keep_aspect_check" />
+ <slider label="图像质量" name="image_quality_slider" />
<text name="layer_type_label">
获取:
</text>
@@ -88,24 +134,23 @@
色彩
</combo_item>
<combo_item name="Depth">
- 深度
+ 景深
</combo_item>
<combo_item name="ObjectMattes">
- Object Mattes
+ 物体轮廓
</combo_item>
</combo_box>
<text name="file_size_label">
- 全屏: [SIZE]
+ 文件尺寸: [SIZE] 千字节
</text>
- <check_box label="快照中显示界面" name="ui_check" />
- <check_box label="在快照中显示" name="hud_check" />
- <check_box label="保存后保持开启" name="keep_open_check" />
- <check_box label="保持特定面貌的比率" name="keep_aspect_check" />
- <check_box label="冻结当前画面(全屏预览)" name="freeze_frame_check" />
- <button label="新的快照" name="new_snapshot_btn" />
- <check_box label="自动-快照" name="auto_snapshot_check" />
- <button label="上传 (L$10)" name="upload_btn" />
- <button label="发送" name="send_btn" />
- <button label="存储" name="save_btn" />
- <button label="放弃" name="discard_btn" />
+ <check_box label="截图中显示界面" name="ui_check" />
+ <!---->
+ <check_box label="在截图中显示显示屏附件" name="hud_check" />
+ <check_box label="保存后保持窗口开启" name="keep_open_check" />
+ <check_box label="冻结当前画面(全屏预览)" name="freeze_frame_check" />
+ <check_box label="自动截图" name="auto_snapshot_check" />
+ <text
+ name="unknown">未知</text>
+
</floater>
+<!--Translated for Second Life 1.21.0 (95157)-->
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index e5d0abf..77bb748 100644
--- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
@@ -8,21 +8,4 @@
</text>
<button label="取消" label_selected="取消" name="cancel_btn" />
<button label="上传 (L$10)" label_selected="上传 (L$10)" name="ok_btn" />
- <text name="text">
- 速率(kbps):
- </text>
- <radio_group name="bitrate">
- <radio_item name="32">
- 32
- </radio_item>
- <radio_item name="64">
- 64
- </radio_item>
- <radio_item name="96">
- 96
- </radio_item>
- <radio_item name="128">
- 128
- </radio_item>
- </radio_group>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml
index 8381e5f..8acbed2 100644
--- a/indra/newview/skins/default/xui/zh/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/zh/floater_telehub.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="闪电传送集合地">
+<floater name="telehub" title="瞬间移动枢纽">
<text name="status_text_connected">
- 闪电传运连接点和东东连接[OBJECT]
+ 连接到物体 [OBJECT] 的瞬移枢纽
</text>
<text name="status_text_not_connected">
- 没有着陆点连接
+ 没有连接到瞬移枢纽。
</text>
<text name="help_text_connected">
- 移除，请点击断开连接
+ 要移除，请点击断开连接
</text>
<text name="help_text_not_connected">
- 选择一个对象，并点击闪电传运连接点。
+ 选择一个对象，然后点击“连接瞬移枢纽”。
</text>
- <button label="连接闪电传送集合点" name="connect_btn" />
+ <button label="连接瞬移枢纽" name="connect_btn" />
<button label="断开连接" name="disconnect_btn" />
<text name="spawn_points_text">
- 着陆点 (地点, 不是东东):
+ 着陆点 (地点, 不是物体):
</text>
- <button label="Add Spawn" name="add_spawn_point_btn" />
+ <button label="添加着陆点" name="add_spawn_point_btn" />
<button label="移除着陆点" name="remove_spawn_point_btn" />
<text name="spawn_point_help">
- 选择对象东东，并点击添加至确定位置。
-接下来你可以移动或者删除该东东。
-位置和电子传送集合点的中心有关。
+ 选择目标物体，然后点击添加，来指定位置。
+接下来你可以移动或者删除该物体。
+位置是与瞬间移动枢纽的相对位置。
选择列表中的选项来显示它在世界中的位置。
</text>
</floater>
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 98c56cb..bbca686 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -3,15 +3,24 @@
<text type="string" length="1" name="Multiple">
多项
</text>
+ <string name="choose_picture">
+ 点击选择材质
+ </string>
<text type="string" length="1" name="unknown">
- 尺寸: 512 x 512
+ 尺寸: [DIMENSIONS]
</text>
+ <search_editor
+ label="在这里输入查找材质"
+ name="inventory search editor" />
<button label="默认" label_selected="默认" name="Default" />
- <button label="都不" label_selected="都不" name="None" />
+ <button label="无材质" label_selected="无材质" name="None" />
<button label="空白" label_selected="空白" name="Blank" />
<check_box label="显示文件夹" name="show_folders_check" />
<check_box label="立即应用" name="apply_immediate_check" />
<button label="" label_selected="" name="Pipette" />
<button label="取消" label_selected="取消" name="Cancel" />
<button label="选择" label_selected="选择" name="Select" />
+ <string name="pick title">
+ 选择:
+ </string>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index d62802e..ed046ad 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -1,103 +1,151 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="toolbox floater" title="">
- <button label="" label_selected="" name="button focus" />
- <text name="tool label">
- 焦点
- </text>
- <button label="" label_selected="" name="button move" />
- <text name="tool label2">
- 移动
- </text>
- <button label="" label_selected="" name="button edit" />
- <text name="tool label3">
- 编辑
- </text>
- <button label="" label_selected="" name="button create" />
- <text name="tool label4">
- 创造
- </text>
- <button label="" label_selected="" name="button land" />
- <text name="tool label5">
- 土地
- </text>
- <check_box label="Zoom" name="radio zoom" />
- <check_box label="轨道(Ctrl)" name="radio orbit" />
- <check_box label="平底(Ctrl-Shift)" name="radio pan" />
+ <button label="" label_selected="" name="button focus"
+ tool_tip="聚焦" />
+ <button label="" label_selected="" name="button move"
+ tool_tip="移动"/>
+ <button label="" label_selected="" name="button edit"
+ tool_tip="编辑" />
+ <button label="" label_selected="" name="button create"
+ tool_tip="创造"/>
+ <button label="" label_selected="" name="button land"
+ tool_tip="土地"/>
+
+<!-- Focus panel/聚焦面板 -->
+
+ <check_box label="缩放" name="radio zoom" />
+ <check_box label="环绕(Ctrl)" name="radio orbit" />
+ <check_box label="平移(Ctrl-Shift)" name="radio pan" />
+
+<!-- Move panel/移动面板 -->
+
<check_box label="移动" name="radio move" />
- <check_box label="举起(Ctrl)" name="radio lift" />
+ <check_box label="举起 (Ctrl)" name="radio lift" />
<check_box label="旋转 (Ctrl-Shift)" name="radio spin" />
+
+<!-- Edit panel/编辑面板 -->
+
<check_box label="位置" name="radio position" />
<check_box label="旋转(Ctrl)" name="radio rotate" />
<check_box label="拉伸(Ctrl-Shift)" name="radio stretch" />
<check_box label="选择材质" name="radio select face" />
- <check_box label="编辑连接部分" name="checkbox edit linked parts" />
- <check_box label="使用小方格" name="checkbox snap to grid" />
- <button label="选项..." label_selected="选项..." name="Options..." />
- <check_box label="同时拉伸两边" name="checkbox uniform" />
- <check_box label="拉伸材质" name="checkbox stretch textures" />
- <text name="text ruler mode">
- 管理员模式:
- </text>
- <text name="text status">
- 拖拽并移动, 同时按shift-拖拽复制东东
+ <check_box label="编辑连接部件" name="checkbox edit linked parts" />
+ <text
+ name="text ruler mode">
+ 标尺模式:
</text>
- <combo_box name="combobox grid mode">
- <combo_item name="World">
+ <combo_box
+ name="combobox grid mode">
+ <combo_item
+ name="World">
世界
</combo_item>
- <combo_item name="Local">
- 本地的
+ <combo_item
+ name="Local">
+ 本地
</combo_item>
- <combo_item name="Reference">
- 参考资料
+ <combo_item
+ name="Reference" >
+ 参照物
</combo_item>
</combo_box>
- <button label="" label_selected="" name="ToolCube" />
- <button label="" label_selected="" name="ToolPrism" />
- <button label="" label_selected="" name="ToolPyramid" />
- <button label="" label_selected="" name="ToolTetrahedron" />
- <button label="" label_selected="" name="ToolCylinder" />
- <button label="" label_selected="" name="ToolHemiCylinder" />
- <button label="" label_selected="" name="ToolCone" />
- <button label="" label_selected="" name="ToolHemiCone" />
- <button label="" label_selected="" name="ToolSphere" />
- <button label="" label_selected="" name="ToolHemiSphere" />
- <check_box label="复制选择" name="checkbox copy selection" />
- <button label="" label_selected="" name="ToolTorus" />
- <button label="" label_selected="" name="ToolTube" />
- <button label="" label_selected="" name="ToolRing" />
- <button label="" label_selected="" name="ToolTree" />
- <button label="" label_selected="" name="ToolGrass" />
+ <check_box label="使用网格" name="checkbox snap to grid" />
+ <button label="选项..." label_selected="选项..." name="Options..." />
+ <check_box label="同时拉伸两边" name="checkbox uniform" />
+ <check_box label="拉伸材质" name="checkbox stretch textures" />
+ <text name="text status">
+ 拖动来移动物体, 按住 Shift 拖动来复制
+ </text>
+ <button label="" label_selected="" name="ToolCube" tool_tip="立方体" />
+ <button label="" label_selected="" name="ToolPrism"
+ tool_tip="棱柱" />
+ <button label="" label_selected="" name="ToolPyramid"
+ tool_tip="棱锥" />
+ <button label="" label_selected="" name="ToolTetrahedron"
+ tool_tip="四面体" />
+ <button label="" label_selected="" name="ToolCylinder"
+ tool_tip="圆柱体" />
+ <button label="" label_selected="" name="ToolHemiCylinder"
+ tool_tip="半圆柱体" />
+ <button label="" label_selected="" name="ToolCone"
+ tool_tip="圆锥" />
+ <button label="" label_selected="" name="ToolHemiCone"
+ tool_tip="半圆锥" />
+ <button label="" label_selected="" name="ToolSphere"
+ tool_tip="球体" />
+ <button label="" label_selected="" name="ToolHemiSphere"
+ tool_tip="半球体" />
+ <button
+ name="ToolTorus"
+ tool_tip="圆环" />
+ <button
+ image_disabled="object_tube.tga"
+ image_disabled_selected="object_tube_active.tga"
+ label=""
+ label_selected=""
+ name="ToolTube"
+ tool_tip="圆管" />
+ <button
+ image_disabled="object_ring.tga"
+ image_disabled_selected="object_ring_active.tga"
+ label=""
+ label_selected=""
+ name="ToolRing"
+ tool_tip="环" />
+ <button
+ image_disabled="object_tree.tga"
+ image_disabled_selected="object_tree_active.tga"
+ label=""
+ label_selected=""
+ name="ToolTree"
+ tool_tip="树木" />
+ <button
+ image_disabled="object_grass.tga"
+ image_disabled_selected="object_grass_active.tga"
+ label=""
+ label_selected=""
+ name="ToolGrass"
+ tool_tip="草地" />
+ <check_box label="复制选择项" name="checkbox copy selection" />
<check_box label="保持选定工具" name="checkbox sticky" />
- <check_box label="复制中心" name="checkbox copy centers" />
- <check_box label="旋转复制" name="checkbox copy rotates" />
+ <check_box label="居中附件" name="checkbox copy centers" />
+ <check_box label="旋转附件" name="checkbox copy rotates" />
+
+<!-- Land panel/土地面板 -->
+
<check_box label="选择土地" name="radio select land" />
<check_box label="磨平土地" name="radio flatten" />
<check_box label="抬高土地" name="radio raise" />
- <check_box label="降低土地高度" name="radio lower" />
+ <check_box label="降低土地" name="radio lower" />
<check_box label="使土地光滑" name="radio smooth" />
<check_box label="粗糙化土地" name="radio noise" />
<check_box label="恢复土地" name="radio revert" />
<combo_box name="combobox brush size">
<combo_item name="Small">
- 小型的
+ 小
</combo_item>
<combo_item name="Medium">
- 中型的
+ 中
</combo_item>
<combo_item name="Large">
- 大型的
+ 大
</combo_item>
</combo_box>
- <button label="应用所选项目" label_selected="应用所选项目"
- name="button apply to selection" tool_tip="修饰所选土地" />
- <check_box label="显示东东主人" name="checkbox show owners" />
- <button label="多于>>" name="button more" tool_tip="高级选项" />
- <button label="<< 少于" name="button less" tool_tip="高级选项" />
+ <text type="string" name="Strength:">
+ 强度:
+ </text>
+ <button label="应用到所选项目" label_selected="应用到所选项目"
+ name="button apply to selection" tool_tip="更改所选土地" />
+ <check_box label="显示物品主人" name="checkbox show owners" />
+ <button label="更多 >>" name="button more" tool_tip="高级选项" />
+ <button label="<< 更少" name="button less" tool_tip="高级选项" />
+
+<!-- Sub-tabs/子标签页 -->
+
<tab_container name="Object Info Tabs">
- <panel label="General" name="General">
+ <panel label="一般" name="General">
<text name="Name:">
- 名字:
+ 名称:
</text>
<text name="Description:">
描述:
@@ -106,34 +154,34 @@
创造者:
</text>
<text name="Creator Name">
- 斯雷萨斯 林登
+ 斯雷萨斯·林登
</text>
<button label="档案..." label_selected="档案..." name="button creator profile" />
<text name="Owner:">
主人:
</text>
<text name="Owner Name">
- 斯雷萨斯 林登
+ 斯雷萨斯·林登
</text>
<button label="档案..." label_selected="档案..." name="button owner profile" />
<text name="Group:">
- Group:
+ 社团:
</text>
<text name="Group Name Proxy">
- 林登家族的人
+ The Lindens
</text>
- <button label="调节..." label_selected="调节..." name="button set group" />
+ <button label="设置..." label_selected="设置..." name="button set group" />
<text name="prim info">
- 1个东东, 1个古董
+ 1个物体, 1个元件
</text>
<text name="Permissions:">
- 许可证:
+ 权利:
</text>
<text name="perm_modify">
- 你可以修饰这件东东.
+ 你可以修改这件物体。
</text>
<check_box label="与社团分享" name="checkbox share with group"
- tool_tip="允许社团成员来移动，改进，复制以及删除Allow group members to move, modify, copy and delete." />
+ tool_tip="允许社团成员来移动，改进，复制以及删除" />
<text name="text deed continued">
契约...
</text>
@@ -141,99 +189,135 @@
转让
</text>
<button label="契约..." label_selected="契约..." name="button deed"
- tool_tip="社团共享的东东可被社团官员认可。" />
+ tool_tip="社团共享的物体可被社团官员认可。" />
<check_box label="允许任何人移动" name="checkbox allow everyone move" />
<check_box label="允许任何人复制" name="checkbox allow everyone copy" />
- <check_box label="代售" name="checkbox for sale" />
+ <check_box label="出售" name="checkbox for sale" />
+ <check_box
+ label="在搜索中显示"
+ name="search_check"
+ tool_tip="让别人可以在搜索结果中看到这件物体。" />
<text name="Price: L$">
价格：L$
</text>
<radio_group name="sale type">
<radio_item name="Original">
- Original
+ 原件
</radio_item>
<radio_item name="Copy">
- 复制
+ 附件
</radio_item>
<radio_item name="Contents">
- Contents
+ 内容
</radio_item>
</radio_group>
<text name="Next owner can:">
下个拥有者可以:
</text>
- <check_box label="修饰" name="checkbox next owner can modify" />
+ <check_box label="修改" name="checkbox next owner can modify" />
<check_box label="复制" name="checkbox next owner can copy" />
- <check_box label="转卖/抛弃" name="checkbox next owner can transfer" />
+ <check_box label="转卖/赠送" name="checkbox next owner can transfer" />
<text name="label click action">
当点击鼠标左键时:
</text>
<combo_box name="clickaction">
+ <!-- Do not reorder these items, the index numbers are
+ used internally. JC -->
<combo_item name="Touch/grab(default)">
- 触摸/抢走 (默认)
+ 触摸/抓取 (默认)
</combo_item>
<combo_item name="Sitonobject">
- 坐在东东上
+ 坐在物体上
</combo_item>
<combo_item name="Buyobject">
- 购买东东
+ 购买物体
</combo_item>
<combo_item name="Payobject">
- 偿付东东
+ 向物体付款
</combo_item>
<combo_item name="Open">
打开
</combo_item>
+ <combo_item name="Play">
+ 播放地块媒体
+ </combo_item>
+ <combo_item name="Opemmedia">
+ 打开地块媒体
+ </combo_item>
+
</combo_box>
+
<text name="B:">
- B:
+ 基:
</text>
<text name="O:">
- O;
+ 主:
</text>
<text name="G:">
- G:
+ 团:
</text>
<text name="E:">
- E:
+ 众:
</text>
<text name="N:">
- N:
+ 受:
</text>
<text name="F:">
- F:
- </text>
- <text name="text modify info 1">
- 你可以修饰这件东东.
- </text>
- <text name="text modify info 2">
- 你可以修饰这些东东.
- </text>
- <text name="text modify info 3">
- 你不能修饰这个东东.
- </text>
- <text name="text modify info 4">
- 你不能修饰这些东东.
- </text>
- <text name="text modify warning">
- 必须选择一个完整的对象来设置许可证
- </text>
+ 友:
+ </text>
+
+ <string name="text modify info 1">
+ 你可以修改这件物品。
+ </string>
+ <string name="text modify info 2">
+ 你可以修改这些物品。
+ </string>
+ <string name="text modify info 3">
+ 你不能修改这个物品。
+ </string>
+ <string name="text modify info 4">
+ 你不能修改这些物品。
+ </string>
+ <string name="text modify warning">
+ 必须选择一个完整的物体来设置许可。
+ </string>
+ <string name="Cost Default">
+ 价格: L$
+ </string>
+ <string
+ name="Cost Total">
+ 总价格: L$
+ </string>
+ <string name="Cost Per Unit">
+ 每个的价格: L$
+ </string>
+ <string
+ name="Cost Mixed">
+ 混合价格 <!--XXX-->
+ </string>
+ <string name="Sale Mixed">
+ 混合销售 <!--XXX-->
+ </string>
+
</panel>
- <panel label="东东" name="Object">
+
+<!-- Object sub-tab/物体子标签 -->
+
+ <panel label="物体" name="Object">
<text name="select_single">
- 只能选择一个许可来编辑参数。
+ 一次只能编辑一个元件的参数。请选择单个元件。
</text>
<text name="edit_object">
- 编辑东东参数:
+ 编辑物体参数:
</text>
<check_box label="锁定" name="checkbox locked"
- tool_tip="使东东避免被移动或删除。此项通常被使用在建筑过程中用以避免计划外的修改。" />
+ tool_tip="使物体避免被移动或删除。此项通常被使用在建造过程中用以避免意外的修改。" />
<check_box label="物理的" name="Physical Checkbox Ctrl"
- tool_tip="允许物体受重力影响。" />
+ tool_tip="允许物体被推动以及受重力影响。" />
<check_box label="暂时的" name="Temporary Checkbox Ctrl"
- tool_tip="使东东在被创建后1分钟被删除" />
+ tool_tip="使物体在被创建后 1 分钟被删除" />
<check_box label="幻影" name="Phantom Checkbox Ctrl"
- tool_tip="使东东不与其它东东或你在游戏中的化身发生冲突" />
+ tool_tip="使物体不与其它物体或化身碰撞" />
<text name="label position">
位置 (米)
</text>
@@ -269,21 +353,21 @@
木头
</combo_item>
<combo_item name="Flesh">
- 人体
+ 肉体
</combo_item>
<combo_item name="Plastic">
- 塑料的
+ 塑料
</combo_item>
<combo_item name="Rubber">
- 橡胶的
+ 橡胶
</combo_item>
</combo_box>
<text name="label basetype">
- 创建阻碍类型
+ 基础形状
</text>
<combo_box name="comboBaseType">
<combo_item name="Box">
- Box
+ 立方体
</combo_item>
<combo_item name="Cylinder">
圆柱体
@@ -298,14 +382,14 @@
圆环形
</combo_item>
<combo_item name="Tube">
- 试管形
+ 管形
</combo_item>
<combo_item name="Ring">
环形
</combo_item>
</combo_box>
<text name="text cut">
- 路径剪贴开始和结束
+ 路径截断开始和结束
</text>
<spinner label="B" name="cut begin" />
<spinner label="E" name="cut end" />
@@ -313,7 +397,7 @@
窟窿
</text>
<text name="text skew">
- 倾斜的
+ 倾斜
</text>
<text name="Hollow Shape">
窟窿的形状
@@ -323,7 +407,7 @@
默认
</combo_item>
<combo_item name="Circle">
- 圆圈
+ 圆
</combo_item>
<combo_item name="Square">
正方形
@@ -346,15 +430,15 @@
<spinner label="X" name="Taper Scale X" />
<spinner label="Y" name="Taper Scale Y" />
<text name="text topshear">
- 首要剪贴
+ 顶面倾斜
</text>
<spinner label="X" name="Shear X" />
<spinner label="Y" name="Shear Y" />
<text name="advanced_cut">
- 档案文件剪贴开始和结束
+ 剖面截断开始和结束
</text>
<text name="advanced_dimple">
- 起伏开始和结束
+ 凹陷开始和结束
</text>
<spinner label="B" name="Path Limit Begin" />
<spinner label="E" name="Path Limit End" />
@@ -364,80 +448,132 @@
<spinner label="X" name="Taper X" />
<spinner label="Y" name="Taper Y" />
<text name="text radius delta">
- 半径三角洲
+ 半径变化
</text>
<text name="text revolutions">
- 变革
- </text>
+ 旋转次数
+ </text>
+ <texture_picker
+ label="雕塑材质"
+ name="sculpt texture control"
+ tool_tip="点这里选择图片"
+ />
+ <check_box
+ label="镜像"
+ name="sculpt mirror control"
+ tool_tip="将雕塑元件沿着X轴翻转。" />
+ <check_box
+ label="里朝外"
+ name="sculpt invert control"
+ tool_tip="反转雕塑元件的法向量，使其看上去像是从里面被翻出来了一样。" />
+
+ <text
+ align="left"
+ name="label sculpt type"
+ visible="false">
+ 缝合类型
+ </text>
+ <combo_box
+ allow_text_entry="false"
+ max_chars="20"
+ name="sculpt type control"
+ visible="false">
+ <combo_item
+ name="None">
+ (无)
+ </combo_item>
+ <combo_item
+ name="Sphere">
+ 球体
+ </combo_item>
+ <combo_item
+ name="Torus">
+ 圆环
+ </combo_item>
+ <combo_item
+ name="Plane">
+ 平面
+ </combo_item>
+ <combo_item
+ name="Cylinder">
+ Cylinder
+ </combo_item>
+ </combo_box>
+
+ <!-- Features sub-tab -->
+
</panel>
- <panel label="Features" name="Features">
+ <panel label="特征" name="Features">
<text name="select_single">
- 只能选择一个许可来编辑性质。
+ 一次只能编辑一个元件的参数。请选择单个元件。
</text>
<text name="edit_object">
- 编辑东东属性:
+ 编辑物体特征:
</text>
- <check_box label="变形小路" name="Flexible1D Checkbox Ctrl"
- tool_tip="允许物体沿Z-轴活动（只在顾客方可用）" />
- <spinner label="柔软" name="FlexNumSections" />
+ <check_box label="活动路径" name="Flexible1D Checkbox Ctrl"
+ tool_tip="允许物体沿Z-轴活动（仅客户端有效）" />
+ <spinner label="柔软度" name="FlexNumSections" />
<spinner label="重力" name="FlexGravity" />
- <spinner label="拖至" name="FlexFriction" />
- <spinner label="风格" name="FlexWind" />
- <spinner label="紧张" name="FlexTension" />
+ <spinner label="阻力" name="FlexFriction" />
+ <spinner label="风力" name="FlexWind" />
+ <spinner label="应力" name="FlexTension" />
<spinner label="X方向施力" name="FlexForceX" />
<spinner label="Y方向施力" name="FlexForceY" />
<spinner label="Z方向施力" name="FlexForceZ" />
- <check_box label="光线" name="Light Checkbox Ctrl" tool_tip="使东东发射出光线" />
+
+ <check_box label="光源" name="Light Checkbox Ctrl" tool_tip="使物体发射出光线" />
<text name="label color">
颜色
</text>
<color_swatch label="" name="colorswatch" tool_tip="点击这里来打开色彩选择器" />
- <spinner label="强烈" name="Light Intensity" />
+ <spinner label="强度" name="Light Intensity" />
<spinner label="半径" name="Light Radius" />
- <spinner label="下降" name="Light Falloff" />
+ <spinner label="衰减" name="Light Falloff" />
</panel>
+
<panel label="材质" name="Texture">
- <texture_picker label="材质" name="texture control" tool_tip="点击这里来选择图片" />
+ <texture_picker label="材质" name="texture control"
+ tool_tip="点击这里来选择图片" />
<color_swatch label="颜色" name="colorswatch"
- tool_tip="点击这里来打开色彩选择器" />
+ tool_tip="打开色彩选择器" />
<text name="color trans">
透明度 %
</text>
<check_box label="最亮状态" name="checkbox fullbright" />
<text name="tex gen">
- 绘制地图
+ 材质映射
</text>
<combo_box name="combobox texgen">
<combo_item name="Default">
默认
</combo_item>
<combo_item name="Planar">
- 平坦的
+ 平面
</combo_item>
</combo_box>
<text name="label shininess">
- 亮度
+ 光泽
</text>
<combo_box name="combobox shininess">
<combo_item name="None">
- 都不
+ 无
</combo_item>
<combo_item name="Low">
低
</combo_item>
<combo_item name="Medium">
- 中型的
+ 中
</combo_item>
<combo_item name="High">
高
</combo_item>
</combo_box>
<text name="label bumpiness">
- 崎岖不平的
+ 凹凸
</text>
<combo_box name="combobox bumpiness">
<combo_item name="None">
- 都不
+ 无
</combo_item>
<combo_item name="Brightness">
亮度
@@ -485,50 +621,55 @@
石灰泥
</combo_item>
<combo_item name="suction">
- 吸力
+ 吸盘
</combo_item>
<combo_item name="weave">
编织
</combo_item>
</combo_box>
<text name="tex scale">
- 一张脸一张脸的重复
+ 每面重复次数
</text>
- <spinner label="地平线(U)" name="TexScaleU" />
- <check_box label="弹跳" name="checkbox flip s" />
- <spinner label="垂直的 (V)" name="TexScaleV" />
- <check_box label="弹跳" name="checkbox flip t" />
+ <spinner label="水平(U)" name="TexScaleU" />
+ <check_box label="翻转" name="checkbox flip s" />
+ <spinner label="垂直 (V)" name="TexScaleV" />
+ <check_box label="翻转" name="checkbox flip t" />
<text name="tex rotate">
- 旋转 (角度)
+ 旋转 (度)
</text>
- <text name="string repeats per meter">
- 一米一米的重复
+ <text
+ name="string repeats per meter">
+ 每米重复次数
</text>
- <text name="string repeats per face">
- 一张脸一张脸的重复
+ <text
+ name="string repeats per face">
+ 每面重复次数
</text>
- <text name="rpt">
- 一米一米的重复
+ <text
+ name="rpt">
+ 每米重复次数
</text>
+
<button label="应用" label_selected="应用" name="button apply" />
<text name="tex offset">
- 跳出
+ 位移
</text>
- <spinner label="地平线(U)" name="TexOffsetU" />
- <spinner label="垂直的 (V)" name="TexOffsetV" />
+ <spinner label="水平(U)" name="TexOffsetU" />
+ <spinner label="垂直(V)" name="TexOffsetV" />
<text name="textbox autofix">
- 排列媒体资源
+ 对齐媒体材质
(必须首先上传)
</text>
- <button label="排列成行" label_selected="排列成行" name="button align" />
+ <button label="对齐" label_selected="对齐" name="button align" />
</panel>
<panel label="内容" name="Contents">
<button label="新脚本..." label_selected="新脚本..." name="button new script" />
</panel>
</tab_container>
+ <!-- Land Info sub-tab -->
<panel name="land info panel">
<text name="label_area_price">
- 价格: L$[PRICE]共 [AREA]平方米.
+ 价格: L$[PRICE] 每 [AREA]平方米.
</text>
<text name="label_area">
面积: [AREA] 平方米.
@@ -542,4 +683,18 @@
<button label="关于土地..." label_selected="关于土地..."
name="button about land" />
</panel>
+ <text name="status_rotate">拖动彩带来旋转物体</text>
+ <text name="status_scale">点击并拖动来拉伸选中面</text>
+ <text name="status_move">拖动来移动物体，按住 Shift 拖动来复制</text>
+ <text name="status_modifyland">点击并拖动以修改土地</text>
+ <text name="status_camera">点击并拖动来更改视角</text>
+ <text name="status_grab">拖动以移动，按住 Ctrl 抬起，Ctrl+Shift 旋转</text>
+ <text name="status_place">在世界中点击以创建，按着 Shift 点击来选择</text>
+ <text name="status_selectland">点击并拖动以选择土地</text>
+ <text name="grid_screen_text">屏幕</text>
+ <text name="grid_local_text">本地</text>
+ <text name="grid_world_text">世界</text>
+ <text name="grid_reference_text">参考物</text>
+ <text name="grid_attachment_text">附件</text>
</floater>
+<!-- Translated for Second Life 1.19.0 (80267) -->
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index ad333a3..4230e0d 100644
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -4,47 +4,47 @@
请等待...
</text>
<scroll_list name="objects_list">
- <column label="Score" name="score" />
- <column label="Name" name="name" />
- <column label="Owner" name="owner" />
- <column label="Location" name="location" />
+ <column label="得分" name="score" />
+ <column label="名称" name="name" />
+ <column label="拥有者" name="owner" />
+ <column label="位置" name="location" />
</scroll_list>
<text name="id_text">
- 东东ID:
+ 物体 ID:
</text>
- <button label="显示灯火" name="show_beacon_btn" />
+ <button label="显示信标" name="show_beacon_btn" />
<text name="obj_name_text">
- 东东名称:
+ 物体名称:
</text>
<button label="过滤" name="filter_object_btn" />
<text name="owner_name_text">
- 主人的姓名:
+ 主人姓名:
</text>
<button label="过滤" name="filter_owner_btn" />
- <button label="归还已选东东" name="return_selected_btn" />
+ <button label="归还所选项" name="return_selected_btn" />
<button label="全部归还" name="return_all_btn" />
- <button label="无效选择" name="disable_selected_btn" />
- <button label="全部无效" name="disable_all_btn" />
- <button label="更新" name="refresh_btn" />
+ <button label="禁用所选项" name="disable_selected_btn" />
+ <button label="全部禁用" name="disable_all_btn" />
+ <button label="刷新" name="refresh_btn" />
<text name="top_scripts_title">
首要脚本
</text>
<text name="top_scripts_text">
- [COUNT]脚本占据了总时间为[TIME]毫秒
+ [COUNT] 个脚本共占用 [TIME] 毫秒
</text>
<text name="scripts_score_label">
时间
</text>
<text name="top_colliders_title">
- 首要冲击源
+ 首要碰撞源
</text>
<text name="top_colliders_text">
- 首要[COUNT]的东东存在很多潜在的冲突
+ 首要 [COUNT] 个物体存在很多潜在的冲突
</text>
<text name="colliders_score_label">
得分
</text>
<text name="none_descriptor">
- 没有找到任何目标
+ 什么也没找到
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
index 6395465..ed16075 100644
--- a/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -2,25 +2,16 @@
<floater name="modal container" title=" ">
<button label="继续" label_selected="继续" name="Continue" />
<button label="取消" label_selected="取消" name="Cancel" />
- <radio_group name="tos_agreement">
- <radio_item name="radio_disagree">
- I Disagree with the Terms of Service
- </radio_item>
- <radio_item name="radio_agree">
- I Agree to the Terms of Service
- </radio_item>
- </radio_group>
+ <check_box
+ label="我接受服务条款。"
+ name="agree_chk" />
<text name="tos_title">
- 服务条款合同
+ 服务条款协议
</text>
<text name="tos_heading">
- 登陆第二人生前请仔细阅读下列服务条款。继续登录到第二人生，
-你必须接受该合同。
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
- <text name="real_url">
- http://secondlife.com/app/tos/
+ 登陆第二人生前请仔细阅读下列服务条款。要继续登录到第二人生，
+您必须接受该协议。
</text>
+ <web_browser name="tos_html"/>
+
</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
new file mode 100644
index 0000000..4e3bcc4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="url_entry"
+ title="">
+ <text
+ name="media_label">
+ 媒体 URL:
+ </text>
+ <combo_box
+ allow_text_entry="true"
+ name="media_entry" />
+ <button
+ label="确定"
+ name="ok_btn" />
+ <button
+ label="取消"
+ name="cancel_btn" />
+ <button
+ label="清除"
+ name="clear_btn" />
+ <text
+ name="loading_label"
+ visible="false">
+ 请稍候...
+ </text>
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml b/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
new file mode 100644
index 0000000..6b6df68
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="false"
+ can_minimize="true"
+ name="floater_voice_wizard"
+ title="语音设置">
+ <tab_container
+ name="wizard_tabs"
+ hide_tabs="true"
+ top="-20"
+ right="-2"
+ tab_position="bottom">
+ <panel
+ filename="panel_voice_enable.xml"
+ right="0" />
+ <panel
+ filename="panel_voice_options.xml"
+ right="0" />
+ <panel
+ name="device_settings"
+ filename="panel_audio_device.xml"
+ right="0" />
+ </tab_container>
+ <panel
+ name="content_panel">
+ <!--<button
+ label="Help"
+ name="help_btn" />-->
+ <button
+ label="返回"
+ name="back_btn" />
+ <button
+ label="继续"
+ name="next_btn" />
+ <button
+ label="完成"
+ name="ok_btn" />
+ <button
+ label="取消"
+ name="cancel_btn" />
+ </panel>
+</floater>
+
+
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
new file mode 100644
index 0000000..fef29f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="200"
+ min_width="400"
+ name="Water Floater"
+ title="Advanced Water Editor">
+ <text
+ name="KeyFramePresetsText">
+ 水预设:
+ </text>
+ <combo_box
+ allow_text_entry="false"
+ max_chars="20"
+ name="WaterPresetsCombo" />
+ <button
+ label="新建"
+ label_selected="新建"
+ name="WaterNewPreset" />
+ <button
+ label="保存"
+ label_selected="保存"
+ name="WaterSavePreset" />
+ <button
+ label="删除"
+ label_selected="Delete"
+ name="WaterDeletePreset" />
+ <tab_container
+ name="Water Tabs"
+ tab_position="top">
+ <panel
+ label="设置"
+ name="Settings">
+ <text
+ name="BHText">
+ 水雾颜色
+ </text>
+ <button
+ label="?"
+ name="WaterFogColorHelp" />
+ <color_swatch
+ label=""
+ name="WaterFogColor"
+ tool_tip="点击打开颜色选择器" />
+ <text
+ name="WaterFogDensText">
+ 水雾浓度指数
+ </text>
+ <button
+ label="?"
+ name="WaterFogDensityHelp" />
+ <slider
+ label=""
+ name="WaterFogDensity"
+ value="1.0" />
+ <text
+ name="WaterUnderWaterFogModText">
+ 水下雾浓度修正
+ </text>
+ <text
+ name="BDensText">
+ 反射小波大小
+ </text>
+ <text
+ name="HDText">
+ 菲涅尔尺度
+ </text>
+ <button
+ label="?"
+ name="WaterFresnelScaleHelp" />
+ <slider
+ label=""
+ name="WaterFresnelScale"
+ value="1.0" />
+ <text
+ name="FresnelOffsetText">
+ 菲涅尔偏移
+ </text>
+ <button
+ label="?"
+ name="WaterFresnelOffsetHelp" />
+ <slider
+ label=""
+ name="WaterFresnelOffset"
+ value="1.0" />
+ <text
+ name="DensMultText">
+ 水上折射量
+ </text>
+ <button
+ label="?"
+ name="WaterScaleAboveHelp" />
+ <slider
+ label=""
+ name="WaterScaleAbove"
+ value="1.0" />
+ <text
+ name="WaterScaleBelowText">
+ 水下折射量
+ </text>
+ <button
+ label="?"
+ name="WaterScaleBelowHelp" />
+ <slider
+ label=""
+ name="WaterScaleBelow"
+ value="0.0" />
+ <text
+ name="MaxAltText">
+ 模糊因数
+ </text>
+ <button
+ label="?"
+ name="WaterBlurMultiplierHelp" />
+ <slider
+ label=""
+ name="WaterBlurMult"
+ value="0" />
+ </panel>
+ <panel
+ label="图像"
+ name="Waves">
+ <text
+ name="BHText">
+ 大波方向
+ </text>
+ <button
+ label="?"
+ name="WaterWave1Help" />
+ <text
+ name="WaterWave1DirXText">
+ X
+ </text>
+ <text
+ name="WaterWave1DirYText">
+ Y
+ </text>
+ <slider
+ label=""
+ name="WaterWave1DirX"
+ value="0.7" />
+ <slider
+ label=""
+ name="WaterWave1DirY"
+ value="0.7" />
+ <text
+ name="BHText2">
+ 小波方向
+ </text>
+ <button
+ label="?"
+ name="WaterWave2Help" />
+ <text
+ name="WaterWave2DirXText">
+ X
+ </text>
+ <text
+ name="WaterWave2DirYText">
+ Y
+ </text>
+ <slider
+ label=""
+ name="WaterWave2DirX"
+ value="0.7" />
+ <slider
+ label=""
+ name="WaterWave2DirY"
+ value="0.7" />
+ <text
+ name="BHText3">
+ 法向图
+ </text>
+ <button
+ label="?"
+ name="WaterNormalMapHelp" />
+ <texture_picker
+ label=""
+ name="WaterNormalMap" />
+ </panel>
+ </tab_container>
+ <string
+ name="WLDefaultWaterNames">
+ Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+ </string>
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
index 11db09a..8c8769b 100644
--- a/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
@@ -1,6 +1,6 @@
<?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="Save" />
<button label="取消" label_selected="取消" name="Cancel" />
<text type="string" length="1" name="Save item as:">
另存物品为:
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
new file mode 100644
index 0000000..69e3eb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ min_height="180"
+ min_width="400"
+ name="WindLight floater"
+ title="高级天空编辑器">
+ <text
+ name="KeyFramePresetsText">
+ 天空预设:
+ </text>
+
+ <button
+ label="新建"
+ label_selected="新建"
+ name="WLNewPreset" />
+ <button
+ label="保存"
+ label_selected="保存"
+ name="WLSavePreset" />
+ <button
+ label="删除"
+ label_selected="删除"
+ name="WLDeletePreset" />
+ <button
+ label="日夜循环编辑器"
+ label_selected="日夜循环编辑器"
+ name="WLDayCycleMenuButton" />
+ <tab_container
+ name="WindLight Tabs"
+ tab_position="top">
+ <panel
+ label="大气"
+ name="Atmosphere">
+ <text
+ name="BHText">
+ 蓝色地平
+ </text>
+ <button
+ label="?"
+ name="WLBlueHorizonHelp" />
+ <text
+ name="BHText2" width="14">
+ 红
+ </text>
+ <text
+ name="BHText3" width="14">
+ 绿
+ </text>
+ <text
+ name="BHText4" width="14">
+ 蓝
+ </text>
+ <text
+ name="BHText5" width="14">
+ 亮
+ </text>
+ <text
+ name="BDensText">
+ 云雾地平
+ </text>
+ <button
+ label="?"
+ name="WLHazeHorizonHelp" />
+ <text
+ name="BDensText2">
+ 蓝色浓度
+ </text>
+ <button
+ label="?"
+ name="WLBlueDensityHelp" />
+ <text
+ name="BHText6" width="14">
+ 红
+ </text>
+ <text
+ name="BHText7" width="14">
+ 绿
+ </text>
+ <text
+ name="BHText8" width="14">
+ 蓝
+ </text>
+ <text
+ name="BHText9" width="14">
+ 亮
+ </text>
+ <text
+ name="HDText">
+ 云雾浓度
+ </text>
+ <button
+ label="?"
+ name="WLHazeDensityHelp" />
+ <text
+ name="DensMultText">
+ 浓度乘数
+ </text>
+ <button
+ label="?"
+ name="WLDensityMultHelp" />
+ <slider
+ label=""
+ name="WLDensityMult"
+ value="1.0" />
+ <text
+ name="WLDistanceMultText">
+ 距离乘数
+ </text>
+ <button
+ label="?"
+ name="WLDistanceMultHelp" />
+ <slider
+ label=""
+ name="WLDistanceMult"
+ value="0.0" />
+ <text
+ name="MaxAltText">
+ 最大高度
+ </text>
+ <button
+ label="?"
+ name="WLMaxAltitudeHelp" />
+ <slider
+ label=""
+ name="WLMaxAltitude"
+ value="4000" />
+ </panel>
+ <panel
+ label="光照"
+ name="Lighting">
+ <text
+ name="SLCText">
+ 日月颜色
+ </text>
+ <button
+ label="?"
+ name="WLSunlightColorHelp" />
+ <text
+ name="BHText" width="14">
+ 红
+ </text>
+ <text
+ name="BHText2" width="14">
+ 绿
+ </text>
+ <text
+ name="BHText3" width="14">
+ 蓝
+ </text>
+ <text
+ name="BHText4" width="14">
+ 亮
+ </text>
+ <text
+ name="TODText">
+ 日月位置
+ </text>
+ <text
+ name="WLAmbientText">
+ 环境
+ </text>
+ <button
+ label="?"
+ name="WLAmbientHelp" />
+ <text
+ name="BHText5" width="14">
+ 红
+ </text>
+ <text
+ name="BHText6" width="14">
+ 绿
+ </text>
+ <text
+ name="BHText7" width="14">
+ 蓝
+ </text>
+ <text
+ name="BHText8" width="14">
+ 亮
+ </text>
+ <text
+ name="WLEastAngleText">
+ 东向角度
+ </text>
+ <text
+ name="SunGlowText">
+ 太阳辉光
+ </text>
+ <slider
+ label="聚焦"
+ name="WLGlowB"
+ value="1.0" />
+ <slider
+ label="尺寸"
+ name="WLGlowR"
+ value="1.0" />
+ <text
+ name="SceneGammaText">
+ 场景γ
+ </text>
+ <button
+ label="?"
+ name="WLSceneGammaHelp" />
+ <slider
+ label=""
+ name="WLGamma"
+ value="2.0" />
+ <text
+ name="WLStarText">
+ 星空亮度
+ </text>
+ </panel>
+ <panel
+ label="云层"
+ name="Clouds">
+ <text
+ name="WLCloudColorText">
+ 云层颜色
+ </text>
+ <button
+ label="?"
+ name="WLCloudColorHelp" />
+ <text
+ name="BHText" width="14">
+ 红
+ </text>
+ <text
+ name="BHText2" width="14">
+ 绿
+ </text>
+ <text
+ name="BHText3" width="14">
+ 蓝
+ </text>
+ <text
+ name="BHText4" width="14">
+ 亮
+ </text>
+ <text
+ name="WLCloudColorText2">
+ 云层 XY/密度
+ </text>
+ <text
+ name="BHText5">
+ X
+ </text>
+ <text
+ name="BHText6">
+ Y
+ </text>
+ <text
+ name="BHText7">
+ D
+ </text>
+ <text
+ name="WLCloudCoverageText">
+ 云层覆盖
+ </text>
+ <text
+ name="WLCloudScaleText">
+ 云层尺寸
+ </text>
+ <text
+ name="WLCloudDetailText">
+ 云层细节 (XY/密度)
+ </text>
+ <button
+ label="?"
+ name="WLCloudDetailHelp" />
+ <text
+ name="BHText8">
+ X
+ </text>
+ <text
+ name="BHText9">
+ Y
+ </text>
+ <text
+ name="BHText10">
+ D
+ </text>
+ <slider
+ label=""
+ name="WLCloudDetailX"
+ value="0.5" />
+ <slider
+ label=""
+ name="WLCloudDetailY"
+ value="0.5" />
+ <slider
+ label=""
+ name="WLCloudDetailDensity"
+ value="1.0" />
+ <text
+ name="WLCloudScrollXText">
+ 卷动 X
+ </text>
+ <button
+ label="?"
+ name="WLCloudScrollXHelp" />
+ <check_box
+ initial_value="false"
+ label="Lock"
+ name="WLCloudLockX" />
+ <slider
+ label=""
+ name="WLCloudScrollX"
+ value="0.0" />
+ <text
+ name="WLCloudScrollYText">
+ 卷动 Y
+ </text>
+ <check_box
+ initial_value="false"
+ label="渲染旧云层"
+ name="DrawClassicClouds" />
+ <button
+ label="?"
+ name="WLClassicCloudsHelp" />
+ </panel>
+ </tab_container>
+ <string
+ name="WLDefaultSkyNames">
+ A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
+ </string>
+</floater>
+
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 2e177e1..aa9e9a7 100644
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="worldmap" title="全部地图">
+<floater name="worldmap" title="世界地图">
<tab_container name="maptab">
- <panel label="东东" name="objects_mapview" />
+ <panel label="物体" name="objects_mapview" />
<panel label="地形" name="terrain_mapview" />
</tab_container>
<text name="land_for_sale_label">
@@ -11,15 +11,15 @@
拍卖
</text>
<text name="you_label">
- 你
+ 您
</text>
<text name="home_label">
家
</text>
<button label="回家" label_selected="回家" name="Go Home"
- tool_tip="将你的房屋闪电传运" />
+ tool_tip="瞬间移动到你的起始位置" />
<text name="classifieds_label">
- 分类目录
+ 分类广告
</text>
<check_box label=" " name="class_chk" />
<text name="person_label">
@@ -27,11 +27,11 @@
</text>
<check_box label=" " name="people_chk" />
<text name="infohub_label">
- 消息中心
+ 信息中心
</text>
<check_box label=" " name="infohub_chk" />
<text name="telehub_label">
- 闪电传送集合地
+ 瞬移枢纽
</text>
<check_box label=" " name="telehubchk" />
<text name="popular_label">
@@ -43,19 +43,19 @@
</text>
<check_box label=" " name="land_for_sale_chk" />
<text name="events_label">
- 事件或活动
+ 事件
</text>
<check_box label=" " name="event_chk" />
<text name="events_mature_label">
- 事件(M)
+ 事件(成人)
</text>
<check_box label=" " name="event_mature_chk" />
- <combo_box label="我的朋友" name="friend combo" tool_tip="Friend to Show on Map">
+ <combo_box label="在线好友" name="friend combo" tool_tip="要在地图上显示的好友">
<combo_item name="none_selected">
- 我的朋友
+ 在线好友
</combo_item>
</combo_box>
- <combo_box label="我的地标" name="landmark combo" tool_tip="Landmark to Show on Map">
+ <combo_box label="我的地标" name="landmark combo" tool_tip="要在地图上显示的地标">
<combo_item name="none_selected">
我的地标
</combo_item>
@@ -63,7 +63,7 @@
<line_editor name="location" tool_tip="键入地区的名称">
按地区名搜索
</line_editor>
- <button label="搜索" label_selected=">" name="DoSearch" tool_tip="寻找地域" />
+ <button label="搜索" label_selected=">" name="DoSearch" tool_tip="寻找地区" />
<text name="search_label">
查询结果:
</text>
@@ -74,17 +74,21 @@
<text name="location_label">
位置:
</text>
- <spinner name="spin x" tool_tip="地点的X坐标在地图中显示可见。" />
- <spinner name="spin y" tool_tip="地点的Y坐标在地图中显示可见。" />
- <spinner name="spin z" tool_tip="地点的Z坐标在地图中显示可见。" />
- <button label="闪电传送" label_selected="闪电传送" name="Teleport"
- tool_tip="闪电传输到指定地点" />
+ <spinner name="spin x" tool_tip="地图中显示地点的X坐标" />
+ <spinner name="spin y" tool_tip="地图中显示地点的Y坐标" />
+ <spinner name="spin z" tool_tip="地图中显示地点的Z坐标" />
+ <button label="瞬间移动" label_selected="瞬间移动" name="Teleport"
+ tool_tip="瞬间移动到指定地点" />
<button label="显示目的地" label_selected="显示目的地"
- name="Show Destination" tool_tip="所选地区的中心地图。" />
+ name="Show Destination" tool_tip="居中显示指定地点" />
<button label="清除" label_selected="清除" name="Clear"
tool_tip="停止追踪/跟踪" />
<button label="显示我的位置" label_selected="显示我的位置"
name="Show My Location"
- tool_tip="你的化身所在地区的中心地图。" />
- <slider label="Zoom" name="zoom slider" />
+ tool_tip="居中显示你的化身的位置" />
+ <button
+ label="复制 SLURL 到剪贴板"
+ name="copy_slurl"
+ tool_tip="将当前位置复制为 SLURL 以供网上使用" />
+ <slider label="缩放" name="zoom slider" />
</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 254a793..e7edfab 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -3,64 +3,71 @@
<menu_item_call label="购买" name="Task Buy" />
<menu_item_call label="打开" name="Task Open" />
<menu_item_call label="播放" name="Task Play" />
- <menu_item_call label="道具" name="Task Properties" />
+ <menu_item_call label="属性" name="Task Properties" />
<menu_item_call label="重命名" name="Task Rename" />
<menu_item_call label="删除" name="Task Remove" />
<menu_item_call label="清空回收站" name="Empty Trash" />
- <menu_item_call label="新的文件夹" name="New Folder" />
- <menu_item_call label="新的脚本" name="New Script" />
- <menu_item_call label="新的通知" name="New Note" />
- <menu_item_call label="新的姿势" name="New Gesture" />
+ <menu_item_call
+ label="清空失物招领" name="Empty Lost And Found"/>
+ <menu_item_call label="新建文件夹" name="New Folder" />
+ <menu_item_call label="新建脚本" name="New Script" />
+ <menu_item_call label="新建记事卡" name="New Note" />
+ <menu_item_call label="新建动作" name="New Gesture" />
<menu name="New Clothes">
- <menu_item_call label="新的衬衫" name="New Shirt" />
- <menu_item_call label="新的裤子" name="New Pants" />
- <menu_item_call label="新的鞋子" name="New Shoes" />
- <menu_item_call label="新的袜子" name="New Socks" />
- <menu_item_call label="新的夹克" name="New Jacket" />
- <menu_item_call label="新的短裙" name="New Skirt" />
- <menu_item_call label="新的手套" name="New Gloves" />
- <menu_item_call label="新的内衣" name="New Undershirt" />
- <menu_item_call label="新的内裤" name="New Underpants" />
+ <menu_item_call label="新建衬衫" name="New Shirt" />
+ <menu_item_call label="新建裤子" name="New Pants" />
+ <menu_item_call label="新建鞋子" name="New Shoes" />
+ <menu_item_call label="新建袜子" name="New Socks" />
+ <menu_item_call label="新建夹克" name="New Jacket" />
+ <menu_item_call label="新建短裙" name="New Skirt" />
+ <menu_item_call label="新建手套" name="New Gloves" />
+ <menu_item_call label="新建内衣" name="New Undershirt" />
+ <menu_item_call label="新建内裤" name="New Underpants" />
</menu>
<menu 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" />
- <menu_item_call label="新的眼睛" name="New Eyes" />
+ <menu_item_call label="新建体型" name="New Shape" />
+ <menu_item_call label="新建皮肤" name="New Skin" />
+ <menu_item_call label="新建头发" name="New Hair" />
+ <menu_item_call label="新建眼睛" name="New Eyes" />
</menu>
- <menu_item_call label="打开" name="Landmark Open" />
+ <menu_item_call label="瞬间移动" name="Landmark Open" />
<menu_item_call label="打开" name="Animation Open" />
<menu_item_call label="打开" name="Sound Open" />
- <menu_item_call label="清空物品栏" name="Purge Item" />
- <menu_item_call label="重新设置物品栏" name="Restore Item" />
+ <menu_item_call label="清除物体" name="Purge Item" />
+ <menu_item_call label="恢复物体" name="Restore Item" />
<menu_item_call label="打开" name="Open" />
- <menu_item_call label="道具" name="Properties" />
+ <menu_item_call label="属性" name="Properties" />
<menu_item_call label="重命名" name="Rename" />
<menu_item_call label="复制资产UUID" name="Copy Asset UUID" />
<menu_item_call label="复制" name="Copy" />
<menu_item_call label="粘贴" name="Paste" />
<menu_item_call label="删除" name="Delete" />
- <menu_item_call label="添加至装备" name="Add To Outfit" />
- <menu_item_call label="替换装备" name="Replace Outfit" />
- <menu_item_call label="更换物品" name="Take Off Items" />
- <menu_item_call label="IM的再现联系人联系方式存在文件夹内"
+ <menu_item_call label="添加至装束" name="Add To Outfit" />
+ <menu_item_call label="替换装束" name="Replace Outfit" />
+ <menu_item_call label="脱下物品" name="Take Off Items" />
+ <menu_item_call
+ label="开始会话"
+ name="Conference Chat Folder" />
+ <menu_item_call label="与文件夹内在线的联系人即时聊天"
name="IM Online Contacts In Folder" />
- <menu_item_call label="IM的所有联系方式存在文件夹内"
+ <menu_item_call label="与文件夹内所有联系人即时聊天"
name="IM All Contacts In Folder" />
<menu_item_call label="播放" name="Sound Play" />
- <menu_item_call label="闪电传运至地标" name="Teleport To Landmark" />
- <menu_item_call label="在全世界播放" name="Animation Play" />
+ <menu_item_call
+ label="关于地标"
+ name="Teleport To Landmark" />
+ <menu_item_call label="在世界中播放" name="Animation Play" />
<menu_item_call label="本地播放" name="Animation Audition" />
<menu_item_call label="发送即时消息" name="Send Instant Message" />
- <menu_item_call label="提供闪电传送..." name="Offer Teleport..." />
+ <menu_item_call label="邀请瞬间移动..." name="Offer Teleport..." />
<menu_item_call label="激活" name="Activate" />
<menu_item_call label="解除激活" name="Deactivate" />
- <menu_item_call label="从自己分开" name="Detach From Yourself" />
+ <menu_item_call label="从自己身上卸下" name="Detach From Yourself" />
<menu_item_call label="穿上" name="Object Wear" />
- <menu label="粘贴至" name="Attach To" />
- <menu label="粘贴至HUD" name="Attach To HUD" />
+ <menu label="装备至" name="Attach To" />
+ <menu label="装备到HUD" name="Attach To HUD" />
<menu_item_call label="穿上" name="Wearable Wear" />
<menu_item_call label="编辑" name="Wearable Edit" />
<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_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
new file mode 100644
index 0000000..a00ae90
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar
+ name="Login Menu">
+ <menu
+ label="文件"
+ name="File">
+ <menu_item_call
+ label="退出"
+ name="Quit">
+ <on_click />
+ </menu_item_call>
+ </menu>
+ <menu
+ label="编辑"
+ name="Edit">
+ <menu_item_call
+ label="首选项..."
+ name="Preferences...">
+ <on_click />
+ </menu_item_call>
+ </menu>
+ <menu
+ label="帮助"
+ name="Help">
+ <menu_item_call
+ label="第二人生帮助"
+ name="Second Life Help">
+ <on_click />
+ </menu_item_call>
+ <menu_item_call
+ label="关于第二人生..."
+ name="About Second Life...">
+ <on_click />
+ </menu_item_call>
+ </menu>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml b/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
index 2cc9788..8ead85c 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<pie_menu name="Attachment Pie">
- <menu_item_call label="下落" name="Drop" />
- <menu_item_call label="分开" name="Detach" />
+ <menu_item_call label="丢下" name="Drop" />
+ <menu_item_call label="卸下" name="Detach" />
<menu_item_call label="编辑" name="Edit" />
</pie_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml b/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
index 9b7e7f8..9e669d1 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
@@ -2,14 +2,17 @@
<pie_menu name="Avatar Pie">
<menu_item_call label="档案..." name="Profile..." />
<menu_item_call label="屏蔽" name="Avatar Mute" />
+ <!--TODO-->
<menu_item_call label="去往" name="Go To" />
- <menu_item_call label="添加朋友" name="Add Friend" />
+ <menu_item_call label="添加好友..." name="Add Friend" />
<menu_item_call label="付款..." name="Pay..." />
- <pie_menu label="多于 >" name="More >">
+ <pie_menu label="更多 >" name="More >">
<menu_item_call label="冻结..." name="Freeze..." />
- <menu_item_call label="赠送卡片" name="Give Card" />
+ <menu_item_call label="赠与名片" name="Give Card" />
+ <menu_item_call label="社团邀请..." name="Invite..." />
<menu_item_call label="驱逐..." name="Eject..." />
- <menu_item_call label="Debug..." name="Debug..." />
+ <menu_item_call label="调试..." name="Debug..." />
+ <menu_item_call label="审查" name="Object Inspect"/>
</pie_menu>
- <menu_item_call label="发送即时消息..." name="Send IM..." />
+ <menu_item_call label="发送消息..." name="Send IM..." />
</pie_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_land.xml b/indra/newview/skins/default/xui/zh/menu_pie_land.xml
index 02f215c..9e4c108 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_land.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_land.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<pie_menu name="Land Pie">
<menu_item_call label="关于土地..." name="About Land..." />
- <menu_item_call label="创造" name="Create" />
+ <menu_item_call label="创建" name="Create" />
<menu_item_call label="去这里" name="Go Here" />
<menu_item_call label="坐在这里" name="Sit Here" />
- <menu_item_call label="通过…购买" name="Land Buy Pass" />
+ <menu_item_call label="购买通行证" name="Land Buy Pass" />
<menu_item_call label="编辑地形" name="Edit Terrain" />
<menu_item_call label="购买土地..." name="Land Buy" />
</pie_menu>
+<!-- Translated for Second Life 1.19.0 (80267) -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_object.xml b/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index af33cfa..dc423ca 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_object.xml
@@ -6,15 +6,15 @@
<menu_item_call label="坐在这里" name="Object Sit" />
<menu_item_call label="拿走" name="Pie Object Take" />
<menu_item_call label="付款..." name="Pay..." />
- <pie_menu label="多于 >" name="More >">
+ <pie_menu label="更多 >" name="More >">
<menu_item_call label="删除" name="Delete" />
<menu_item_call label="穿上" name="Wear" />
<menu_item_call label="拿走副本" name="Take Copy" />
- <pie_menu label="粘贴HUD >" name="Object Attach HUD" />
- <pie_menu label="粘贴>" name="Object Attach" />
+ <pie_menu label="装上到HUD >" name="Object Attach HUD" />
+ <pie_menu label="装备到>" name="Object Attach" />
<menu_item_call label="归还..." name="Return..." />
- <pie_menu label="多于 >" name="Rate Menu">
- <menu_item_call label="报告辱骂..." name="Report Abuse..." />
+ <pie_menu label="更多 >" name="Rate Menu">
+ <menu_item_call label="报告不良行为..." name="Report Abuse..." />
<menu_item_call label="屏蔽" name="Object Mute" />
</pie_menu>
<menu_item_call label="购买..." name="Buy..." />
diff --git a/indra/newview/skins/default/xui/zh/menu_pie_self.xml b/indra/newview/skins/default/xui/zh/menu_pie_self.xml
index 2c2eb82..27e3c5b 100644
--- a/indra/newview/skins/default/xui/zh/menu_pie_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_pie_self.xml
@@ -6,15 +6,15 @@
<menu_item_call label="起身" name="Stand Up" />
<menu_item_call label="朋友..." name="Friends..." />
<menu_item_call label="动作..." name="Gestures..." />
- <pie_menu label="更换 >" name="Take Off >">
- <pie_menu label="服饰>" name="Clothes >">
+ <pie_menu label="脱下 >" name="Take Off >">
+ <pie_menu label="服饰 >" name="Clothes >">
<menu_item_call label="衬衣" name="Shirt" />
<menu_item_call label="裤子" name="Pants" />
<menu_item_call label="鞋子" name="Shoes" />
<menu_item_call label="袜子" name="Socks" />
<menu_item_call label="夹克" name="Jacket" />
<menu_item_call label="手套" name="Gloves" />
- <pie_menu label="多于 >" name="More >">
+ <pie_menu label="更多 >" name="More >">
<menu_item_call label="内衣" name="Self Undershirt" />
<menu_item_call label="所有服饰" name="All Clothes" />
<menu_item_call label="内裤" name="Self Underpants" />
@@ -22,7 +22,7 @@
<menu_item_call label="裙子" name="Skirt" />
</pie_menu>
<pie_menu label="HUD >" name="Object Detach HUD" />
- <pie_menu label="分开 >" name="Object Detach" />
+ <pie_menu label="卸下 >" name="Object Detach" />
<menu_item_call label="分开全部" name="Detach All" />
</pie_menu>
<menu_item_call label="外观..." name="Appearance..." />
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ea8610f..5186504 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu_bar name="Main Menu">
- <menu label="File" name="File">
+ <menu label="文件" name="File">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="上传图像 (L$[COST])..." name="Upload Image" />
<menu_item_call label="上传声音 (L$[COST])..." name="Upload Sound" />
@@ -8,13 +8,17 @@
<menu_item_call label="大宗文件上传(每个文件需L$[COST])..." name="Bulk Upload" />
<menu_item_separator label="-----------" name="separator" />
<menu_item_call label="关闭窗口" name="Close Window" />
+ <menu_item_call
+ label="关闭所有窗口"
+ name="Close All Windows" />
<menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="保存质地为..." name="Save Texture As..." />
+ <menu_item_call label="保存材质为..." name="Save Texture As..." />
<menu_item_separator label="-----------" name="separator3" />
<menu_item_call label="拍摄快照" name="Take Snapshot" />
- <menu_item_call label="快照存至电脑硬盘" name="Snapshot to Disk" />
+ <menu_item_call label="快照存至硬盘" name="Snapshot to Disk" />
<menu_item_separator label="-----------" name="separator4" />
- <menu label="Set Window Size" name="Set Window Size">
+ <menu_item_call label="播放/暂停保存影片到硬盘" name="Start/Stop Movie to Disk" />
+ <menu label="设置窗口大小" name="Set Window Size">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="320x240" name="320x240" />
<menu_item_call label="640x480" name="640x480" />
@@ -29,7 +33,7 @@
<menu label="编辑" name="Edit">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="撤销" name="Undo" />
- <menu_item_call label="重置" name="Redo" />
+ <menu_item_call label="重做" name="Redo" />
<menu_item_separator label="-----------" name="separator" />
<menu_item_call label="剪贴" name="Cut" />
<menu_item_call label="复制" name="Copy" />
@@ -41,11 +45,11 @@
<menu_item_call label="全选" name="Select All" />
<menu_item_call label="取消选定" name="Deselect" />
<menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="副本" name="Duplicate" />
+ <menu_item_call label="创建副本" name="Duplicate" />
<menu_item_separator label="-----------" name="separator5" />
- <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="Attach Object" />
+ <menu label="卸下物体" name="Detach Object" />
+ <menu label="脱下衣着" name="Take Off Clothing">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="衬衣" name="Shirt" />
<menu_item_call label="裤子" name="Pants" />
@@ -66,97 +70,114 @@
<menu_item_check label="朋友..." name="Friends..." />
<menu_item_call label="社团..." name="Groups..." />
<menu_item_separator label="-----------" name="separator8" />
- <menu_item_call label="参数选择..." name="Preferences..." />
+ <menu_item_call label="参数设置..." name="Preferences..." />
</menu>
- <menu label="View" name="View">
+ <menu label="查看" name="View">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="第一人称视角" name="Mouselook" />
<menu_item_check label="建造" name="Build" />
- <menu_item_call label="重新设置察看" name="Reset View" />
- <menu_item_call label="察看上一次聊天纪录" name="Look at Last Chatter" />
+ <menu_item_call label="重新设置视角" name="Reset View" />
+ <menu_item_call label="查看最后一次聊天者" name="Look at Last Chatter" />
<menu_item_separator label="-----------" name="separator" />
<menu_item_check label="工具栏" name="Toolbar" />
<menu_item_check label="聊天记录" name="Chat History" />
- <menu_item_check label="即时消息通" name="Instant Message" />
+ <menu_item_check label="即时消息" name="Instant Message" />
<menu_item_call label="库存" name="Inventory" />
+ <menu_item_check
+ label="活跃的说话人"
+ name="Active Speakers" />
<menu_item_check label="屏蔽名单" name="Mute List" />
<menu_item_separator label="-----------" name="separator2" />
- <menu_item_check label="摄像头控制参数" name="Camera Controls" />
- <menu_item_check label="运动控制" name="Movement Controls" />
- <menu_item_check label="全部地图" name="World Map" />
+ <menu_item_check label="摄像头控制" name="Camera Controls" />
+ <menu_item_check label="移动控制" name="Movement Controls" />
+ <menu_item_check label="世界地图" name="World Map" />
<menu_item_check label="迷你地图" name="Mini-Map" />
<menu_item_separator label="-----------" name="separator3" />
<menu_item_check label="统计条" name="Statistics Bar" />
- <menu_item_check label="财产清单" name="Property Lines" />
- <menu_item_check label="地主" name="Land Owners" />
+ <menu_item_check label="地块边线" name="Property Lines" />
+ <menu_item_check label="土地所有者" name="Land Owners" />
<menu_item_separator label="-----------" name="separator4" />
- <menu label="Hover Tips" name="Hover Tips">
+ <menu label="悬停提示" name="Hover Tips">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_check label="显示小贴士" name="Show Tips" />
+ <menu_item_check label="显示提示" name="Show Tips" />
<menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="土地小贴士" name="Land Tips" />
- <menu_item_check label="所有东东的小贴士" name="Tips On All Objects" />
+ <menu_item_check label="关于土地的提示" name="Land Tips" />
+ <menu_item_check label="所有物体的提示" name="Tips On All Objects" />
</menu>
<menu_item_check label="Alt键显示物理" name="Alt Shows Physical" />
- <menu_item_check label="突出明显部分" name="Highlight Transparent" />
- <menu label="Beacons" name="Beacons">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_check label="编辑东东脚本" name="Scripted Objects" />
- <menu_item_check label="物理东东" name="Physical Objects" />
- <menu_item_check label="声音资源" name="Sound Sources" />
- <menu_item_check label="质点资源" name="Particle Sources" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="隐藏微小点" name="Hide Particles" />
- </menu>
- <menu_item_check label="显示顶端显示附件" name="Show HUD Attachments" />
+ <menu_item_check label="高亮透明物体" name="Highlight Transparent" />
+ <menu_item_check label="信标" name="beacons"/>
+ <menu_item_check label="隐藏粒子" name="Hide Particles"/>
+ <menu_item_check label="显示界面附件" name="Show HUD Attachments" />
<menu_item_separator label="-----------" name="separator5" />
<menu_item_call label="缩小" name="Zoom In" />
- <menu_item_call label="缩放默认" name="Zoom Default" />
+ <menu_item_call label="默认缩放" name="Zoom Default" />
<menu_item_call label="放大" name="Zoom Out" />
<menu_item_separator label="-----------" name="separator6" />
- <menu label="More" name="More">
- <menu_item_call label="锁定全屏状态" name="Toggle Fullscreen" />
- <menu_item_call label="设置UI尺寸为默认值" name="Set UI Size to Default" />
- </menu>
+ <menu_item_call label="切换全屏状态" name="Toggle Fullscreen" />
+ <menu_item_call label="设置用户界面尺寸为默认值" name="Set UI Size to Default" />
</menu>
<menu label="世界" name="World">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="聊天" name="Chat" />
<menu_item_call label="开始动作" name="Start Gesture" />
- <menu_item_check label="允许奔跑" name="Always Run" />
+ <menu_item_check label="总是奔跑" name="Always Run" />
<menu_item_check label="飞翔" name="Fly" />
<menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="在这里传建地标" name="Create Landmark Here" />
- <menu_item_call label="在这里建家" name="Set Home to Here" />
+ <menu_item_call label="在这里创建地标" name="Create Landmark Here" />
+ <menu_item_call label="将家设置到这里" name="Set Home to Here" />
<menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="闪电传运回家" name="Teleport Home" />
+ <menu_item_call label="瞬间移动回家" name="Teleport Home" />
<menu_item_separator label="-----------" name="separator3" />
<menu_item_call label="设成离开状态" name="Set Away" />
- <menu_item_call label="设成繁忙模式" name="Set Busy" />
- <menu_item_call label="停止所有动画" name="Stop All Animations" />
+ <menu_item_call label="设成繁忙状态" name="Set Busy" />
+ <menu_item_call
+ label="释放按键"
+ name="Release Keys">
+ <on_click />
+ <on_enable />
+ </menu_item_call>
<menu_item_separator label="-----------" name="separator4" />
<menu_item_call label="帐户历史纪录..." name="Account History..." />
<menu_item_call label="管理我的帐户..." name="Manage My Account..." />
- <menu_item_call label="Buy L$..." name="Buy and Sell L$..." />
+ <menu_item_call label="购买 L$..." name="Buy and Sell L$..." />
<menu_item_separator label="-----------" name="separator5" />
<menu_item_call label="我的土地..." name="My Land..." />
<menu_item_call label="关于土地..." name="About Land..." />
<menu_item_call label="购买土地..." name="Buy Land..." />
<menu_item_call label="地区/地产..." name="Region/Estate..." />
<menu_item_separator label="-----------" name="separator6" />
- <menu label="Force Sun" name="Force Sun">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_call label="日出" name="Sunrise" />
- <menu_item_call label="中午" name="Noon" />
- <menu_item_call label="日落" name="Sunset" />
- <menu_item_call label="半夜" name="Midnight" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="恢复地区默认值" name="Revert to Region Default" />
+ <menu
+ label="环境设置"
+ name="Environment Settings">
+ <menu_item_call
+ label="日出"
+ name="Sunrise" />
+ <menu_item_call
+ label="中午"
+ name="Noon" />
+ <menu_item_call
+ label="日落"
+ name="Sunset"
+ shortcut="control|shift|N" />
+ <menu_item_call
+ label="半夜"
+ name="Midnight" />
+ <menu_item_call
+ label="恢复地区默认值"
+ name="Revert to Region Default" />
+ <menu_item_call
+ label="环境编辑器"
+ name="Environment Editor" />
+ </menu>
+
+<!-- <menu label="强制太阳位置" name="Force Sun">
</menu>
+-->
</menu>
- <menu label="Tools" name="Tools">
+ <menu label="工具" name="Tools">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu label="Select Tool" name="Select Tool">
+ <menu label="选择工具" name="Select Tool">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="焦点" name="Focus" />
<menu_item_call label="移动" name="Move" />
@@ -165,56 +186,123 @@
<menu_item_call label="土地" name="Land" />
</menu>
<menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="只选择我的东东" name="Select Only My Objects" />
- <menu_item_check label="只选择可移动的东东" name="Select Only Movable Objects" />
- <menu_item_check label="根据周围选择" name="Select By Surrounding" />
- <menu_item_check label="显示隐藏的选项" name="Show Hidden Selection" />
- <menu_item_check label="显示选项的亮圈" name="Show Light Radius for Selection" />
- <menu_item_check label="显示选择栏" name="Show Selection Beam" />
+ <menu_item_check label="只选择我的物体" name="Select Only My Objects" />
+ <menu_item_check label="只选择可移动的物体" name="Select Only Movable Objects" />
+ <menu_item_check label="选中包围区域" name="Select By Surrounding" />
+ <menu_item_check label="显示隐藏的选中项" name="Show Hidden Selection" />
+ <menu_item_check label="显示选择项的光照半径" name="Show Light Radius for Selection" />
+ <menu_item_check label="显示选择导引" name="Show Selection Beam" />
<menu_item_separator label="-----------" name="separator2" />
- <menu_item_check label="拍摄小方格快照" name="Snap to Grid" />
- <menu_item_call label="为东东XY拍摄小方格快照" name="Snap Object XY to Grid" />
- <menu_item_call label="使用小方格选项" name="Use Selection for Grid" />
- <menu_item_call label="方格选项..." name="Grid Options..." />
+ <menu_item_check label="对齐到网格" name="Snap to Grid" />
+ <menu_item_call label="在 XY 面上对齐网格" name="Snap Object XY to Grid" />
+ <menu_item_call label="以选项作为网格" name="Use Selection for Grid" />
+ <menu_item_call label="网格选项..." name="Grid Options..." />
<menu_item_separator label="-----------" name="separator3" />
+ <!--Is left uncorrected because I feel it looks nicer-->
+ <menu_item_check
+ label="编辑链接部件"
+ name="Edit Linked Parts"
+ shortcut="">
+ </menu_item_check>
<menu_item_call label="链接" name="Link" />
<menu_item_call label="解除链接" name="Unlink" />
<menu_item_separator label="-----------" name="separator4" />
+ <menu_item_call label="停止所有动画" name="Stop All Animations" />
<menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="聚焦于选择" name="Focus on Selection" />
- <menu_item_call label="按所选比例缩放" name="Zoom to Selection" />
- <menu_item_call label="购买东东" name="Menu Object Take" />
+ <menu_item_call label="聚焦于所选物体" name="Focus on Selection" />
+ <menu_item_call label="缩放到所选物体" name="Zoom to Selection" />
+ <menu_item_call label="购买物体" name="Menu Object Take" />
<menu_item_call label="拿走副本" name="Take Copy" />
- <menu_item_call label="保存东东至我的库存" name="Save Object Back to My Inventory" />
- <menu_item_call label="保存东东至东东目录" name="Save Object Back to Object Contents" />
+ <menu_item_call label="将物体存回至我的库存" name="Save Object Back to My Inventory" />
+ <menu_item_call label="将物体存回至物体内容" name="Save Object Back to Object Contents" />
<menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="显示警告/错误窗口" name="Show Script Warning/Error Window" />
- <menu_item_call label="编辑选项脚本" name="Recompile Scripts in Selection" />
- <menu_item_call label="重新设置选项中的脚本" name="Reset Scripts in Selection" />
- <menu_item_call label="设置成运行选择的脚本"
+ <menu_item_call label="显示脚本警告/错误窗口" name="Show Script Warning/Error Window" />
+ <menu label="重新编译所选项中脚本为" name="Recompile Scripts in Selection" />
+ <menu_item_call label="重置所选项中脚本" name="Reset Scripts in Selection" />
+ <menu_item_call label="设置所选项中脚本运行"
name="Set Scripts to Running in Selection" />
- <menu_item_call label="设置成不运行选择的脚本"
+ <menu_item_call label="设置所选项中脚本不运行"
name="Set Scripts to Not Running in Selection" />
+ <menu_item_separator
+ label="-----------"
+ name="separator7" />
+
+
</menu>
<menu label="帮助" name="Help">
<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
<menu_item_call label="第二人生帮助" name="Second Life Help" />
- <menu_item_call label="基础信息..." name="Knowledge Base..." />
- <menu_item_call label="演示帮助..." name="Live Help..." />
+ <!--TODO-->
+ <menu_item_call
+ label="世界中帮助"
+ name="In-World Help" />
+ <menu_item_call
+ label="教程"
+ name="Tutorial">
+ <on_click />
+ </menu_item_call>
+ <menu_item_call
+ label="额外帮助"
+ name="Additional Help" />
+<!-- <menu_item_call label="基础信息..." name="Knowledge Base..." />
+ <menu_item_call label="演示帮助..." name="Live Help..." />-->
<menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="官网林登博客..." name="Official Linden Blog..." />
+ <menu_item_call label="官方林登博客..." name="Official Linden Blog..." />
<menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="编辑向导脚本..." name="Scripting Guide..." />
- <menu_item_call label="编辑维基脚本..." name="Scripting Wiki..." />
+ <menu_item_call
+ label="脚本 Wiki 门户..."
+ name="Scripting Portal..." />
+ <!--<menu_item_call label="编辑维基脚本..." name="Scripting Wiki..." />-->
<menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="消息所属天数..." name="Message of the Day..." />
+ <!--TODO-->
+ <menu_item_call label="今日消息..." name="Message of the Day..." />
<menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="报告辱骂..." name="Report Abuse..." />
+ <menu_item_call label="报告不良行为..." name="Report Abuse..." />
<menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp; Hits..." />
+ <menu_item_call
+ label="延迟计量器"
+ name="Lag Meter" />
+ <menu
+ drop_shadow="true"
+ label="错误汇报"
+ name="Bug Reporting"
+ opaque="true"
+ tear_off="true"
+ create_jump_keys="true">
+ <!--TODO-->
+ <menu_item_call
+ label="公开 Issue Tracker..."
+ name="Public Issue Tracker...">
+ <on_click />
+ </menu_item_call>
+ <menu_item_call
+ label="公开 Issue Tracker 帮助..."
+ name="Publc Issue Tracker Help..." />
+ <menu_item_separator
+ label="-----------"
+ name="separator7" />
+ <menu_item_call
+ label="错误回报基础..."
+ name="Bug Reporting 101..." />
+ <menu_item_call
+ label="安全问题..."
+ name="Security Issues..." />
+ <menu_item_call
+ label="质量保证 Wiki..."
+ name="QA Wiki..." />
+ <menu_item_separator
+ label="-----------"
+ name="separator7" />
+ <menu_item_call
+ label="汇报错误..."
+ name="Report Bug...">
+ <on_click />
+ </menu_item_call>
+ </menu>
<menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="报告漏洞..." name="Report Bug..." />
- <menu_item_call label="释放消息..." name="Release Notes..." />
+ <menu_item_call label="发行说明..." name="Release Notes..." />
<menu_item_separator label="-----------" name="separator6" />
<menu_item_call label="关于第二人生..." name="About Second Life..." />
</menu>
</menu_bar>
+<!--Translated for Second Life 1.19.0 (79185)-->
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
new file mode 100644
index 0000000..089597d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+ <defaultlabel>
+ (未知)
+ </defaultlabel>
+ <defaultwidget>
+ 无
+ </defaultwidget>
+ <defaultimpl>
+ LLMediaImplLLMozLib
+ </defaultimpl>
+ <widgetset name="web">
+ <label name="web_label">
+ 网页内容
+ </label>
+ <tooltip name="web_tooltip">
+ 该区域有网页内容
+ </tooltip>
+ <playtip name="web_playtip">
+ 显示网页内容
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ 影片
+ </label>
+ <tooltip name="movie_tooltip">
+ 这里可以播放影片
+ </tooltip>
+ <playtip name="movie_playtip">
+ 播放影片
+ </playtip>
+ </widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ 无内容
+ </label>
+ <tooltip name="none_tooltip">
+ 这里没有媒体
+ </tooltip>
+ <playtip name="none_playtip" />
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ 图像
+ </label>
+ <tooltip name="image_tooltip">
+ 这里有图像
+ </tooltip>
+ <playtip name="image_playtip">
+ 显示该位置的图像
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ 音频
+ </label>
+ audio/*
+ <tooltip name="audio_tooltip">
+ 这里可以播放音频
+ </tooltip>
+ <playtip name="audio_playtip">
+ 播放该位置的音频
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ 实时流媒体 (RTSP)
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ - 无 -
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ - 无 -
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ 音频
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ 视频
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ 图像
+ </label>
+ </mimetype>
+ <mimetype name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ 影片 (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Javascript
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Ogg 音频/视频
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ PDF 文档
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Postscript 文档
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ 带格式化的文本 (RTF)
+ </label>
+ <widgettype>
+ image
+ </widgettype>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ 同步多媒体集成语言 (SMIL)
+ </label>
+ <widgettype>
+ movie
+ </widgettype>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ 网页 (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ <widgettype>
+ image
+ </widgettype>
+ </mimetype>
+ <mimetype name="application/x-shockwave-flash">
+ <label name="application/x-shockwave-flash_label">
+ Flash
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ 音频 (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ 音频 (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ 音频 (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ 音频 (WAV)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/bmp">
+ <label name="image/bmp_label">
+ 图像 (BMP)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/gif">
+ <label name="image/gif_label">
+ 图像 (GIF)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/jpeg">
+ <label name="image/jpeg_label">
+ 图像 (JPEG)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/png">
+ <label name="image/png_label">
+ 图像 (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ 图像 (SVG)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/tiff">
+ <label name="image/tiff_label">
+ 图像 (TIFF)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="text/html">
+ <label name="text/html_label">
+ 网页
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="text/plain">
+ <label name="text/plain_label">
+ 文本
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ <widgettype>
+ text
+ </widgettype>
+ <impl>
+ LLMediaImplLLMozLib
+ </impl>
+ </mimetype>
+ <mimetype menu="1" name="video/mpeg">
+ <label name="video/mpeg_label">
+ 影片 (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ 影片 (MP4)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/quicktime">
+ <label name="video/quicktime_label">
+ 影片 (QuickTime)
+ </label>
+ <widgettype>
+ movie
+ </widgettype>
+ <impl>
+ LLMediaImplQuickTime
+ </impl>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ 影片 (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ 影片 (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ 影片 (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/zh/notify.xml b/indra/newview/skins/default/xui/zh/notify.xml
index ad3940d..a1532a6 100644
--- a/indra/newview/skins/default/xui/zh/notify.xml
+++ b/indra/newview/skins/default/xui/zh/notify.xml
@@ -7,79 +7,89 @@
</notify>
<notify name="Cancelled">
<message name="message">
- 取消、
+ 已取消
</message>
</notify>
<notify name="CancelledSit">
<message name="message">
- 取消坐下
+ 已取消坐下
</message>
</notify>
<notify name="CancelledAttach">
<message name="message">
- 取消连接
+ 已取消装备
</message>
</notify>
<notify name="ReplacedMissingWearable">
<message name="message">
- 替换遗失的衣服/身体组成为默认状态。
+ 将遗失的衣服/身体部位替换为默认。
</message>
</notify>
<notify name="FriendOnline">
<message name="message">
- [FIRST] [LAST]在线
+ [FIRST] [LAST]上线了。
</message>
</notify>
<notify name="FriendOffline">
<message name="message">
- [FIRST] [LAST]不在线
+ [FIRST] [LAST]下线了。
+ </message>
+ </notify>
+ <notify name="AddSelfFriend" tip="true">
+ <message name="message">
+ 您无法将自己添加为好友。
</message>
</notify>
<notify name="UploadingAuctionSnapshot">
<message name="message">
- 正在上传快照至游戏内部和网页...
-(这个过程可能会持续大约1分钟.)
+ 正在向世界中和网站上传快照...
+(大概要 5 分钟)
+ </message>
+ </notify>
+ <notify name="UploadPayment" tip="false">
+ <message name="message">
+ 您为了上传付出了 L$[AMOUNT]。
</message>
</notify>
<notify name="UploadingSnapshot">
<message name="message">
- 上传快照至游戏内部...
+ 上传快照至世界中...
(这个过程可能会持续大约一分钟.)
</message>
</notify>
<notify name="UploadWebSnapshotDone">
<message name="message">
- 快照已经被上传至网页.
+ 快照已经被上传至网页。
</message>
</notify>
<notify name="UploadSnapshotDone">
<message name="message">
- 上传快照至游戏已经完成。
+ 快照已经被上传至世界中。
</message>
</notify>
<notify name="TerrainDownloaded">
<message name="message">
- Terrain.raw下载完成
+ Terrain.raw 下载完成
</message>
</notify>
<notify name="InMaxGroups">
<message name="message">
- 你加入过的社团已经达到了最大值。你将需要离开一些社团，然后你才可以创建新的社团。
+ 您加入的社团已经达到了最大值。您需要离开一个社团，然后才可以创建新的社团。
</message>
</notify>
<notify name="GestureMissing">
<message name="message">
- 动作已从数据库中遗失.
+ 动作 [NAME] 已从数据库中遗失。
</message>
</notify>
<notify name="UnableToLoadGesture">
<message name="message">
- 无法载入动作.请再尝试一次.
+ 无法载入动作 [NAME]。请再尝试一次.
</message>
</notify>
<notify name="InventoryLoaded">
<message name="message">
- Your inventory is loaded.
+ 您的库存已读取完成。
</message>
</notify>
<notify name="LandmarkMissing">
@@ -89,116 +99,124 @@
</notify>
<notify name="UnableToLoadLandmark">
<message name="message">
- 无法载入地标.请再试一次.
+ 无法载入地标。请再试一次。
</message>
</notify>
<notify name="CapsKeyOn">
<message name="message">
- 你的大写字母锁定已经开启。
-所有的这些将影响你输入的密码。你一定想要观点大写字母锁定。
+ 大写锁定处于开启状态。
+因为这会影响您键入的密码，
+也许您会想把它关掉。
</message>
</notify>
<notify name="NotecardMissing">
<message name="message">
- 注释卡从数据库中遗失.
+ 记事卡从数据库中遗失。
</message>
</notify>
<notify name="NotecardNoPermissions">
<message name="message">
- 缺乏许可证，不允许查看注释卡。
+ 缺乏许可，不能查看记事卡。
+ </message>
+ </notify>
+ <notify name="RezItemNoPermissions" tip="true">
+ <message name="message">
+ 缺乏许可，不能创建物体。
</message>
</notify>
<notify name="UnableToLoadNotecard">
<message name="message">
- 无法载入注释卡.
-请再尝试一次.
+ 无法载入记事卡。
+请再尝试一次。
</message>
</notify>
<notify name="ScriptMissing">
<message name="message">
- 脚本从数据库中遗失.
+ 脚本从数据库中遗失。
</message>
</notify>
<notify name="ScriptNoPermissions">
<message name="message">
- 缺乏许可证，不允许查看脚本.
+ 缺乏许可，不允许查看脚本。
</message>
</notify>
<notify name="UnableToLoadScript">
<message name="message">
- 无法载入脚本.请再尝试一次.
+ 无法载入脚本。请再尝试一次。
</message>
</notify>
<notify name="IncompleteInventory">
<message name="message">
- 你提供的完整内容尚不能本地有效。请在几分钟后重新提供这些内容。
+ 你提供的完整内容在本地尚不可用。请在几分钟后
+尝试重新提供这些内容。
</message>
</notify>
<notify name="CannotModifyProtectedCategories">
<message name="message">
- 你不能修改被保护的分组。
+ 你不能修改被保护的分类。
</message>
</notify>
<notify name="CannotRemoveProtectedCategories">
<message name="message">
- 你不能移除被保护的分组。
+ 你不能移除被保护的分类。
</message>
</notify>
<notify name="OfferedCard">
<message name="message">
- 你已经给[FIRST] [LAST]提供了一个通话卡。
+ 你给 [FIRST] [LAST] 提供了名片。
</message>
</notify>
<notify name="OfferedFriendship">
<message name="message">
- 你已经给[FIRST] [LAST]提供了友情卡。
+ 你邀请了 [FIRST] [LAST] 成为你的好友。
</message>
</notify>
<notify name="UnableToBuyWhileDownloading">
<message name="message">
- 无法在下载东东数据时购买.
-请再尝试一次.
+ 下载物体数据时无法购买。
+请再尝试一次。
</message>
</notify>
<notify name="UnableToLinkWhileDownloading">
<message name="message">
- 当下载东东数据时,不能连接东东.请再尝试一次.
+ 下载物体数据时无法链接。
+请再尝试一次。
</message>
</notify>
<notify name="CannotBuyObjectsFromDifferentOwners">
<message name="message">
- 无法同时从不同主人处购买东东.
-请选择单独东东并购买.
+ 无法同时从不同主人处购买物体。
+请选择单个物体。
</message>
</notify>
<notify name="ObjectNotForSale">
<message name="message">
- 东东不是待售状态.
+ 物体不像是处在出售状态。
</message>
</notify>
<notify name="EnteringGodMode">
<message name="message">
- 进入神仙模式,水平[LEVEL]
+ 进入神明模式，等级[LEVEL]
</message>
</notify>
<notify name="LeavingGodMode">
<message name="message">
- 离开神仙模式，水平[LEVEL]
+ 离开神明模式，等级[LEVEL]
</message>
</notify>
<notify name="CopyFailed">
<message name="message">
- 复制失败，因为你没有复制许可证。
+ 复制失败，因为你没有复制权利。
</message>
</notify>
<notify name="InventoryAccepted">
<message name="message">
- [NAME]已经接受了你提供的库存.
+ [NAME] 接受了你提供的物品。
</message>
</notify>
<notify name="InventoryDeclined">
<message name="message">
- [NAME]拒绝了你提供的库存.
+ [NAME] 拒绝了你提供的物品。
</message>
</notify>
<notify name="ObjectMessage">
@@ -208,24 +226,26 @@
</notify>
<notify name="CallingCardAccepted">
<message name="message">
- 你的通话卡已经被接受
+ 你的名片已经被接受
</message>
</notify>
<notify name="CallingCardDeclined">
<message name="message">
- 你的通话卡被拒绝。
+ 你的名片被拒绝。
</message>
</notify>
<notify name="TeleportToLandmark">
<message name="message">
- 现在你已经到达大陆,你可以闪电传运自己至 '[NAME]'地点，通过点击你屏幕下端右侧的库存按钮,然后选择地标文件夹.
-双击地标可以闪电传运自己到达该处.
+ 既然现在您已经到达大陆，您可以瞬间移动到例如‘[NAME]’的地方，只要点击
+屏幕右下角的库存按钮，然后选择 Landmark 文件夹。
+双击地标，然后点击瞬间移动来移动到那儿。
</message>
</notify>
<notify name="TeleportToPerson">
<message name="message">
- 现在你已经到达了大陆, 现在你可以联系居民 '[NAME]'，通过点击你屏幕下端右侧的库存按钮,然后再选择通话卡文件夹。
-双击通话卡，点击即时消息通，并键入消息.
+ 既然现在您已经到达大陆，您可以呼叫例如‘[NAME]’的居民，
+只要点击屏幕右下角的库存按钮，然后选择 Calling Cards 文件夹。
+双击名片，点击即时消息，然后键入您的消息。
</message>
</notify>
<notify name="CantSelectLandFromMultipleRegions">
@@ -240,11 +260,11 @@
</notify>
<notify name="GroupVote">
<message name="message">
- [NAME]提议投票给:
+ [NAME]提议投票讨论:
[MESSAGE]
</message>
<option name="VoteNow">
- 现在投票表决
+ 现在投票
</option>
<option name="Later">
稍后
@@ -256,7 +276,7 @@
[MESSAGE]
</message>
<option name="VoteNow">
- 现在投票表决
+ 现在投票
</option>
<option name="Later">
稍后
@@ -269,13 +289,13 @@
</notify>
<notify name="EventNotification">
<message name="message">
- Event Notification:
+ 事件提醒:
[NAME]
[DATE]
</message>
<option name="Teleport">
- 闪电传送
+ 瞬间移动
</option>
<option name="Description">
描述
@@ -286,7 +306,9 @@
</notify>
<notify name="TransferObjectsHighlighted">
<message name="message">
- 此处所有将随土地一起转让给业主的东东将由高亮条显示强调
+ 此处所有将随土地一起转让给购买者的物体已经高亮显示。
+
+* 将传送的树木和绿化不会高亮显示。
</message>
<option name="Done">
完成
@@ -294,112 +316,118 @@
</notify>
<notify name="DeactivatedGesturesTrigger">
<message name="message">
- Deactivated gestures with same trigger:
+ 取消激活了触发器相同的动作:
[NAMES]
</message>
</notify>
<notify name="InventoryNetworkCorruption">
<message name="message">
- 由于网络故障，无法载入库存信息。出现此问题的原因是网络连接性能不稳定。
+ 由于网络故障，无法载入库存信息。这意味着网络连接有问题。
</message>
</notify>
<notify name="NoQuickTime">
<message name="message">
- 苹果公司的QuickTime没有安装在你的操作系统中。如果你希望观看在游戏中播放的媒体流，则需要从以下页面下载
-QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
+ Apple 公司的 QuickTime 没有安装在你的操作系统中。如果你希望观看在支持的地块中播放的媒体流，则需要从
+QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player.
</message>
</notify>
<notify name="OwnedObjectsReturned">
<message name="message">
- 在所选土地上你所拥有的东东已经被归还至你的库存中。
+ 在所选地块上你所拥有的物体已经被归还至你的库存中。
</message>
</notify>
<notify name="OtherObjectsReturned">
<message name="message">
- 在所选的，归[FIRST] [LAST]所拥有的东东已经被归还至本人的库存中。
+ 在所选的地块上归[FIRST] [LAST]所拥有的物体
+已经被返还至其库存中。
</message>
</notify>
<notify name="OtherObjectsReturned2">
<message name="message">
- 在所选土地上归居民'[NAME]'所有的土地已经被归还至它的主人处。
+ 在所选的地块上归居民 ‘[NAME]’ 所拥有的物体
+已经被返还至其主人处。
</message>
</notify>
<notify name="GroupObjectsReturned">
<message name="message">
- 在所选土地上，由社团[GROUPNAME]分享的东东已经被归还至它们的主人的库存里。
-可交换的被转让东东已经被归还至它们先前主人处。
-不可交换的被转让东东将被删除。
+ 在所选地块上，与社团 [GROUPNAME] 分享的物体已经被归还至它们的主人的库存里。
+可转让的转让到社团的物体已经被归还至它们先前主人处。
+不可转让的转让到社团的物体已经删除。
</message>
</notify>
<notify name="UnOwnedObjectsReturned">
<message name="message">
- 在这块土地上，不属于你的东东已经被归还至它们的主人处。
+ 在选择的地块上，*不*属于你的物体已经被归还至它们的主人处。
</message>
</notify>
<notify name="NotSafe">
<message name="message">
- 这块土地有危险因素 ('不安全').
-你在这里可能会受伤。如果你死了，你将会被闪电传运自你自己家的位置。
+ 这块土地打开了伤害选项 (‘不安全’).
+您在这里可能会受伤。如果您死了，您将会被瞬间移动至您的家位置。
</message>
</notify>
<notify name="NoFly">
<message name="message">
- 在这块土地上起飞无效('不能飞行').
-你在这里不能飞行.
+ 这块土地关闭了飞行 (‘不能飞行’).
+您不能在这里飞行。
</message>
</notify>
<notify name="PushRestricted">
<message name="message">
- 这块土地是'限制11推动东东'.
-你不能推动这里的任何东东，除非你是这里的主人.
+ 这块土地 ‘不允许推动’。
+您不能推动这里的任何物体，除非您拥有这块土地。
+ </message>
+ </notify>
+ <notify name="NoVoice" tip="false" unique="true">
+ <message name="message">
+ 这块土地禁用了语音。
</message>
</notify>
<notify name="NoBuild">
<message name="message">
- 这块土地上无法建造('不能建造').
-你不能在此建造东东。.
+ 这块土地上关闭了建造 (‘不能建造’).
+您不能在此创建物体。
</message>
</notify>
<notify name="ScriptsStopped">
<message name="message">
- 游戏管理员暂时停止了该地区的脚本运行。
+ 管理员暂时停止了该地区的脚本运行。
</message>
</notify>
<notify name="ScriptsNotRunning">
<message name="message">
- 这个区域内没有运行任何脚本文件。
+ 该地区没有运行任何脚本。
</message>
</notify>
<notify name="NoOutsideScripts">
<message name="message">
- 在这块土地上外部脚本无效
-('没有外部脚本').
-除了属于土地主人的脚本，任何外部脚本在这里都无法运行.
+ 这块土地关闭了外部脚本 (‘没有外部脚本’)。
+除了属于土地主人的脚本，任何脚本在这里都不会运行。
</message>
</notify>
<notify name="ApproveURL">
<message name="message">
- 这件东东想在自己表面展示如下网页:
+ 这件物体希望在它的表面显示网页:
[URL]
</message>
<option name="LoadPage">
载入页面
</option>
<option name="Don'tLoad">
- 避免载入
+ 不要载入
</option>
</notify>
<notify name="ClaimPublicLand">
<message name="message">
- 只能要求在你所在区域的公共土地上。
+ 只能对您所在的公共土地上申请产权。
</message>
</notify>
<notify name="ObjectGiveItem">
<message name="message">
- 主人为[FIRST] [LAST]的东东[OBJECTFROMNAME] 赠与你了名为 '[OBJECTNAME]'的 [OBJECTTYPE].
+ [FIRST] [LAST] 拥有的物体 [OBJECTFROMNAME] 赠与您了名为 ‘[OBJECTNAME]’ 的[OBJECTTYPE]。
</message>
<option name="Keep">
- 保持
+ 保留
</option>
<option name="Discard">
放弃
@@ -410,10 +438,10 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
</notify>
<notify name="ObjectGiveItemUnknownUser">
<message name="message">
- 主人为(未知用户)的东东[OBJECTFROMNAME] 赠与你了名为 '[OBJECTNAME]'的 [OBJECTTYPE].
+ (某位未知用户) 拥有的物体 [OBJECTFROMNAME] 赠与您了名为 ‘[OBJECTNAME]’ 的[OBJECTTYPE]。
</message>
<option name="Keep">
- 保持
+ 保留
</option>
<option name="Discard">
放弃
@@ -424,10 +452,10 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
</notify>
<notify name="UserGiveItem">
<message name="message">
- [NAME]赠送给你了一件[OBJECTTYPE]名为'[OBJECTNAME]'.
+ [NAME] 给了您一件名为 ‘[OBJECTNAME]’ 的[OBJECTTYPE]。
</message>
<option name="Keep">
- 保持
+ 保留
</option>
<option name="Discard">
放弃
@@ -452,10 +480,13 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
<option name="Decline">
谢绝
</option>
+ <option name="Info">
+ 信息
+ </option>
</notify>
<notify name="JoinGroupOfficerNoFee">
<message name="message">
- [NAME]已经邀请你加入他们的社团，并成为社团官员。
+ [NAME]已经邀请您加入他们的社团，并成为社团官员。
加入这个社团无需交纳任何费用。
[MESSAGE]
@@ -466,11 +497,14 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
<option name="Decline">
谢绝
</option>
+ <option name="Info">
+ 信息
+ </option>
</notify>
<notify name="JoinGroupMember">
<message name="message">
- [NAME]已经邀请你加入他们的社团成为会员。
-要加入这个社团, 你付要交纳注册费L$[COST]
+ [NAME]已经邀请您加入他们的社团成为会员。
+要加入这个社团，您需要交纳注册费L$[COST]。
[MESSAGE]
</message>
@@ -480,6 +514,9 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
<option name="Decline">
谢绝
</option>
+ <option name="Info">
+ 信息
+ </option>
</notify>
<notify name="JoinGroupMemberNoFee">
<message name="message">
@@ -494,16 +531,18 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
<option name="Decline">
谢绝
</option>
+ <option name="Info">
+ 信息
+ </option>
</notify>
<notify name="OfferTeleport">
<message name="message">
- [NAME] has offered to teleport you
-to his or her location:
+ [NAME] 邀请您瞬间移动到他/她的位置:
[MESSAGE]
</message>
<option name="Teleport">
- 闪电传送
+ 瞬间移动
</option>
<option name="Cancel">
取消
@@ -523,9 +562,23 @@ to his or her location:
</notify>
<notify name="OfferFriendship">
<message name="message">
- [NAME]正在发送好友邀请.
-
-你可以通过地图追踪彼此，并将收到好友在线状态更新。
+ [NAME] 邀请您成为好友。
+
+[MESSAGE]
+
+(默认状态下，你们将可以互相看到对方的在线状况。)
+ </message>
+ <option name="Accept">
+ 接受
+ </option>
+ <option name="Decline">
+ 谢绝
+ </option>
+ </notify>
+ <notify name="OfferFriendshipNoMessage">
+ <message name="message">
+ [NAME] 邀请您成为好友。
+(默认状态下，你们将可以互相看到对方的在线状况。)
</message>
<option name="Accept">
接受
@@ -536,17 +589,17 @@ to his or her location:
</notify>
<notify name="FriendshipAccepted">
<message name="message">
- [NAME]已经接受了你发送的好友邀请.
+ [NAME] 接受了您的好友邀请。
</message>
</notify>
<notify name="FriendshipDeclined">
<message name="message">
- [NAME]拒绝了你发送的好友邀请.
+ [NAME] 谢绝了您的好友邀请。
</message>
</notify>
<notify name="OfferCallingCard">
<message name="message">
- [FIRST] [LAST]正提供他们的通话卡。这将在你的库存中添加一个书签，这样你就可以快速的通过即时消息联系着为居民。
+ [FIRST] [LAST] 要给你他的通话卡。这将在你的库存中添加一个书签，这样你就可以快速的通过即时消息联系这位居民。
</message>
<option name="Accept">
接受
@@ -557,14 +610,14 @@ to his or her location:
</notify>
<notify name="RegionRestartMinutes">
<message name="message">
- 区域将在 [MINUTES]分钟后重启。
-如果仍留在此区域内将会退出游戏.
+ 地区将在 [MINUTES]分钟后重新启动。
+如果仍留在此地区内，您将会被登出。
</message>
</notify>
<notify name="RegionRestartSeconds">
<message name="message">
- 区域将在 [MINUTES]秒后重启。
-如果仍留在此区域内将会退出游戏.
+ 区域将在 [MINUTES]秒后重新启动。
+如果仍留在此地区内，您将会被登出。
</message>
</notify>
<notify name="LoadWebPage">
@@ -573,10 +626,10 @@ to his or her location:
[MESSAGE]
-来自东东: [OBJECTNAME],主人 : [NAME]?
+来自物体: [OBJECTNAME], 主人: [NAME]?
</message>
<option name="Gotopage">
- 回主页
+ 打开网页
</option>
<option name="Cancel">
取消
@@ -584,98 +637,142 @@ to his or her location:
</notify>
<notify name="FailedToLoadWearableUnnamed">
<message name="message">
- 载入[TYPE]失败.
-请注明您从哪位卖主处购得此项物品。
+ 哎呀！
+您刚刚尝试穿上的 [TYPE] 没能够加载。
+
+别紧张。
+稍微等一下再试一次，看看事情会不会好一些。
</message>
</notify>
<notify name="FailedToLoadWearable">
<message name="message">
- 载入名为[DESC]的[TYPE]失败.
-请注明你从哪位卖主处购得此项物品。
+ 哎呀！
+您刚刚尝试穿上的叫做 [NAME] 的 [TYPE] 没能够加载。
+
+别紧张。
+稍微等一下再试一次，看看事情会不会好一些。
</message>
</notify>
<notify name="FailedToFindWearableUnnamed">
<message name="message">
- 在数据库中查找[TYPE]失败。
+ 在数据库中没能找到[TYPE]。
</message>
</notify>
<notify name="FailedToFindWearable">
<message name="message">
- 在数据库中查找名为[DESC]的[TYPE]失败。
+ 在数据库中没能找到名为 [DESC] 的[TYPE]。
</message>
</notify>
+ <!--a script want to... / 脚本想要... -->
<notify name="ScriptTakeMoney">
<message name="message">
- Take Linden dollars (L$) from you
+ 从您那里取走林登币(L$)
</message>
</notify>
<notify name="ActOnControlInputs">
<message name="message">
- 执行你输入的命令
+ 对您的控制输入做出反应
</message>
</notify>
<notify name="RemapControlInputs">
<message name="message">
- 重新布置你的控制按钮
+ 重新布置你的控制按键
</message>
</notify>
<notify name="AnimateYourAvatar">
<message name="message">
- Animate your avatar
+ 在您的化身上播放动画
</message>
</notify>
<notify name="AttachToYourAvatar">
<message name="message">
- 和你的化身绑定起来
+ 装备到您的身上
</message>
</notify>
<notify name="ReleaseOwnership">
<message name="message">
- 放弃主人权利并重新成为百姓
+ 放弃主人权利并成为公众物品
</message>
</notify>
<notify name="LinkAndDelink">
<message name="message">
- 建立或取消和该东东的连接
+ 建立或解除与其他物品的链接
</message>
</notify>
<notify name="AddAndRemoveJoints">
<message name="message">
- 添加或移走两个东东之间的连接点
+ 添加或移除与其他物体之间的连接点
</message>
</notify>
<notify name="ChangePermissions">
<message name="message">
- 更改此处的许可证
+ 更改其许可权利
</message>
</notify>
<notify name="TrackYourCamera">
<message name="message">
- 追踪你的摄像头
+ 追踪您的视角
</message>
</notify>
<notify name="ControlYourCamera">
<message name="message">
- 调节你的摄像头
+ 控制您的视角
</message>
</notify>
<notify name="ScriptQuestion">
<message name="message">
- '[OBJECTNAME]', an object owned by '[NAME]', would like to:
+ ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想要:
[QUESTIONS]
-Is this OK?
+这样可以吗?
</message>
<option name="Yes">
- 是
+ 允许
</option>
<option name="No">
- 否
+ 拒绝
+ </option>
+ <option name="Mute">
+ 屏蔽
+ </option>
+ </notify>
+ <notify name="ScriptQuestionCautionChatGranted" tip="false">
+ <message name="message">
+ ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, 位于 [REGIONNAME] 地区 [REGIONPOS], 已被授予以下权利: [PERMISSIONS]。
+ </message>
+ </notify>
+ <notify name="ScriptQuestionCautionChatDenied" tip="false">
+ <message name="message">
+ ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, 位于 [REGIONNAME] 地区 [REGIONPOS], 已被拒绝以下权利: [PERMISSIONS]。
+ </message>
+ </notify>
+ <notify name="ScriptQuestionCautionWarn" tip="false">
+ <message name="message">
+ 有物体希望您允许它从您的帐户中提取林登币(L$)。
+ </message>
+ </notify>
+ <notify caution="true" name="ScriptQuestionCaution" tip="false">
+ <message name="message">
+ ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想要:
+
+[QUESTIONS]
+如果您不信任该物体和它的创建者，您应该拒绝这请求。点击细节按钮察看详细资料。
+
+是否授予许可？
+ </message>
+ <option name="Grant">
+ 授予
+ </option>
+ <option default="true" name="Deny">
+ 谢绝
+ </option>
+ <option name="Details">
+ 细节...
</option>
</notify>
<notify name="ScriptDialog">
<message name="message">
- [FIRST] [LAST]'s '[TITLE]'
+ [FIRST] [LAST] 的 ‘[TITLE]’
[MESSAGE]
</message>
<option name="Ignore">
@@ -684,7 +781,7 @@ Is this OK?
</notify>
<notify name="ScriptDialogGroup">
<message name="message">
- [GROUPNAME]'s '[TITLE]'
+ [GROUPNAME] 的 ‘[TITLE]’
[MESSAGE]
</message>
<option name="Ignore">
@@ -693,86 +790,259 @@ Is this OK?
</notify>
<notify name="FirstBalanceIncrease">
<message name="message">
- You just received L$[AMOUNT].
-Objects and other users may give you L$.
-Your balance is shown in the
-upper-right corner of the screen.
+ 您刚收到了 L$[AMOUNT]。
+物体和其他用户可以向您支付L$。
+您的帐户余额显示在屏幕的右上角。
</message>
</notify>
<notify name="FirstBalanceDecrease">
<message name="message">
- 你刚支付了 L$[AMOUNT].
-你的帐户结余在屏幕的右上角显示。
+ 您刚支付了 L$[AMOUNT]。
+您的帐户余额显示在屏幕的右上角。
</message>
</notify>
<notify name="FirstSit">
<message name="message">
- 你正在坐着.
-使用方向键(或者AWSD)来改变视角.
-点击'站起来'按钮起身。
+ 您正在坐着。
+使用方向键 (或者AWSD) 来改变视角。
+点击 ‘站起来’ 按钮起身。
</message>
</notify>
<notify name="FirstMap">
<message name="message">
- 点击并拖拉地图以查看地图全景.
-双击该地址，可以闪电传运至该处.
-使用右边的控制键查找信息，并显示不同的背景.
+ 点击并拖动地图以查看全景。
+双击以瞬间移动。
+使用右边的控件查找信息，并显示不同的背景.
</message>
</notify>
<notify name="FirstBuild">
<message name="message">
- 你可以在[SECOND_LIFE]中的某些区域内创建新东东。
-使用左上角的工具创建新东东，并按住Ctrl或者Alt键以迅速的更改工具。
-按Esc键停止创建东东。
+ 您可以在 [SECOND_LIFE] 的某些区域中创建新物体。
+使用左上角的工具建造，也试一试按下 Ctrl 或者 Alt 键快速地切换工具。
+按 Esc 键停止建造。
</message>
</notify>
<notify name="FirstLeftClickNoHit">
<message name="message">
- 点击左键会和一些特殊东东相互干扰。
-如果鼠标箭头指向手, 你可能被东东干扰。
-点击右键显示菜单。
+ 点击左键可以与特殊的物体互动。
+如果鼠标指针成为手型，您就可以与该物体互动。
+点击右键总是会显示您可以做的事的菜单。
</message>
</notify>
<notify name="FirstTeleport">
<message name="message">
- 你刚刚进行了闪电传运.
-
-你现在在离你目的地最近的信息结点上。你的目的地由一个红亮点标出。
+这个地区不允许点对点瞬间移动，所以您被移动到了最近的瞬移枢纽上。
+您的目的地由一个高的信标标出。
+跟着红色箭头前往信标位置，或者点击箭头关闭信标。
</message>
</notify>
<notify name="FirstOverrideKeys">
<message name="message">
- Your movement keys are now being handled by an object.
-Try the arrow keys or AWSD to see what they do.
-Some objects (like guns) require you to go into mouselook to use them.
-Press 'M' to do this.
+ 您的动作控制按键现在被一件物体控制。
+尝试一下箭头键或 AWSD 看看它们的作用。
+某些物体 (例如枪) 需要您进入鼠标视角才能使用。
+按 ‘M’ 键进入鼠标视角。
</message>
</notify>
<notify name="FirstAppearance">
<message name="message">
- 你正在编辑你的外表。要旋转并放大查看，请使用箭头键。当你结束的时候，点击 '全部保存'按钮，来保存你的外形并退出。你可以尽你喜欢的频繁编辑你的外形，
+ 您正在编辑您的外观。要旋转或者缩放视角，使用箭头键。编辑完了的时候，点击 ‘全部保存’ 按钮，来保存您的外观并退出。您在任何时候都可以随意编辑外观。
</message>
</notify>
<notify name="FirstInventory">
<message name="message">
- 这是你的库存, 包含东东, 注释卡, 服饰, 和其他你所拥有的东东.
-* 要穿上衣服或者启用装备, 拖拽对象至身体.
-* 要把对象带入游戏世界, 拖拽对象至地面.
-* 要阅读注释卡, 双击注释卡.
+ 这是您的库存，是存放物体、记事卡、衣服和您拥有的其他东西的地方。
+* 要穿上物体或装备文件夹，将它拖动到您自己身上。
+* 要将物体带入世界中，将它拖动到地上。
+* 要阅读记事卡，双击它。
</message>
</notify>
<notify name="FirstSandbox">
<message name="message">
这是一块沙盒区域。
-在这里创建的东东将在其离开这里后被删除，且此区域将每[HOURS]小时抹去一次所创建东东，始于太平洋时间早上[TIME].
+在这里创建的物体在您离开后可能会删除。沙盒区域会被定期清空，请参照屏幕上方区域名称旁边的信息。
沙盒区域并不常见, 并会有特殊标识标出。
</message>
</notify>
<notify name="FirstFlexible">
<message name="message">
- 这个东东是活动的.
-活动的东东可能不具备物理特质，并一定是幻影，除非活动性选择栏没有被选定。
+ 该物体是活动的。
+活动物体不能同时为物理的，并且必须为幻影，除非取消其活动性。
+ </message>
+ </notify>
+ <notify name="FirstDebugMenus" tip="false">
+ <message name="message">
+ 您已启用了高级菜单。
+该菜单包含对调试第二人生的开发者有用的功能。
+要切换该菜单，在 Windows 中按 Ctrl-Alt-D. 在 Mac 中按 Cmd-Opt-Shift-D.
+ </message>
+ </notify>
+ <notify name="FirstSculptedPrim" tip="false">
+ <message name="message">
+ 您正在编辑 sculpted 元件。
+Sculpted 元件需要特殊的材质来指定其形状。
+您可以在库存库中找到示范 sculpted 材质。
+ </message>
+ </notify>
+ <notify name="FirstMedia" tip="false">
+ <message name="message">
+ 您已经开始播放媒体。媒体可以在参数设置的音频和视频一栏中设置为自动播放。请注意这对于您不信任的媒体站点可能会有安全隐患。
+ </message>
+ </notify>
+ <notify name="MaxListSelectMessage" tip="true">
+ <message name="message">
+ 您从该列表中最多只能选择[MAX_SELECT] 个项目。
+ </message>
+ </notify>
+ <notify name="VoiceInviteP2P" tip="false" unique="true">
+ <message name="message">
+ [NAME] 正在邀请您加入语音聊天。
+点击接受来加入对话或按谢绝来拒绝邀请。点击屏蔽来屏蔽该呼叫者。
+ </message>
+ <option name="Accept">
+ 接受
+ </option>
+ <option name="Decline">
+ 谢绝
+ </option>
+ <option name="Mute">
+ 屏蔽
+ </option>
+ </notify>
+ <notify name="AutoUnmuteByIM" tip="false">
+ <message name="message">
+ 您向 [FIRST] [LAST] 发送了一条即时消息，所以他已经被自动解除屏蔽。
+ </message>
+ </notify>
+ <notify name="AutoUnmuteByMoney" tip="false">
+ <message name="message">
+ 您向 [FIRST] [LAST] 付款，所以他已经被自动解除屏蔽。
+ </message>
+ </notify>
+ <notify name="AutoUnmuteByInventory" tip="false">
+ <message name="message">
+ 您正给与 [FIRST] [LAST] 库存物品，所以他已经被自动解除屏蔽。
+ </message>
+ </notify>
+ <notify name="VoiceInviteGroup" tip="false" unique="true">
+ <message name="message">
+ [NAME] 加入了与 [GROUP] 社团的语音聊天 .
+点击接受来加入对话或按谢绝来拒绝邀请。点击屏蔽来屏蔽该呼叫者。
+ </message>
+ <option name="Accept">
+ 接受
+ </option>
+ <option name="Decline">
+ 谢绝
+ </option>
+ <option name="Mute">
+ 屏蔽
+ </option>
+ </notify>
+ <notify name="VoiceInviteAdHoc" tip="false" unique="true">
+ <message name="message">
+ [NAME] 加入了一个语音聊天会议。
+点击接受来加入对话或按谢绝来拒绝邀请。点击屏蔽来屏蔽该呼叫者。
+ </message>
+ <option name="Accept">
+ 接受
+ </option>
+ <option name="Decline">
+ 谢绝
+ </option>
+ <option name="Mute">
+ 屏蔽
+ </option>
+ </notify>
+ <notify name="InviteAdHoc" tip="false" unique="true">
+ <message name="message">
+ [NAME] 正在邀请您加入语音聊天会议。
+点击接受来加入对话或按谢绝来拒绝邀请。点击屏蔽来屏蔽该呼叫者。
+ </message>
+ <option name="Accept">
+ 接受
+ </option>
+ <option name="Decline">
+ 谢绝
+ </option>
+ <option name="Mute">
+ 屏蔽
+ </option>
+ </notify>
+ <notify name="VoiceChannelFull" tip="true" unique="true">
+ <message name="message">
+ 您尝试加入的语音呼叫， [VOICE_CHANNEL_NAME], 已经达到最大成员数。请稍候再试。
+ </message>
+ </notify>
+ <notify name="ProximalVoiceChannelFull" tip="true" unique="true">
+ <message name="message">
+ 我们很抱歉。该区域已经达到语音交流的最大成员数。请尝试在其他区域使用语音聊天。
+ </message>
+ </notify>
+ <notify name="VoiceChannelDisconnected" tip="true" unique="true">
+ <message name="message">
+ 您已经从 [VOICE_CHANNEL_NAME] 断开连接。 您现在将会被重新连接到空间语音聊天。
+ </message>
+ </notify>
+ <notify name="VoiceChannelDisconnectedP2P" tip="true" unique="true">
+ <message name="message">
+ [VOICE_CHANNEL_NAME] 已经结束呼叫。您现在将会被重新连接到空间语音聊天。
+ </message>
+ </notify>
+ <notify name="P2PCallDeclined" tip="true" unique="true">
+ <message name="message">
+ [VOICE_CHANNEL_NAME] 谢绝了您的呼叫。您现在将会被重新连接到空间语音聊天。
+ </message>
+ </notify>
+ <notify name="P2PCallNoAnswer" tip="true" unique="true">
+ <message name="message">
+ [VOICE_CHANNEL_NAME] 暂时不能接听您的呼叫。您现在将会被重新连接到空间语音聊天。
+ </message>
+ </notify>
+ <notify name="VoiceChannelJoinFailed" tip="true" unique="true">
+ <message name="message">
+ 连接到 [VOICE_CHANNEL_NAME] 失败，请稍候再试。您现在将会被重新连接到空间语音聊天。
+ </message>
+ </notify>
+ <notify duration="10" name="VoiceLoginRetry" tip="true" unique="true">
+ <message name="message">
+ 我们正在为您创建语音聊天频道。最多会需要一分钟。
+ </message>
+ </notify>
+ <notify name="Cannot enter parcel: not a group member" tip="true">
+ <message name="message">
+ 无法进入地块，您不是合适的社团的会员。
+ </message>
+ </notify>
+ <notify name="Cannot enter parcel: banned" tip="true">
+ <message name="message">
+ 无法进入地块，您已被禁止进入。
+ </message>
+ </notify>
+ <notify name="Cannot enter parcel: not on access list" tip="true">
+ <message name="message">
+ 无法进入地块，您不在允许名单上。
+ </message>
+ </notify>
+ <notify name="VoiceNotAllowed" tip="true" unique="true">
+ <message name="message">
+ 您没有连接到 [VOICE_CHANNEL_NAME] 的语音聊天的许可。
+ </message>
+ </notify>
+ <notify name="VoiceCallGenericError" tip="true" unique="true">
+ <message name="message">
+ 尝试连接到 [VOICE_CHANNEL_NAME] 时发生错误。 请稍候再试。
+ </message>
+ </notify>
+ <notify caution="true" duration="10" name="ServerVersionChanged" tip="true">
+ <message name="message">
+ 您刚进入的区域正在运行不同的模拟器版本。点击该消息察看详细资料。
+ </message>
+ </notify>
+ <notify caution="true" name="UnableToOpenCommandURL" tip="true">
+ <message name="message">
+ 您点击的URL不能从该浏览器中打开。
</message>
</notify>
</notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_account_details.xml b/indra/newview/skins/default/xui/zh/panel_account_details.xml
deleted file mode 100644
index 2f4443a..0000000
--- a/indra/newview/skins/default/xui/zh/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Details" name="account_details_panel">
- <button label="<较早" label_selected="<较早" name="earlier_btn"
- tool_tip="时间返回" />
- <button label="延迟 >" label_selected="延迟 >" name="later_btn"
- tool_tip="时间前进" />
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_account_planning.xml b/indra/newview/skins/default/xui/zh/panel_account_planning.xml
deleted file mode 100644
index 9fb19a3..0000000
--- a/indra/newview/skins/default/xui/zh/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Planning" name="account_planning_panel" />
diff --git a/indra/newview/skins/default/xui/zh/panel_account_transactions.xml b/indra/newview/skins/default/xui/zh/panel_account_transactions.xml
deleted file mode 100644
index a169555..0000000
--- a/indra/newview/skins/default/xui/zh/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Sales/Gifts" name="account_sales_panel">
- <button label="<较早" label_selected="<较早" name="earlier_btn"
- tool_tip="时间返回" />
- <button label="延迟 >" label_selected="延迟 >" name="later_btn"
- tool_tip="时间前进" />
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_audio.xml b/indra/newview/skins/default/xui/zh/panel_audio.xml
new file mode 100644
index 0000000..f2ec305
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_audio.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ label="音量"
+ name="Media panel">
+ <check_box
+ label="静音"
+ name="disable audio" />
+
+ <slider name="System Volume"
+ label="总体" />
+ <slider name="Music Volume"
+ label="音乐" />
+ <slider
+ name="Media Volume"
+ label="媒体" />
+ <slider
+ name="Voice Volume"
+ label="语音" />
+
+ <slider
+ name="SFX Volume"
+ label="音效" />
+ <slider
+ name="Wind Volume"
+ label="环境" />
+ <slider name="UI Volume"
+ label="界面" />
+
+</panel>
+<!--Translated by Geneko Nemeth for Second Life 1.19.0 (79185)-->
diff --git a/indra/newview/skins/default/xui/zh/panel_audio_device.xml b/indra/newview/skins/default/xui/zh/panel_audio_device.xml
new file mode 100644
index 0000000..457e63f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_audio_device.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="device_settings">
+ <text
+ name="Audio Devices">
+ 音频设备
+ </text>
+
+ <text
+ name="Input device (microphone):">
+ 输入设备( 麦克风) :
+ </text>
+
+ <text
+ name="Output device (speakers):">
+ 输出设备 (扬声器):
+ </text>
+ <combo_box
+ allow_text_entry="false"
+ max_chars="128"
+ name="voice_output_device" />
+
+ <text
+ name="Input level:">
+ 输入音量
+ </text>
+
+ <text_editor
+ name="voice_intro_text1">调节滑块来控制你说的话的音量。 要测试输入音量的话，只要对着你的麦克风说话就可以了。</text_editor>
+
+ <volume_slider
+ name="mic_volume_slider"
+ tool_tip="用这个滑块调节音量。" />
+
+ <text
+ name="wait_text">
+ 请稍候
+ </text>
+
+
+ <text
+ name="default_text" >"默认"</text>
+
+ </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar.xml b/indra/newview/skins/default/xui/zh/panel_avatar.xml
index db9599e..35e12f6 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Panel Avatar">
<tab_container name="tab">
- <panel label="2nd Life" name="2nd Life">
+ <panel label="第二人生" name="2nd Life">
<text name="CaptionTextAcctInfo">
[ACCTTYPE]
[PAYMENTINFO]
+[AGEVERIFICATION]
</text>
<text name="AcctTypeResident">
居民
</text>
<text name="AcctTypeTrial">
- 试用
+ 试用者
</text>
<text name="AcctTypeCharterMember">
宪章制定委员会成员
@@ -19,38 +20,51 @@
林登实验室雇员
</text>
<text name="PaymentInfoUsed">
- 使用的支付信息
+ 支付信息已使用
</text>
<text name="PaymentInfoOnFile">
- 文件中的支付信息
+ 支付信息在案
</text>
<text name="NoPaymentInfoOnFile">
- 文件中没有新用户的支付信息
+ 无支付信息
+ </text>
+ <text
+ name="AgeVerified" >
+ 年龄已验证
+ </text>
+ <text
+ name="NotAgeVerified" >
+ 年龄未验证
</text>
<text name="Name:">
名字:
</text>
<text name="online_yes">
- 是否在线: 是
+ 当前在线
</text>
<text name="online_no">
- 是否在线: 否
+ 不在线
</text>
<text name="online_unknown">
- 是否在线: 未知
+ 在线状态未知
</text>
<text name="label">
- 天生的:
+ 出生:
</text>
<text name="label2">
账户:
</text>
<text name="partner_label"
- tool_tip="第二人生合作者. 要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
+ tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
搭档:
</text>
+ <button
+ label="i"
+ label_selected="i"
+ name="partner_info"
+ tool_tip="点击打开搭档的档案" />
<line_editor name="partner_edit"
- tool_tip="第二人生合作者. 要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
+ tool_tip="第二人生搭档。要获取更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
[FIRST] [LAST]
</line_editor>
<text name="Photo:">
@@ -70,47 +84,63 @@
(500 个字)
</text>
<text name="Give item:">
- 提供项目:
+ 给与物品:
</text>
<text name="Give inventory"
- tool_tip="将库存内的物品放于此地并给与此人。">
- 放置目录内容于此.
+ tool_tip="要把库存中的物体赠与这个人，将其拖动到这里。">
+ 放置库存物品于此。
</text>
- <check_box label="在网上公布" name="allow_publish"
- tool_tip="将你个人的简介发布到网上." />
+ <check_box label="在搜索结果中显示" name="allow_publish"
+ tool_tip="在搜索中显示额外信息，例如描述和照片。" />
<button label="?" label_selected="?" name="?" />
+ <!-- <button label="在地图中显示" label_selected="在地图中显示"
+ name="Show on Map" /> -->
<button label="在地图中显示" label_selected="在地图中显示"
- name="Show on Map" />
- <button label="提供闪电传送..." label_selected="提供闪电传送..."
+ name="Find on Map" />
+
+ <button label="邀请瞬间移动..." label_selected="邀请瞬间移动..."
name="Offer Teleport..." />
- <button label="比率..." label_selected="比率..." name="Rate..." />
+ <button
+ label="添加为好友..."
+ label_selected="添加为好友..."
+ name="Add Friend..." />
+
+ <!-- <button label="评分..." label_selected="评分..." name="Rate..." /> -->
<button label="付款..." label_selected="付款..." name="Pay..." />
<button label="即时消息..." label_selected="即时消息..."
name="Instant Message..." />
<button label="屏蔽" label_selected="屏蔽" name="Mute" />
</panel>
- <panel label="网络" name="WebProfile">
- <button label="家" label_selected="家" name="home" />
- <button label="Load" label_selected="Load" name="load"
- tool_tip="Load this profile page with embedded web browser." />
- <button label="Open..." label_selected="Open..." name="open"
- tool_tip="Open this profile page in your default external web browser." />
+ <panel label="Web" name="WebProfile">
+ <line_editor
+ is_unicode="false"
+ name="url_edit" />
+ <flyout_button
+ label="加载"
+ label_selected="加载"
+ name="load"
+ tool_tip="用内部浏览器打开这个档案页面。">
+ <flyout_button_item
+ value="open">
+ 在外部浏览器中打开</flyout_button_item>
+ <flyout_button_item
+ value="home">返回原来页面</flyout_button_item>
+ </flyout_button>
<button label="?" label_selected="?" name="web_profile_help" />
- <check_box label="Automatically load web profiles" name="auto_load"
- tool_tip="Automatically load ALL profile webpages without asking first." />
+ <check_box label="自动加载网络档案" name="auto_load"
+ tool_tip="不询问就自动加载 *所有* 网络档案。" />
<text name="status_text">
- 完成
</text>
</panel>
- <panel label="Interests" name="Interests">
+ <panel label="兴趣" name="Interests">
<text name="I Want To:">
我想要:
</text>
<check_box label="建造" name="chk0" />
- <check_box label="开荒" name="chk1" />
- <check_box label="相会" name="chk2" />
+ <check_box label="探索" name="chk1" />
+ <check_box label="聚会" name="chk2" />
<check_box label="受雇" name="chk6" />
- <check_box label="社团"" name="chk3" />
+ <check_box label="组团" name="chk3" />
<check_box label="购买" name="chk4" />
<check_box label="出售" name="chk5" />
<check_box label="雇佣" name="chk7" />
@@ -119,29 +149,29 @@
</text>
<check_box label="材质" name="schk0" />
<check_box label="建筑" name="schk1" />
- <check_box label="事件计划" name="schk2" />
+ <check_box label="计划事件" name="schk2" />
<check_box label="建模" name="schk3" />
<check_box label="编辑脚本" name="schk4" />
- <check_box label="习惯的特性" name="schk5" />
+ <check_box label="个性化人物" name="schk5" />
<text name="Languages:">
- Languages:
+ 语言:
</text>
</panel>
- <panel label="Picks" name="Picks">
+ <panel label="收藏" name="Picks">
<text name="Tell everyone about your favorite places in Second Life.">
- 告诉每个人你在第二人生中最喜欢的地点
+ 告诉大家你在第二人生中最喜欢的地点。
</text>
- <button label="新的..." label_selected="新的..." name="New..." />
+ <button label="新建..." label_selected="新建..." name="New..." />
<button label="删除..." label_selected="删除..." name="Delete..." />
</panel>
- <panel label="分类的" name="Classified">
+ <panel label="分类广告" name="Classified">
<text name="Place an ad in Second Life's classified listings.">
在第二人生的分类栏中刊登广告。
</text>
- <button label="新的..." label_selected="新的..." name="New..." />
+ <button label="新建..." label_selected="新建..." name="New..." />
<button label="删除..." label_selected="删除..." name="Delete..." />
</panel>
- <panel label="1st Life" name="1st Life">
+ <panel label="第一人生" name="1st Life">
<text name="Photo:">
照片：
</text>
@@ -153,10 +183,10 @@
(250个字)
</text>
</panel>
- <panel label="My Notes" name="My Notes">
+ <panel label="我的备注" name="My Notes">
<text name="label">
- 使用这块空间来记录你关于这个人的笔迹。 继续追踪
-交易过程, 合作的项目,等等。只有你可以看见这些笔记。
+ 使用这块空间来记录你关于这个人的笔记。 追踪交易
+进展，合作的项目，等等。只有你可以看见这些笔记。
你观察的人看不见，其他人也看不见。
</text>
</panel>
@@ -165,29 +195,30 @@
<button label="取消" label_selected="取消" name="Cancel" />
<button label="踢人" label_selected="踢人" name="Kick" />
<button label="锁定" label_selected="锁定" name="Freeze"
- tool_tip="停止此居民的现有动作并与其交谈." />
- <button label="解锁定" label_selected="解锁定" name="Unfreeze"
+ tool_tip="停止此居民的现有动作和对话。" />
+ <button label="解锁" label_selected="解锁" name="Unfreeze"
tool_tip="解除冻结的居民。" />
<button label="CSR" label_selected="CSR" name="csr_btn"
- tool_tip="对此为居民开启顾客服务工具。" />
+ tool_tip="对此位居民开启顾客服务工具。" />
<text name="ShowOnMapNonFriend">
- 在地图上显示的位置.
+ 在地图上显示位置。
由于你和它们之间没有友谊关系，所以刚才的操作无效。
</text>
<text name="ShowOnMapFriendOffline">
- 在地图上显示的位置.
+ 在地图上显示位置。
由于对方不在线，刚才的操作无效。
</text>
<text name="ShowOnMapFriendOnline">
- 在地图上显示的位置.
+ 在地图上显示位置。
</text>
<text name="TeleportGod">
- 加强闪电传运至你所在位置的效果.
+ 强制瞬间移动到你的位置。
</text>
<text name="TeleportPrelude">
- 提供一个闪电传送至你所在的位置。但当你离开方位岛时，此项功能不可用。
+ 邀请瞬间移动到你所在的位置。但当你离开方位岛时，此项功能才可用。
</text>
<text name="TeleportNormal">
- 提供一个闪电传送至你所在的位置。
+ 邀请瞬间移动到你所在的位置。
</text>
</panel>
+<!--Translated for Second Life 1.19.0 (80044)-->
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml b/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
index b9d6407..3e35524 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
@@ -3,22 +3,28 @@
<line_editor name="given_name_editor"
tool_tip="名字必须以字母或数字开始，不可用标点。" />
<line_editor name="location_editor"
- tool_tip="设置这块分类广告相对于你所在位置的位置。" />
- <button label="调节位置" name="set_location_btn" />
- <button label="闪电传送" name="classified_teleport_btn" />
- <button label="地图" name="classified_map_btn" />
+ tool_tip="设置分类广告的位置到你当前的位置。" />
+ <button label="调节位置" name="set_location_btn" width="80" left="10"/>
+ <button label="瞬间移动" name="classified_teleport_btn" width="80" left_delta="90"/>
+ <button label="在地图中显示" name="classified_map_btn" width="110" left_delta="90"/>
+
<combo_box label="" name="classified_category_combo" />
<check_box label="成人" name="classified_mature_check" />
<text name="classified_info_text"
tool_tip="你选择为你的广告付费越多, 您的广告在广告栏里出现的位置就会越高.">
- 广告位置: 暂时不能发布
+ 广告发布: 还没有发布
</text>
<text name="click_through_text" tool_tip="分类广告发布后的点击数.">
- Clicks:
+ 点击数:
</text>
- <button label="公布..." name="classified_update_btn" />
+ <button label="发布..." name="classified_update_btn" />
<check_box label="每周自动更新" name="auto_renew_check" />
<text name="ad_placed_paid">
- Ad placed: [DATE], Paid L$[AMT] for listing.
- </text>
+ 广告发布: [DATE]，为此付出了 L$[AMT]。
+ </text>
+ <text
+ name="update_txt" >更新</text>
+ <text
+ name="publish_txt" >发布...</text>
+
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml b/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
index d769eaf..dfd490e 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Pick" title="拣起">
- <button label="调节位置" name="set_location_btn" />
- <button label="闪电传送" name="pick_teleport_btn" />
- <button label="在地图中显示" name="pick_map_btn" />
+<panel name="Pick" title="收藏">
+ <button label="瞬间移动" name="pick_teleport_btn" width="80" left="10"/>
+ <button label="在地图中显示" name="pick_map_btn" width="110" left="100"/>
+ <button label="调节位置" name="set_location_btn" width="80" left="220"/>
<text name="sort_order_text">
种类:
</text>
- <check_box label="Enabled" name="enabled_check" />
+ <check_box label="启用" name="enabled_check" />
</panel>
+<!--Translated for Second Life 1.19.0 (80044)-->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
index 8bf05df..542a6b9 100644
--- a/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
@@ -1,12 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="chat_bar">
+ <button label="Local Chat" name="历史"
+ tool_tip="点击这里看周围的人刚才说了些什么" />
<button label="历史" label_selected="历史" name="History" />
- <line_editor name="Chat Editor" tool_tip="按Enter来输入语音，Ctrl-Enter 来发声" />
- <button label="说" label_selected="说" name="Say" />
- <button label="咆哮" label_selected="咆哮" name="Shout" />
+ <line_editor label="点击这里开始聊天。" name="Chat Editor"
+ tool_tip="按 Enter 来聊天，Ctrl-Enter 来喊叫" />
+ <flyout_button label="说" name="Say" tool_tip="(回车)" >
+ <flyout_button_item name="say_item">说</flyout_button_item>
+ <flyout_button_item name="shout_item">喊叫</flyout_button_item>
+ <flyout_button_item name="whisper_item">小声说</flyout_button_item>
+ </flyout_button>
<combo_box label="动作" name="Gesture">
<combo_item name="Gestures">
动作
</combo_item>
</combo_box>
+ <string name="gesture_label">
+ 动作
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_classified.xml b/indra/newview/skins/default/xui/zh/panel_classified.xml
index c03a7cc..7237948 100644
--- a/indra/newview/skins/default/xui/zh/panel_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified.xml
@@ -3,9 +3,9 @@
<line_editor name="given_name_editor"
tool_tip="名字必须以字母或数字开始，不可用标点。" />
<line_editor name="location_editor"
- tool_tip="设置这块分类广告相对于你所在位置的位置。" />
- <button label="调节" name="set_location_btn" />
- <button label="闪电传送" name="classified_teleport_btn" />
+ tool_tip="设置分类广告的位置到你当前的位置。" />
+ <button label="调节位置" name="set_location_btn" />
+ <button label="瞬间移动" name="classified_teleport_btn" />
<button label="在地图中显示" name="classified_map_btn" />
<button label="档案" name="classified_profile_btn" />
<check_box label="成人" name="classified_mature_check" />
diff --git a/indra/newview/skins/default/xui/zh/panel_event.xml b/indra/newview/skins/default/xui/zh/panel_event.xml
index 0d0f836..3d7e65e 100644
--- a/indra/newview/skins/default/xui/zh/panel_event.xml
+++ b/indra/newview/skins/default/xui/zh/panel_event.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="Event" title="事件">
<text name="event_name_label">
- 名字:
+ 名称:
</text>
<text name="event_name">
(无)
</text>
<text name="event_category_label">
- 类型：
+ 类别：
</text>
<text name="event_category">
(无)
@@ -18,6 +18,16 @@
<text name="event_mature">
(未知)
</text>
+ <text
+ name="event_mature_yes"
+ visible="false">
+ 是
+ </text>
+ <text
+ name="event_mature_no"
+ visible="false">
+ 否
+ </text>
<text name="event_date_label">
日期:
</text>
@@ -25,13 +35,13 @@
(无)
</text>
<text name="event_duration_label">
- 活动持续时间:
+ 持续时间:
</text>
<text name="event_duration">
(无)
</text>
<text name="event_runby_label">
- 运行为:
+ 组织者:
</text>
<text name="event_runby">
(无)
@@ -51,8 +61,14 @@
<text name="event_desc_label">
描述:
</text>
- <button label="闪电传送" name="teleport_btn" />
+ <button label="瞬间移动" name="teleport_btn" />
<button label="在地图中显示" name="map_btn" />
- <button label="通报" name="notify_btn" />
- <button label="创造事件..." name="create_event_btn" />
+ <button label="提醒" name="notify_btn" />
+ <button label="创建事件..." name="create_event_btn" />
+ <string name="notify">
+ 提醒
+ </string>
+ <string name="dont_notify">
+ 不要提醒
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_friends.xml b/indra/newview/skins/default/xui/zh/panel_friends.xml
new file mode 100644
index 0000000..74d29a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_friends.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+ <scroll_list name="friend_list"
+ tool_tip="点击时按住 shift 或 control 键来选择多个好友">
+ <column name="icon_online_status" tool_tip="在线状态" />
+ <column label="名字" name="friend_name" tool_tip="名称" />
+ <column name="icon_visible_online" tool_tip="好友可以看见你是否在线" />
+ <column name="icon_visible_map" tool_tip="好友可以在地图上找到你" />
+ <column name="icon_edit_mine" tool_tip="好友可以编辑你的物体" />
+ <column name="icon_edit_theirs" tool_tip="你可以编辑这位好友的物体" />
+ </scroll_list>
+ <button label="聊天/呼叫" name="im_btn" tool_tip="打开即时通信会话" />
+ <button label="档案" name="profile_btn"
+ tool_tip="显示图片、社团和其他信息" />
+ <button label="瞬间移动..." name="offer_teleport_btn"
+ tool_tip="邀请该好友瞬间移动到你的当前位置" />
+ <button label="付款..." name="pay_btn" tool_tip="给这位好友林登币 (L$)" />
+ <button label="移除..." name="remove_btn"
+ tool_tip="将这个人从你的好友列表中去除" />
+ <button label="添加..." name="add_btn"
+ tool_tip="邀请其他居民成为你的好友" />
+</panel>
+<!--Translated for Second Life 1.19.0 (79185)-->
diff --git a/indra/newview/skins/default/xui/zh/panel_group.xml b/indra/newview/skins/default/xui/zh/panel_group.xml
index de61853..d6be348 100644
--- a/indra/newview/skins/default/xui/zh/panel_group.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="GroupInfo" title="社团信息">
<text name="default_needs_apply_text">
- 在目前的亚桌面上有没有应用的更改。
+ 在目前的标签页上有还没有应用的更改。
</text>
<text name="want_apply_text">
- 你是否愿意现在就应用这些更改?
+ 您是否愿意现在就应用这些更改?
</text>
<button label="应用" label_selected="应用" name="btn_apply" />
<button label="取消" label_selected="取消" name="btn_cancel" />
<button label="OK" label_selected="OK" name="btn_ok" />
- <button label="从服务器处更新" label_selected="从服务器处更新"
+ <button label="刷新" label_selected="刷新"
name="btn_refresh" />
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_finder.xml b/indra/newview/skins/default/xui/zh/panel_group_finder.xml
index 332cb2d..25a3c95 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_finder.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_finder.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="GroupInfoFinder" title="社团信息查找器">
<text name="default_needs_apply_text">
- 在目前的亚桌面上有没有应用的更改。
+ 在目前的标签页上有还没有应用的更改。
</text>
<text name="want_apply_text">
- 你是否愿意现在就应用这些更改?
+ 您是否愿意现在就应用这些更改?
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 92bd0bf..9d0f362 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="General" name="general_tab">
+<panel label="一般" name="general_tab">
<text name="help_text">
- 普通桌面包括关于社团的一般信息，主人和可视的会员的名单，一般社团偏好和会员选项。
+一般标签页包含关于社团的一般信息，社团拥有者和可见会员的名单，一般的社团偏好设定和会员选项。
-用你的鼠标停留在选项上获取更多帮助。
+鼠标停留在选项上获取更多帮助。
</text>
+ <string
+ name="group_info_unchanged">
+ 社团一般信息已经改变。
+ </string>
<button label="?" label_selected="?" name="help_button" />
<line_editor name="group_name_editor">
在此键入你的新社团名称
@@ -13,10 +17,10 @@
在此键入你的新社团名称
</text>
<text name="prepend_founded_by">
- 创建由
+ 创始人
</text>
<text name="founder_name">
- (等待)
+ (等待中)
</text>
<text name="group_charter_label">
社团宪章
@@ -26,17 +30,17 @@
社团宪章
</text_editor>
<button label="加入(L$0)" label_selected="加入(L$0)" name="join_button" />
- <button label="详细察看" label_selected="详细察看" name="info_button" />
- <text>
- 主人和可见的会员
+ <button label="详细视图" label_selected="详细察看" name="info_button" />
+ <text name="text_owners_and_visible_members">
+ 拥有者和可见的会员
</text>
- <text>
- (主人的名字以大写字母标注)
+ <text name="text_owners_are_shown_in_bold">
+ (拥有者的名字以粗体标注)
</text>
<name_list name="visible_members">
- <column label="Member Name" name="name" />
- <column label="Title" name="title" />
- <column label="Last Login" name="online" />
+ <column label="会员名称" name="name" />
+ <column label="头衔" name="title" />
+ <column label="最后登入" name="online" />
</name_list>
<text name="incomplete_member_data_str">
重新获取会员信息
@@ -44,31 +48,61 @@
<text name="confirm_group_create_str">
创建这个社团将花费L$100.
你真的，真的，真----的----确定要花费L$100来创建这个社团吗?
+请注意如果没有别人在48小时内加入该社团，它将会被解散，并且这个社团名字将来将不能使用。
</text>
- <text>
- 社团偏好
+ <text name="text_group_preferences">
+ 社团偏好设定
</text>
<panel name="preferences_container">
- <check_box label="在社团名单中显示" name="show_in_group_list"
- tool_tip="Sets whether this group shows up in the Search Groups window and in member profiles." />
- <check_box label="在网上公布" name="publish_on_web"
- tool_tip="设定是否将此社团的信息发布到网络上" />
- <check_box label="打开注册" name="open_enrollement"
- tool_tip="Sets whether this group allows new members to join without being invited." />
+ <check_box
+ label="在搜索中显示"
+ name="show_in_group_list"
+ tool_tip="让别人在搜索结果中看到这个社团。" />
+ <check_box label="公开注册" name="open_enrollement"
+ tool_tip="设置该社团是否允许新会员加入而不需要被邀请。" />
<check_box label="注册费用: L$" name="check_enrollment_fee"
- tool_tip="设定是否收将取社团入会费." />
+ tool_tip="设定是否收将取社团入会费。" />
<spinner name="spin_enrollment_fee"
- tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked." />
+ tool_tip="如果选择了注册费用的话，新会员加入社团时必须付出这笔费用。" />
<check_box label="成人" name="mature"
tool_tip="设定你所在社团的信息是否为成人内容" />
+ <combo_box
+ allow_text_entry="false"
+ max_chars="20"
+ name="group_mature_check"
+ tool_tip="设定你所在社团的信息是否为成人内容">
+ <combo_item
+ name="select_mature"
+ value="Select">
+ - 选择分级 -
+ </combo_item>
+ <combo_item
+ name="mature"
+ value="Mature">
+ 成人内容
+ </combo_item>
+ <combo_item
+ name="not_mature"
+ value="Not Mature">
+ 非成人内容
+ </combo_item>
+ </combo_box>
<panel name="title_container">
<text name="active_title_label">
我的头衔
</text>
<combo_box name="active_title"
- tool_tip="Sets the title that appears in your avatar's name tag when this group is active." />
+ tool_tip="设置当该社团激活时，在化身姓名标签中显示的头衔。" />
</panel>
<check_box label="接受社团通知" name="receive_notices"
- tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you." />
+ tool_tip="设置您是否想要从该社团接受通知。如果这个社团向您乱发垃圾信息，那就取消选择这项。" />
+ <check_box
+ label="在我的档案中列出该社团"
+ name="list_groups_in_profile"
+ tool_tip="设置您是否想要在档案中列出该社团" />
</panel>
+ <string
+ name="incomplete_member_data_str">
+ 获取团员信息中
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 45e8202..e5fed31 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Invite a Member" name="invite_panel">
+<panel label="邀请会员" name="invite_panel">
<text>
- 你可以选择多个居民，邀请他们假如你的社团。点击‘打开任务选择器’开始邀请。
+ 您可以选择多个居民，邀请他们加入您的社团。点击 ‘打开人物选择器’ 开始邀请。
</text>
- <button label="打开个人选举人" name="add_button" tool_tip="" />
+ <button label="打开人物选择器" name="add_button" tool_tip="" />
<name_list name="invitee_list"
- tool_tip="Hold the Ctrl key and click resident names to multi-select." />
+ tool_tip="按住Ctrl键然后点击居民名字来选择多个项目。" />
<button label="从名单中移除所选项" name="remove_button"
- tool_tip="将此住户从你的邀请单中列表中清除." />
+ tool_tip="将此居民从您的邀请列表中清除。" />
<text>
选择哪个角色分配给他们：
</text>
<combo_box name="role_name"
- tool_tip="Choose from the list of Roles you are allowed to assign members to." />
- <button label="发送邀请函" name="ok_button" />
+ tool_tip="从这个列表中选择你可以为会员分配的角色。" />
+ <button label="发送邀请" name="ok_button" />
<button label="取消" name="cancel_button" />
</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 626f845..49f7588 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
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Land & L$" name="land_money_tab">
+<panel label="土地和 L$" name="land_money_tab">
<text name="help_text">
- 由社团所拥有的土地已经被列出了其所作贡献的细节。如果在使用中的总的土地小于或者等于总土地贡献，系统会发出警告。在计划，细节和销售桌面中会提供关于社团资产情况的信息。
+ 以下列出的是社团所持有的土地以及贡献细节。如果“使用中总的土地”小于或者等于“总土地贡献”，系统会发出警告。在计划，细节和销售标签页中会提供关于社团资产情况的信息。
</text>
<button label="?" name="help_button" />
<text name="cant_view_group_land_text">
- 你没有查看这个社团所拥有土地的许可证。
+ 你没有查看这个社团所拥有土地的权限。
</text>
<text name="cant_view_group_accounting_text">
- 你没有查看这个社团账户信息的许可证。
+ 你没有查看这个社团账户信息的权限。
</text>
<text name="group_land_heading">
- 社团所有土地
+ 社团所持有土地
</text>
<scroll_list name="group_parcel_list">
- <column label="Parcel Name" name="name" />
- <column label="Region" name="location" />
- <column label="Area" name="area" />
+ <column label="地块名称" name="name" />
+ <column label="区域" name="location" />
+ <column label="面积" name="area" />
<column label="" name="hidden" />
</scroll_list>
<button label="在地图中显示" label_selected="在地图中显示"
@@ -25,19 +25,19 @@
总贡献额:
</text>
<text name="total_contributed_land_value">
- 0 平方米
+ [AREA] 平方米
</text>
<text name="total_land_in_use_label">
- 使用中的全部土地:
+ 使用中的土地面积:
</text>
<text name="total_land_in_use_value">
- 0 平方米
+ [AREA] 平方米
</text>
<text name="land_available_label">
- 可售土地:
+ 可用土地:
</text>
<text name="land_available_value">
- 0 平方米
+ [AREA] 平方米
</text>
<text name="your_contribution_label">
你的贡献:
@@ -46,7 +46,7 @@
平方米
</text>
<text name="your_contribution_max_value">
- (等待)
+ 平方米 (最多[AMOUNT] )
</text>
<text name="group_over_limit_text">
社团成员必须贡献更多的土地额度，来支持土地的使用。
@@ -55,27 +55,27 @@
社团资产 L$
</text>
<tab_container name="group_money_tab_container">
- <panel label="Planning" name="group_money_planning_tab">
+ <panel label="计划" name="group_money_planning_tab">
<text_editor name="group_money_planning_text">
计算中...
</text_editor>
</panel>
- <panel label="Details" name="group_money_details_tab">
+ <panel label="细节" name="group_money_details_tab">
<text_editor name="group_money_details_text">
计算中...
</text_editor>
<button label="<较早" label_selected="<较早" name="earlier_details_button"
tool_tip="时间返回" />
- <button label="延迟 >" label_selected="延迟 >" name="later_details_button"
+ <button label="较近 >" label_selected="较近 >" name="later_details_button"
tool_tip="时间前进" />
</panel>
- <panel label="Sales" name="group_money_sales_tab">
+ <panel label="销售" name="group_money_sales_tab">
<text_editor name="group_money_sales_text">
计算中...
</text_editor>
<button label="<较早" label_selected="<较早" name="earlier_sales_button"
tool_tip="时间返回" />
- <button label="延迟 >" label_selected="延迟 >" name="later_sales_button"
+ <button label="较近 >" label_selected="较近 >" name="later_sales_button"
tool_tip="时间前进" />
</panel>
</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index e6629cb..4058b98 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -1,36 +1,39 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="通知" name="notices_tab">
<text name="help_text">
- 通知是一个小组之间快速交流联系的方法，通知通过广播消息和发送可选择的粘贴性条目，发送给用户。通知仅会到达社团内部中被授予接受信息能力的角色中的会员那里。你可以在一般控制桌面上关掉通知。
+ 通知是社团中快速交流联系的方法。通知会向社团中发布一条消息，并且可以附加一条物品。通知仅会到达社团中被授予具有接受通知能力角色的会员那里。你可以在一般控制桌面上关掉通知。
</text>
<text name="no_notices_text">
- 这里没有过去的通知.
+ 这里没有过去的通知。
</text>
<button label="?" label_selected="?" name="help_button" />
<text name="lbl">
- 社团通知归档
+ 社团通知存档
</text>
<text name="lbl2">
- 通知只会被保留14日。点击下面你想查看的通知。如果新的通知已被接受到，请点击“刷新名单”按钮。
+ 通知只会被保留 14 日。点击下面你想查看的通知。选择“刷新”按钮检查是否
+有新的通知。通知每天每社团限发送 200 条。
</text>
<scroll_list name="notice_list">
<column label="" name="icon" />
- <column label="Subject" name="subject" />
- <column label="From" name="from" />
- <column label="Date" name="date" />
+ <column label="主题" name="subject" />
+ <column label="来自" name="from" />
+ <column label="日期" name="date" />
</scroll_list>
<text name="notice_list_none_found">
- 没有找到任何目标
+ 没有找到。
</text>
- <button label="创建新的布告" label_selected="创建新的布告"
+ <button label="创建新的通知" label_selected="创建新的通知"
name="create_new_notice" />
- <button label="更新名单" label_selected="更新名单" name="refresh_notices" />
- <panel label="创建新的布告" name="panel_create_new_notice">
+ <button label="刷新" label_selected="刷新" name="refresh_notices" />
+ <panel label="创建新的通知" name="panel_create_new_notice">
<text name="lbl">
创建一条通知
</text>
<text name="lbl2">
- 你必须输入发送通知的对象。你可以从你的库存中拖拽一个条目至控制面板上，这样可以添加给通知一个条目。附加的条目必须是可复制的或可转移的，但是你不能发送一个文件夹。
+ 您必须键入主题才能发送通知。您可以将单个库存条目拖动到
+该面板上来附加这个条目。附件必须可以复制以及转让，
+并且您不能发送文件夹。
</text>
<text name="lbl3">
主题:
@@ -39,25 +42,25 @@
信息:
</text>
<text name="lbl5">
- 附属:
+ 附件:
</text>
- <button label="移走附件" label_selected="移走附件" name="remove_attachment" />
+ <button label="移除附件" label_selected="移除附件" name="remove_attachment" />
<button label="发送通知" label_selected="发送通知" name="send_notice" />
<panel name="drop_target2"
- tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
+ tool_tip="将库存条目拖动到消息框上和通知一起送出去。要将物体和通知一起送出，您必须有复制和转让物体的权限。" />
</panel>
- <panel label="View Past Notice" name="panel_view_past_notice">
+ <panel label="查看过去的通知" name="panel_view_past_notice">
<text name="lbl">
存档的通知
</text>
<text name="lbl2">
- 发送一条新的通知，请点击上面的‘创建新的通知’按钮。
+ 要发送新的通知，请点击上面的‘创建新的通知’按钮。
</text>
<text name="lbl3">
主题:
</text>
<text name="lbl4">
- 信息:
+ 消息:
</text>
<button label="打开附件" label_selected="打开附件" name="open_attachment" />
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index 743b639..cfc0602 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="会员和角色" name="roles_tab">
<text name="default_needs_apply_text">
- 在目前的亚桌面上有没有应用的更改。
+ 在目前的标签页上有尚未应用的更改。
</text>
<text name="want_apply_text">
- 你是否愿意现在就应用这些更改?
+ 您是否愿意现在就应用这些更改?
</text>
<text name="cant_delete_role">
- 普通人'和 '主人'角色属于特殊角色，不能被删除。
+ ‘普通人’ 和 ‘团长’ 角色属于特殊角色，不能被删除。
</text>
<button label="?" name="help_button" />
<panel name="members_header">
<text name="static">
- 会员和角色
+ 成员和角色
</text>
<text name="static2">
- 社团成员依照不同能力和本领，被分配以不同的角色。这些设置可以轻松的被制定，并允许更大限度的组织性和灵活性。
+ 社团成员被分配以不同的角色和能力。
+角色和能力的分配可以简单地修改，以便灵活地组织社团。
</text>
</panel>
<panel name="roles_header">
@@ -23,13 +24,13 @@
角色
</text>
<text name="role_properties_modifiable">
- 选择下面的一个角色. 你可以修改角色的名称，描述和会员的头衔。
+ 选择下面的一个角色。你可以修改角色的名称、描述和会员头衔。
</text>
<text name="role_properties_not_modifiable">
- 选择下面的角色，察看它的性质，成员和所允许的能力。
+ 选择下面的角色，察看它的属性、具有这个角色的成员和其所允许的能力。
</text>
<text name="role_actions_modifiable">
- 你也可以对角色分配能力.
+ 你也可以对角色分配能力。
</text>
<text name="role_actions_not_modifiable">
你可以查看，但不能修改，或者分配这些能力。
@@ -40,47 +41,47 @@
能力
</text>
<text name="static2">
- 你可以查看每项能力的具体描述，以及哪个角色和会员正在执行此项能力。
+ 你可以查看每项能力的具体描述，以及哪些角色和会员可以执行此项能力。
</text>
</panel>
<tab_container name="roles_tab_container">
- <panel label="Members" name="members_sub_tab" tool_tip="Members">
+ <panel label="会员" name="members_sub_tab" tool_tip="Members">
<button label="搜索" name="search_button" />
<button label="显示全部" name="show_all_button" />
<name_list name="member_list">
- <column label="Member Name" name="name" />
- <column label="Donated Tier" name="donated" />
- <column label="Last Login" name="online" />
+ <column label="会员名字" name="name" />
+ <column label="捐献的土地额度" name="donated" />
+ <column label="最后登入" name="online" />
</name_list>
<button label="邀请一个新人 ..." name="member_invite" />
<button label="从社团中驱逐" name="member_eject" />
<text name="help_text">
- 你可以添加或移除分配给会员的角色，或者通过按住控制键，并点击会员的名字，选择多个会员。
+ 你可以添加或移除分配给会员的角色。按住控制键并点击会员的名字，选择多个会员。
</text>
</panel>
<panel label="角色" name="roles_sub_tab">
<button label="搜索" name="search_button" />
<button label="显示全部" name="show_all_button" />
<scroll_list name="role_list">
- <column label="Role Name" name="name" />
- <column label="Title" name="title" />
- <column label="Members" name="members" />
+ <column label="角色名字" name="name" />
+ <column label="头衔" name="title" />
+ <column label="会员数" name="members" />
</scroll_list>
<button label="创建新的角色 ..." name="role_create" />
<button label="删除角色" name="role_delete" />
<text name="help_text">
- 角色都有一个头衔，并且允许列出每个成员能够行使的能力。成员们可以属于一个或多个角色。一个社团最多有10个角色，包括普通人和主人角色。
+ 角色都有一个头衔，以及一组这个角色可以执行的能力。团员们可以属于一个或多个角色。一个社团最多有 10 个角色，包括‘普通人’和‘团长’这两个角色。
</text>
</panel>
<panel label="能力" name="actions_sub_tab">
<button label="搜索" name="search_button" />
<button label="显示全部" name="show_all_button" />
- <scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
+ <scroll_list name="action_list" tool_tip="选择一个角色查看详细内容。">
<column label="" name="icon" />
<column label="" name="action" />
</scroll_list>
<text name="help_text">
- 这些能力允许角色里的会员在社团里做一些特殊的事情。关于能力的种类范畴很宽。
+ 能力允许持有角色的团员在社团中做特定的事项。能力有很多种。
</text>
</panel>
</tab_container>
@@ -89,14 +90,14 @@
分配的角色
</text>
<text name="static2">
- 允许能力
+ 允许的能力
</text>
<scroll_list name="member_assigned_roles">
<column label="" name="checkbox" />
<column label="" name="role" />
</scroll_list>
<scroll_list name="member_allowed_actions"
- tool_tip="For Details of each Allowed Ability see the Abilities tab.">
+ tool_tip="每个能力的详细资料请参见能力标签。">
<column label="" name="icon" />
<column label="" name="action" />
</scroll_list>
@@ -108,17 +109,17 @@
<text name="static2">
描述
</text>
- <line_editor name="role_name">
+ <line_editor name="role_name"><!--placeholder-->
雇员
</line_editor>
<text name="static3">
头衔
</text>
<line_editor name="role_title">
- (等待)
+ (等待中)
</line_editor>
<text_editor name="role_description">
- (等待)
+ (等待中)
</text_editor>
<text name="static4">
分配的成员
@@ -128,9 +129,9 @@
允许能力
</text>
<check_box label="组员可见" name="role_visible_in_list"
- tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group." />
+ tool_tip="设定该角色的成员对社团外的人是否在一般标签页中可见。" /><!--So long...-->
<scroll_list name="role_allowed_actions"
- tool_tip="For Details of each Allowed Ability see the Abilities tab.">
+ tool_tip="每个能力的详细资料请参见能力标签。">
<column label="" name="icon" />
<column label="" name="checkbox" />
<column label="" name="action" />
@@ -140,14 +141,14 @@
<text name="static">
描述
</text>
- <text_editor name="action_description">
- 这项能力是‘从社团中驱逐会员’。只有主人能够驱逐另一个主人。
+ <text_editor name="action_description"><!--Placeholder again-->
+ 这项能力是 ‘从社团中驱逐会员’。只有团长能够驱逐另一个团长。
</text_editor>
<text name="static2">
- 有能力的角色
+ 有该能力的角色
</text>
<text name="static3">
- 有能力的会员
+ 有该能力的会员
</text>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_voting.xml b/indra/newview/skins/default/xui/zh/panel_group_voting.xml
index 5763676..83f907e 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_voting.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_voting.xml
@@ -1,65 +1,71 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="议案" name="voting_tab">
+<panel label="提议" name="voting_tab">
<text name="help_text">
- 社团提议并不能视为是社团向要做的事，或者是社团度某些事情的看法。如果你有合适的权利，你就可以创建提议，投票表决开放性提议，并查看旧的提议。
+社团提议可以用来了解社团想要做的事，或者是社团对某些事情的看法。如果你有合适的权力，你就可以创建提议、投票表决开放的提议，以及查看旧的提议。
</text>
- <button label="?" name="help_button" />
<text name="proposal_header">
- 打开社团提议
+ 开放的社团提议
+ </text>
+ <text name="proposal_instructions">
+ 双击你愿意投票的决议，点击创建决议， 以创建一个新的决议。
+ </text>
+ <text name="proposal_lbl">
+ 提议描述
+ </text>
+ <text
+ name="proposal_voting_lbl"
+ visible="true">
+ 提议 投票结束 已经投票？
</text>
+ <button label="创建提议" label_selected="创建提议" name="btn_proposal" />
+ <button label="查看提议" label_selected="查看提议" name="btn_view_proposal_item" />
+ <button label="查看名单" label_selected="查看名单" name="btn_view_proposal_list" />
<text name="proposals_header_view_txt">
- 打开社团提议
+ 开放的社团提议
</text>
<text name="proposals_header_create_txt">
- 创造提议
+ 创建提议
</text>
<text name="proposals_header_vote_txt">
- 议案的投票表决
+ 对提议投票
</text>
<text name="empty_proposal_txt">
- 你正在尝试创建的提案是空的。请在创建之前填好你的提案。
- </text>
- <text name="proposal_instructions">
- 双击你愿意投票的决议，点击创建决议， 以创建一个新的决议。
- </text>
- <text name="proposal_lbl">
- 建议:
+ 你正在尝试创建的提议是空的。请在创建之前填好你的提议。
</text>
- <button label="创造提议" label_selected="创造提议" name="btn_proposal" />
- <button label="察看提议" label_selected="察看提议"
- name="btn_view_proposal_item" />
- <button label="查看名单" label_selected="查看名单"
- name="btn_view_proposal_list" />
+
+
+
+
<text name="quorum_lbl">
法定人数:
</text>
- <spinner name="quorum" tool_tip="# 人为选举结果有效还需要的人数。" />
+ <spinner name="quorum" tool_tip="为选举结果有效需要最少的人数。" />
<text name="quorum_text">
- 总数为x 社团会员.
+ 位团员必须投票（总共 [MEMBERS]人）
</text>
<text name="duration_lbl">
持续时间:
</text>
- <spinner name="duration" tool_tip="#天为选举还将持续的天数。" />
+ <spinner name="duration" tool_tip="投票持续的天数" />
<text name="duration_text">
天
</text>
- <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
+ <radio_group name="majority" tool_tip="投票成功需要的人数。">
简单多数
2/3 多数
全票通过
</radio_group>
<text name="start_lbl">
- 选举开始:
+ 投票开始:
</text>
<text name="end_lbl">
- 选举结束 :
+ 投票结束 :
</text>
<button label="提交提议" label_selected="提交提议" name="btn_submit" />
<button label="取消" label_selected="取消" name="btn_cancel" />
<button label="是" label_selected="是" name="btn_yes" />
<button label="否" label_selected="否" name="btn_no" />
- <button label="放弃" label_selected="放弃" name="btn_abstain" />
+ <button label="弃权" label_selected="弃权" name="btn_abstain" />
<text name="txt">
社团选举史
</text>
@@ -69,10 +75,50 @@
<text name="history_list_lbl">
通过表决 投票表决终止
</text>
- <button label="查看物品栏" label_selected="查看物品栏"
+ <button label="查看项目" label_selected="查看项目"
name="btn_view_history_item" />
<text name="vote_text_lbl">
- 选举结果:
+ 投票结果:
</text>
<button label="查看名单" label_selected="查看名单" name="btn_view_history_list" />
+ <string
+ name="proposals_header_view_inst">
+ 双击你想要投票的提议，或者按‘创建提议’来创建新的提议。
+ </string>
+ <string
+ name="proposals_header_create_inst">
+ 输入新的提议的描述。您可以更改最少投票人数、时间以及需要通过投票的人数类别。
+ </string>
+ <string
+ name="proposals_header_vote_inst">
+ 按‘是’或‘否’来对提议投票，或者选择在此提议上弃权。
+ </string>
+ <string
+ name="proposals_header_voted_inst">
+ 您选择了: [VOTE]
+ </string>
+<string
+ name="proposals_submit_yes_txt">
+ 正在提交同意票...
+ </string>
+ <string
+ name="proposals_submit_no_txt">
+ 正在提交反对票...
+ </string>
+ <string
+ name="proposals_submit_abstain_txt">
+ 正在提交弃权票...
+ </string>
+ <string
+ name="proposals_submit_new_txt">
+ 正在提交新的提议...
+ </string>
+ <string
+ name="vote_recorded">
+ 您的投票已经收到。
+ </string>
+ <string
+ name="vote_previously_recorded">
+ 您已经投过票了。一次提议只能投票一次。
+ </string>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_groups.xml b/indra/newview/skins/default/xui/zh/panel_groups.xml
new file mode 100644
index 0000000..958f392
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_groups.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="groups">
+ <text name="groupdesc" >
+ 您当前激活的社团以粗体表示。
+ </text>
+ <text name="groupcount" >
+ 您现在属于 [COUNT] 个社团 (最大 [MAX] 个)。
+ </text>
+ <button
+ label="聊天/呼叫"
+ name="IM"
+ tool_tip="打开即时通信会话" />
+ <button
+ label="信息"
+ name="Info" />
+ <button
+ label="激活"
+ name="Activate" />
+ <button
+ label="离开"
+ name="Leave" />
+ <button
+ label="创建..."
+ name="Create" />
+ <button
+ label="搜索..."
+ name="Search..." />
+</panel>
+<!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
index dc06531..a10df47 100644
--- a/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_login">
<text name="first_name_text">
- 姓:
+ 名:
</text>
<text name="last_name_text">
- 名:
+ 姓:
</text>
<text name="password_text">
密码:
</text>
<text name="start_location_text">
- 开始定位:
+ 开始位置:
</text>
<combo_box name="start_location_combo">
<combo_item name="MyHome">
我的家
</combo_item>
<combo_item name="MyLastLocation">
- 我的上个位置
+ 我最后在的位置
</combo_item>
- <combo_item name="<Typeregionname>">
+ <combo_item name="Typeregionname">
<输入地域名>
</combo_item>
</combo_box>
@@ -28,9 +28,18 @@
登陆后显示器会采用全屏显示。
</text>
<button label="新帐户..." label_selected="新帐户..." name="new_account_btn" />
- <button label="连接" label_selected="连接" name="connect_btn" />
+ <button label="登入" label_selected="登入" name="connect_btn" />
<button label="参数选择..." label_selected="参数选择..." name="preferences_btn" />
<button label="退出" label_selected="退出" name="quit_btn" />
+ <text name="forgot_password_text">
+ 忘记了姓名或密码吗？
+ </text>
+ <text
+ name="create_new_account_text"
+ hover_color="50 115 185">
+ 申请新帐户。
+ </text>
+
<text name="version_text">
1.23.4 (5)
</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_media_controls.xml
new file mode 100644
index 0000000..0924596
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_media_controls.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="media_controls">
+ <icon
+ label=""
+ name="music_icon"
+ tool_tip="播放或暂停音乐流" />
+ <button
+ label=""
+ name="music_play"
+ tool_tip="播放或暂停音乐流" />
+ <button
+ label=""
+ name="music_pause"
+ tool_tip="暂停音乐流" />
+ <button
+ label=""
+ name="music_stop"
+ tool_tip="停止音乐流" />
+ <icon
+ label=""
+ name="media_icon"
+ tool_tip="播放或暂停音乐流" />
+ <button
+ image_disabled="flyout_btn_left_disabled.tga"
+ label=""
+ name="media_play"
+ tool_tip="播放或暂停音乐流" />
+ <button
+ image_disabled="flyout_btn_left_disabled.tga"
+ label=""
+ name="media_pause"
+ tool_tip="暂停媒体流" />
+ <button
+ label=""
+ name="media_stop"
+ tool_tip="停止媒体流" />
+ <volume_slider
+ name="volume_slider"
+ tool_tip="主音量" />
+ <button
+ label=""
+ name="mute_master"
+ tool_tip="全部禁音" />
+ <button
+ name="expand"
+ tool_tip="单独调节音量大小" />
+
+ <string
+ name="play_label">
+ 播放
+ </string>
+ <string
+ name="stop_label">
+ 停止
+ </string>
+ <string
+ name="pause_label">
+ 暂停
+ </string>
+ <string
+ name="default_tooltip_label">
+ 没有设定媒体
+ </string>
+ <string
+ name="media_hidden_label">
+ (URL 被地块拥有者隐藏)
+ </string>
+ <string
+ name="media_icon_tooltip_web">
+ 该地点显示 World Wide Web 上的内容。点击播放按钮显示网络内容。
+ </string>
+ <string
+ name="media_icon_tooltip_movie">
+ 该地点显示视频内容。点击播放按钮播放视频。
+ </string>
+ <string
+ name="media_play_tooltip">
+ 在该地点显示网络内容。
+ </string>
+</panel>
+
+
diff --git a/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..b08bbef
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="media_remote"
+ use_bounding_rect="true">
+ <string
+ name="play_label">
+ 播放
+ </string>
+ <string
+ name="stop_label">
+ 停止
+ </string>
+ <string
+ name="pause_label">
+ 暂停
+ </string>
+ <string
+ name="default_tooltip_label">
+ 没有设定媒体
+ </string>
+ <string
+ name="media_hidden_label">
+ (URL 被地块拥有者隐藏)
+ </string>
+ <string
+ name="media_icon_tooltip_web">
+ 该地点显示 World Wide Web 上的内容。点击播放按钮显示网络内容。
+ </string>
+ <string
+ name="media_icon_tooltip_movie">
+ 该地点显示视频内容。点击播放按钮播放视频。
+ </string>
+ <string
+ name="media_play_tooltip">
+ 在该地点显示网络内容。
+ </string>
+</panel>
+
+
diff --git a/indra/newview/skins/default/xui/zh/panel_overlaybar.xml b/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
index 627206c..3e83ba2 100644
--- a/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="overlay">
- <button label="已收到即时消息" label_selected="已收到即时消息"
- name="IM Received"
- tool_tip="你有一个未察看的即时消息.请点击察看" />
- <button label="设成不忙状态" label_selected="设成不忙状态"
- name="Set Not Busy"
- tool_tip="聊天与即时消息模式以对你隐藏。 点击这里来设定你不在忙碌模式下" />
- <button label="释放键盘" label_selected="释放键盘" name="Release Keys"
- tool_tip="脚本已经控制了你的控制键。点击这里释放控制键。" />
- <button label="第一人称视角" label_selected="第一人称视角" name="Mouselook"
- tool_tip="使用鼠标控制屏幕. 如果你有枪, 双击枪则会自动射击." />
- <button label="起身" label_selected="起身" name="Stand Up"
- tool_tip="点击这里来站立" />
+ <layout_stack name="overlay_layout_panel">
+ <layout_panel name="main_panel" min_width="420">
+ <layout_stack name="chatbar_and_buttons">
+ <layout_panel name="state_buttons">
+ <button label="已收到即时消息" label_selected="已收到即时消息"
+ name="IM Received"
+ tool_tip="你有一个未察看的即时消息。请点击察看" />
+ <button label="取消忙碌状态" label_selected="取消忙碌状态"
+ name="Set Not Busy"
+ tool_tip="聊天与即时消息模式已对你隐藏。 点击这里来设定你不在忙碌模式下" />
+ <button label="释放键盘" label_selected="释放键盘" name="Release Keys"
+ tool_tip="一个脚本已经控制了你的控制键。点击这里释放控制键。" />
+ <button label="第一人称视角" label_selected="第一人称视角" name="Mouselook"
+ tool_tip="使用鼠标控制屏幕。如果你有枪，点击则可以射击。" />
+ <button label="起身" label_selected="起身" name="Stand Up"
+ tool_tip="点击这里来站立" />
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_place.xml b/indra/newview/skins/default/xui/zh/panel_place.xml
index 133d320..68668ae 100644
--- a/indra/newview/skins/default/xui/zh/panel_place.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place.xml
@@ -1,6 +1,60 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Place" title="地方">
- <button label="闪电传送" name="teleport_btn" />
- <button label="在地图中显示" name="map_btn" />
- <button label="投标..." name="auction_btn" />
+<panel
+ name="Place"
+ title="Place">
+ <text
+ name="name_label">
+ 名称:
+ </text>
+ <text
+ name="description_label">
+ 描述:
+ </text>
+ <text
+ name="information_label">
+ 信息:
+ </text>
+ <text
+ name="location_label">
+ 位置:
+ </text>
+ <button
+ label="瞬间移动"
+ name="teleport_btn" />
+ <button
+ label="在地图上显示"
+ name="map_btn" />
+ <button
+ label="投标..."
+ name="auction_btn" />
+ <string
+ name="traffic_text">
+ 流量: [TRAFFIC]
+ </string>
+ <string
+ name="area_text">
+ 面积: [AREA] 平方米
+ </string>
+ <string
+ name="forsale_text">
+ 以 L$ [PRICE] 的价格出售
+ </string>
+ <string
+ name="auction_text">
+ 拍卖 ID [ID].
+ </string>
+ <string
+ name="server_update_text">
+ 如果服务器不更新的话，就没有地点信息。
+ </string>
+ <string
+ name="server_error_text">
+ 关于这个地点的信息现在暂时不可用，请稍候再试。
+ </string>
+ <string
+ name="server_forbidden_text">
+ 由于访问限制，关于这个地点的信息不可用。请与地块的持有人确认你的权限。
+ </string>
</panel>
+
+
diff --git a/indra/newview/skins/default/xui/zh/panel_place_small.xml b/indra/newview/skins/default/xui/zh/panel_place_small.xml
index 133d320..68668ae 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_small.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_small.xml
@@ -1,6 +1,60 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Place" title="地方">
- <button label="闪电传送" name="teleport_btn" />
- <button label="在地图中显示" name="map_btn" />
- <button label="投标..." name="auction_btn" />
+<panel
+ name="Place"
+ title="Place">
+ <text
+ name="name_label">
+ 名称:
+ </text>
+ <text
+ name="description_label">
+ 描述:
+ </text>
+ <text
+ name="information_label">
+ 信息:
+ </text>
+ <text
+ name="location_label">
+ 位置:
+ </text>
+ <button
+ label="瞬间移动"
+ name="teleport_btn" />
+ <button
+ label="在地图上显示"
+ name="map_btn" />
+ <button
+ label="投标..."
+ name="auction_btn" />
+ <string
+ name="traffic_text">
+ 流量: [TRAFFIC]
+ </string>
+ <string
+ name="area_text">
+ 面积: [AREA] 平方米
+ </string>
+ <string
+ name="forsale_text">
+ 以 L$ [PRICE] 的价格出售
+ </string>
+ <string
+ name="auction_text">
+ 拍卖 ID [ID].
+ </string>
+ <string
+ name="server_update_text">
+ 如果服务器不更新的话，就没有地点信息。
+ </string>
+ <string
+ name="server_error_text">
+ 关于这个地点的信息现在暂时不可用，请稍候再试。
+ </string>
+ <string
+ name="server_forbidden_text">
+ 由于访问限制，关于这个地点的信息不可用。请与地块的持有人确认你的权限。
+ </string>
</panel>
+
+
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml b/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
index ba8055c..7090693 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
@@ -1,40 +1,62 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Audio & Video" name="Media panel">
+<panel label="音频和视频" name="Media panel">
<text type="string" length="1" name="muting_text">
- 屏蔽:
+ 音量:
</text>
<check_box label="屏蔽声音" name="disable audio" />
<check_box label="当窗口最小化时屏蔽声音" name="mute_when_minimized" />
- <text type="string" length="1" name="streaming_text">
- 流派:
+ <text
+ name="streaming_prefs_text">
+ 流媒体首选项:
</text>
+ <text
+ name="audio_prefs_text">
+ 音频首选项:
+ </text>
+
<check_box label="当音乐可用时播放音乐流(会占用更多带宽)"
name="streaming_music" />
<check_box label="当视频可用时播放视频流(会占用更多带宽)"
name="streaming_video" />
+ <check_box label="自动播放媒体"
+ name="auto_streaming_video" />
+
+ <text type="string" length="1" name="streaming_text">
+ 流派:
+ </text>
+
<text type="string" length="1" name="system_volume_text">
- 声效:
+ 系统声音效果:
</text>
<text type="string" length="1" name="wind_volume_text">
- 风量:
+ 风声:
</text>
<text type="string" length="1" name="footsteps_volume_text">
- 脚印尺寸:
+ 脚步声:
</text>
<text type="string" length="1" name="ui_volume_text">
- UI体积:
- </text>
- <spinner label="L$ 整体改变" name="L$ Change Threshold" />
- <spinner label="从初始更改健康状况" name="Health Change Threshold" />
- <text type="string" length="1" name="doppler_effect_text">
- 多普勒效应:
+ 界面音量:
</text>
+ <spinner label="L$ 变化阈值" name="L$ Change Threshold" />
+ <spinner label="生命值变化阈值" name="Health Change Threshold" />
+
+ <slider
+ name="Doppler Effect" width="250"
+ label="多普勒效应" />
<text type="string" length="1" name="distance_factor_text">
- 距离因素:
+ 距离系数:
</text>
+ <slider
+ name="Distance Factor"
+ label="距离系数" />
+
<text type="string" length="1" name="rolloff_factor_text">
- 翻转因素:
+ 衰减系数:
</text>
+ <slider
+ name="Rolloff Factor"
+ label="衰减系数:" />
+
<text type="string" length="1" name="default_upload_bitrate_text">
默认上传速率:
</text>
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 f62aec5..adbeef8 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -3,52 +3,70 @@
<text type="string" length="1" name="text_box">
聊天字体大小:
</text>
- <radio_group name="chat font size">
+ <radio_group name="chat_font_size">
<radio_item type="string" length="1" name="radio">
- 小型的
+ 小号
</radio_item>
<radio_item type="string" length="1" name="radio2">
- 中型的
+ 中号
</radio_item>
<radio_item type="string" length="1" name="radio3">
- 大型的
+ 大号
</radio_item>
</radio_group>
<text type="string" length="1" name="text_box2">
聊天颜色:
</text>
+ <!--Geneko Nemeth: 最多只能写三个字。/Maximum 3 Chinese characters.-->
+ <color_swatch
+ label="您"
+ name="user" />
+ <color_swatch
+ label="其他人"
+ name="agent" />
+ <color_swatch
+ label="即时"
+ name="im" />
<color_swatch label="系统" name="system" />
+ <color_swatch label="错误" name="script_error" />
<color_swatch label="用户" name="users" />
- <color_swatch label="东东" name="objects" />
- <color_swatch label="泡沫" name="background" />
- <color_swatch label="URLs" name="links" />
+ <color_swatch label="物体" name="objects" />
+ <color_swatch label="Owner" name="owner" />
+ <color_swatch label="气球" name="background" />
+ <color_swatch label="链接" name="links" />
<text type="string" length="1" name="text_box3">
聊天控制台:
</text>
- <spinner label="聊天结束后淡出" name="fade_chat_time" />
+ <spinner label="对话淡出时间" name="fade_chat_time" />
<text type="string" length="1" name="text_box4">
(秒)
</text>
<text type="string" length="1" name="text_box5">
- (#行)
+ (行)
</text>
- <slider label="不透明" name="console_opacity" />
+ <slider label="不透明度" name="console_opacity" />
+ <check_box
+ label="使用全屏宽度 (需要重启动)"
+ name="chat_full_width_check" />
<text type="string" length="1" name="text_box6">
聊天选项:
</text>
<check_box label="用全屏宽度聊天 (需重启)" name="chat_full_width_check" />
- <check_box label="点击返回后关闭聊天窗口" name="close_chat_on_return_check" />
- <check_box label="；聊天时可用箭头键移动你的化身"
+ <check_box label="按回车键关闭聊天栏" name="close_chat_on_return_check" />
+ <check_box label="聊天时箭头键总是移动你的化身"
name="arrow_keys_move_avatar_check" />
- <check_box label="在聊天时显示时间" name="show_timestamps_check" />
+ <check_box label="本地聊天时显示时间戳" name="show_timestamps_check" />
+ <check_box
+ label="聊天时播放打字动画"
+ name="play_typing_animation" />
<text type="string" length="1" name="text_box7">
- 泡泡聊:
+ 聊天气球:
</text>
- <check_box label="显示聊天窗口" name="bubble_text_chat" />
- <slider label="不透明" name="bubble_chat_opacity" />
+ <check_box label="使用气球聊天" name="bubble_text_chat" />
+ <slider label="不透明度" name="bubble_chat_opacity" />
<text type="string" length="1" name="text_box8">
- 脚本出错:
+ 脚本错误:
</text>
<check_box label="以聊天形式显示脚本错误和警告" name="script_errors_as_chat" />
- <color_swatch label="颜色" name="script_error" />
+
</panel>
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 77460f2..00656f6 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -1,21 +1,71 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="General" name="general_panel">
+<panel label="一般选项" name="general_panel">
+ <radio_group
+ draw_border="false"
+ name="default_start_location">
+ <radio_item
+ name="MyHome"
+ tool_tip="默认登录到我的家。">
+ 我的家
+ </radio_item>
+ <radio_item
+ name="MyLastLocation"
+ tool_tip="默认登录到我最后的位置。">
+ 我最后在的位置
+ </radio_item>
+ </radio_group>
+
+
<check_box label="在登陆界面上显示起始位置" name="show_location_checkbox" />
+
+ <combo_box name="fade_out_combobox" >
+ <combo_item name="Never" >
+ 从不显示
+ </combo_item>
+ <combo_item name="Show Temporarily" >
+ 暂时显示
+ </combo_item>
+ <combo_item name="Always">
+ 总是显示
+ </combo_item>
+ </combo_box>
+
<check_box label="在我的屏幕上隐藏我的名字" name="show_my_name_checkbox" />
+ <text
+ name="group_titles_textbox">
+ 社团头衔:
+ </text>
+
+ <check_box label="隐藏所有社团头衔" name="show_all_title_checkbox" />
<check_box label="隐藏我的社团头衔" name="show_my_title_checkbox" />
- <check_box label="小化身的名字" name="small_avatar_names_checkbox" />
+ <check_box label="化身名字使用小号字体" name="small_avatar_names_checkbox" />
+
+ <color_swatch label="" name="effect_color_swatch"
+ tool_tip="点击这里来打开色彩选择器" />
+
+ <!-- UI Sizing -->
+ <text name="UI Size:">
+ 界面尺寸:
+ </text>
+ <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
+ font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+ label="使用分辨率无关尺寸" left="148" mouse_opaque="true"
+ name="ui_auto_scale" radio_style="false" width="256" />
+
+ <spinner label="离开休息计时:" name="afk_timeout_spinner" />
+
<check_box label="显示在线好友通知" name="friends_online_notify_checkbox" />
<check_box label="旋转迷你地图" name="rotate_mini_map_checkbox" />
- <check_box label="Notify when Linden dollars (L$) spent or received"
+ <check_box label="在付出或收到林登币 (L$) 时提醒我"
name="notify_money_change_checkbox" />
<check_box label="下次启动时自动检测图像显示硬件"
name="probe_hardware_checkbox"
tool_tip="第二人生会根据您的硬件配置自动对一些图像设置进行调配。 如果您安装了新的硬件， 您应该让第二人生重新调配。" />
- <check_box label="使用色彩撷取器的默认系统模式"
+ <check_box label="使用系统默认色彩选择器"
name="use_system_color_picker_checkbox"
tool_tip="使用系统默认色彩撷取器，代替在第二人生中建设的色彩撷取器。" />
<text type="string" length="1" name="start_location_textbox">
- 开始定位:
+ 起始位置:
</text>
<text type="string" length="1" name="show_names_textbox">
显示名字:
@@ -27,28 +77,19 @@
秒
</text>
<text type="string" length="1" name="crash_report_textbox">
- 现金报告:
+ 崩溃报告:
</text>
<text type="string" length="1" name="language_textbox">
语言:
</text>
<text type="string" length="1" name="language_textbox2">
- (Requires restart for full effect)
+ (要使更改完全生效，需重新启动程序)
</text>
- <radio_group name="fade_out_radio">
- <radio_item type="string" length="1" name="Never">
- Never
- </radio_item>
- <radio_item type="string" length="1" name="Temporarily">
- Show Temporarily
- </radio_item>
- <radio_item type="string" length="1" name="Always">
- Always
- </radio_item>
- </radio_group>
- <color_swatch label="" name="effect_color_swatch"
- tool_tip="点击这里来打开色彩选择器" />
- <spinner label="离开休息计时:" name="afk_timeout_spinner" />
+<check_box
+ label="在覆盖栏中显示搜索面板" mouse_opaque="true"
+ name="show_search_panel"
+ tool_tip="显示嵌入的搜索面板。"/>
+
<text name="region_name_prompt">
<输入地域名>
</text>
@@ -64,20 +105,39 @@
</combo_item>
</combo_box>
<combo_box name="language_combobox">
- <combo_item type="string" length="1" name="English">
- 英语
+ <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+ 系统默认值
+ </combo_item>
+ <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
+ English (英语)
+ </combo_item>
+ <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+ 汉语/漢語 - 测试版
+ </combo_item>
+ <combo_item length="1" name="Danish" type="string">
+ Dansk (Danish) - 测试版
+ </combo_item>
+ <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+ Deutsch (德语) - 测试版
+ </combo_item>
+ <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+ Français (法语) - 测试版
</combo_item>
- <combo_item type="string" length="1" name="Deutsch(German)">
- Deutsch (German) - Beta
+ <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+ 日本語 (日语) - 测试版
</combo_item>
- <combo_item type="string" length="1" name="(Japanese)">
- 日本語 (Japanese) - Beta
+ <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+ 한국어 (朝鲜语) - 测试版
</combo_item>
- <combo_item type="string" length="1" name="(Korean)">
- 한국어 (Korean) - Beta
+ <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+ Português (葡萄牙语) - 测试版
</combo_item>
- <combo_item type="string" length="1" name="Chinese">
- 中文 - Beta
+ <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+ Español (西班牙语) - 测试版
</combo_item>
</combo_box>
+ <check_box
+ label="与物体共享语言"
+ name="language_is_public"
+ tool_tip="这使得世界内的物体可以知道你偏好的语言。" />
</panel>
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 ddaabdb..d7ca24b 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,43 +1,245 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="图像" name="Display panel">
+
+ <!-- render size section -->
+ <button label="?" name="GraphicsPreferencesHelpButton" />
+
+ <text name="DisplayResLabel">
+ 显示器分辨率:
+ </text>
+ <combo_box name="fullscreen combo" />
+ <check_box label="在窗口中运行" name="windowed mode" />
+ <text_editor name="FullScreenInfo">
+ 若不选中，查看器在登入时将全屏显示。
+ </text_editor>
+ <text
+ name="WindowSizeLabel">
+ 窗口尺寸:
+ </text>
+
+ <text name="AspectRatioLabel1">
+ 全屏宽高比:
+ </text>
+ <text name="AspectRatioLabel2">
+ (宽 / 高)
+ </text>
<combo_box name="aspect_ratio">
- <combo_item type="string" length="1" name="4:3(StandardCRT)">
+ <combo_item name="4:3(StandardCRT)" >
4:3 (标准显示器)
</combo_item>
- <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
- 5:4 (1280x1024液晶屏)
+ <combo_item name="5:4(1280x1024LCD)" >
+ 5:4 (1280x1024 液晶显示器)
</combo_item>
- <combo_item type="string" length="1" name="16:9(Widescreen)">
- 16:9 (宽屏)
+ <combo_item name="16:9(Widescreen)" >
+ 16:9 (宽屏幕)
</combo_item>
</combo_box>
- <text type="string" length="1" name="text">
- 限制决议:
+ <check_box label="自动检测"
+ name="aspect_auto_detect"/>
+
+ <!-- performance/quality text-->
+ <text name="HigherText">
+ 质量和
+ </text>
+ <text name="QualityText"
+ width="95">
+ 性能:
+ </text>
+
+ <!-- May want to axe these explanatations for locale problems -->
+ <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
+ font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+ left="115" mouse_opaque="true" name="FasterText" v_pad="0"
+ width="80">
+ 更快
+ </text>
+
+ <!-- radio box names -->
+ <text name="ShadersPrefText">
+ 低
+ </text>
+ <text name="ShadersPrefText2" >
+ 中
+ </text>
+ <text name="ShadersPrefText3">
+ 高
+ </text>
+ <text name="ShadersPrefText4">
+ 最高
+ </text>
+
+
+ <!-- May want to axe these explanatations for locale problems -->
+ <text name="HigherText2">
+ 更高
+ </text>
+ <text name="QualityText2">
+ 质量
+ </text>
+
+ <slider label="" name="QualityPerformanceSelection" />
+ <check_box label="自定义" name="CustomSettings" />
+
+ <!-- performance settings -->
+ <view_border name="GraphicsBorder" />
+
+ <!-- Shaders -->
+ <text name="ShadersText">
+ 着色器:
+ </text>
+
+ <check_box
+ label="凹凸贴图和光泽"
+ name="BumpShiny" />
+ <check_box
+ label="基本着色器"
+ name="BasicShaders"
+ tool_tip="禁用该选项也许可以防止某些显卡驱动程序崩溃。"
+ width="315" />
+ <check_box
+ label="大气着色器"
+ name="WindLightUseAtmosShaders"/>
+ <check_box
+ label="水面反射" name="Reflections"/>
+
+ <!-- Reflection Detail -->
+ <text name="ReflectionDetailText">
+ 反射细节:
+ </text>
+ <radio_group name="ReflectionDetailRadio">
+ <radio_item name="0">
+ 地面和树木
+ </radio_item>
+ <radio_item name="1">
+ 所有静态物体
+ </radio_item>
+ <!--这里应不应该写成“东东”?-->
+ <radio_item name="2">
+ 所有化身和物体
+ </radio_item>
+ <radio_item name="3">
+ 一切东西
+ </radio_item>
+ </radio_group>
+
+ <!-- avatar rendering -->
+ <text name="AvatarRenderingText" width="128">
+ 化身渲染:
+ </text>
+ <check_box
+ label="化身替身"
+ name="AvatarImpostors" width="256" />
+ <check_box
+ label="硬件 Skinning"
+ name="AvatarVertexProgram" width="256" />
+ <check_box
+ label="化身衣物效果"
+ name="AvatarCloth" width="256" />
+
+ <!-- performance sliders -->
+ <text name="DrawDistanceMeterText1"
+ width="128">
+ m
+ </text>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+
+ <slider label="描绘距离:" name="DrawDistance" />
+ <slider label="最大粒子数:" name="MaxParticleCount"/>
+ <slider label="后期处理质量:" name="RenderPostProcess"/>
+
+ <text name="MeshDetailText"
+ width="128">
+ 模型细节:
+ </text>
+
+ <slider
+ label=" 物体:" label_width="140"
+ name="ObjectMeshDetail"
+ width="223" />
+ <slider
+ label=" 活动元件:" label_width="140"
+ name="FlexibleMeshDetail"
+ width="223" />
+ <slider
+ label=" 树木:" label_width="140"
+ name="TreeMeshDetail"
+ width="223" />
+ <slider
+ label=" 化身:" label_width="140"
+ name="AvatarMeshDetail"
+ width="223" />
+ <slider
+ label=" 地面:"
+ name="TerrainMeshDetail"
+ width="223" />
+ <slider
+ label=" 天空:" label_width="140"
+ name="SkyMeshDetail"
+ width="223" />
+
+ <!-- Low/Mid/High boxes -->
+ <text name="PostProcessText" >
+ 低
+ </text>
+ <text name="ObjectMeshDetailText" >
+ 低
</text>
- <text type="string" length="1" name="Fullscreen Aspect Ratio:">
- 全屏显示放大比率:
+ <text name="FlexibleMeshDetailText">
+ 低
</text>
- <text type="string" length="1" name="(width / height)">
- (宽度 /高度)
+ <text name="TreeMeshDetailText" >
+ 低
</text>
- <text type="string" length="1" name="UI Size:">
- UI尺寸:
+ <text name="AvatarMeshDetailText" >
+ 低
+ </text>
+ <text name="TerrainMeshDetailText">
+ 低
</text>
- <text type="string" length="1" name="(meters, lower is faster)">
- (米数,越低越快)
+ <text name="SkyMeshDetailText">
+ 低
+ </text>
+
+
+ <!-- Lighting detail -->
+ <text name="LightingDetailText" >
+ 光照细节:
</text>
- <text type="string" length="1" name="text2">
- 显示设置选项:
+ <radio_group name="LightingDetailRadio">
+ <radio_item name="SunMoon">
+ 仅有日月光效
+ </radio_item>
+ <radio_item name="LocalLights" >
+ 附近的灯光
+ </radio_item>
+ </radio_group>
+
+ <!-- Terrain Detail -->
+ <text name="TerrainDetailText">
+ 地面细节:
</text>
- <check_box label="在窗口中中运行" name="windowed mode" />
- <check_box label="自动检测" name="aspect_auto_detect" />
- <check_box label="使用决议自由规模" name="ui_auto_scale" />
- <check_box label="从第一视角显示玩家" name="avfp" />
- <spinner label="拖带距离:" name="draw_distance" />
- <text name="resolution_format">
+ <radio_group name="TerrainDetailRadio">
+ <radio_item name="0" >
+ 低
+ </radio_item>
+ <radio_item name="2" >
+ 高
+ </radio_item>
+ </radio_group>
+
+ <button label="建议设置"
+ name="Defaults" />
+
+ <button label="硬件选项"
+ name="GraphicsHardwareButton" />
+
+ <text hidden="true" name="resolution_format">
[RES_X] x [RES_Y]
</text>
- <text name="aspect_ratio_text">
+ <text hidden="true" name="aspect_ratio_text">
[NUM]:[DEN]
</text>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_im.xml b/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
index c41e004..88052bc 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
@@ -1,19 +1,52 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="即时通" name="im">
+<panel label="即时消息" name="im">
<text type="string" length="1" name="text_box">
- 即时通选项:
+ 我的在线状态:
</text>
+ <check_box
+ initial_value="false"
+ label="仅我的好友和社团才能看见我的在线状况"
+ name="online_visibility" />
+
<text name="log_in_to_change">
登陆后更改
</text>
<check_box label="发送即时消息至电子邮件([EMAIL])" name="send_im_to_email" />
- <check_box label="聊天记录中包含即时通信息" name="include_im_in_chat_history" />
+ <check_box label="本地聊天中包含即时通信息" name="include_im_in_chat_history" />
<check_box label="在即时消息中显示时间" name="show_timestamps_check" />
- <check_box label="Log Instant Messages" name="log_instant_messages" />
- <check_box label="Log Chat" name="log_chat" />
- <check_box label="Show end of last IM conversation" name="log_show_history" />
- <button label="Change Path" label_selected="Change Path" name="log_path_button" />
- <text type="string" length="1" name="text_box2">
+ <check_box
+ label="显示好友上线通知"
+ name="friends_online_notify_checkbox" />
+ <check_box label="保存即时通信记录到我的电脑上" name="log_instant_messages" />
+ <check_box label="保存对话记录到我的电脑上" name="log_chat" />
+ <check_box label="显示上次即时通信的结尾" name="log_show_history" />
+ <button label="更改路径" label_selected="更改路径" name="log_path_button" />
+ <text
+ name="text_box3">
忙碌模式的自动回复:
</text>
+ <text
+ name="text_box4">
+ 聊天记录选项:
+ </text>
+ <text type="string" length="1" name="text_box2">
+ 即时通信选项:
+ </text>
+ <check_box
+ label="在私聊中显示时间"
+ name="log_instant_messages_timestamp" />
+ <check_box
+ initial_value="false"
+ label="在聊天记录中显示时间"
+ name="log_chat_timestamp" />
+ <check_box
+ initial_value="false"
+ label="聊天记录中显示即时信息"
+ name="log_chat_IM" />
+ <check_box
+ initial_value="false"
+ label="显示时间时包括日期"
+ name="log_date_timestamp" />
+
+
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_input.xml b/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
index d7d1d33..74d1e61 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Input & Camera" name="Input panel">
+<panel label="输入和摄像头" name="Input panel">
<text type="string" length="1" name=" Mouselook Options:">
第一人称视角选项设置:
</text>
@@ -10,15 +10,36 @@
自动飞翔选项:
</text>
<text type="string" length="1" name=" Camera Options:">
- 摄像头选项:
+ 摄像机选项:
</text>
<text type="string" length="1" name="Camera Springiness:">
- 摄像头弹性:
- </text>
- <check_box label="转化鼠标操作模式" name="invert mouse" />
- <check_box label="起飞/着陆通过键盘up/down控制" name="automatic fly" />
- <check_box label="自动编辑摄像头移动情况" name="edit camera movement"
- tool_tip="当进入和离开编辑模式时，选用摄像头自动定位" />
- <check_box label="摄像头移动时自动成像" name="appearance camera movement"
- tool_tip="在编辑模式下，选用摄像头自动定位" />
+ 摄像机弹性:
+ </text>
+ <text
+ name="Camera Follow Distance:">
+ 摄像机跟随距离:
+ </text>
+ <text
+ name="Camera Transition Time:">
+ 摄像机转换时间:
+ </text>
+ <text
+ name="Camera Smoothing:">
+ 摄像头平滑:
+ </text>
+
+ <check_box label="反转鼠标操作模式" name="invert_mouse" />
+ <check_box label="起飞/着陆通过键盘上/下键控制" name="automatic_fly" />
+ <check_box label="编辑物体时使用自动视角" name="edit_camera_movement"
+ tool_tip="当进入和离开编辑模式时，自动移动摄像头" />
+ <check_box label="编辑外观时使用自动视角" name="appearance_camera_movement"
+ tool_tip="在编辑外观时，摄像头自动定位" />
+ <text name="text2">
+ 化身显示选项:
+ </text>
+ <check_box label="第一人称视角中，显示自己的化身" name="first_person_avatar_visible" />
+ <button
+ label="游戏杆设置"
+ name="joystick_setup_button" />
+
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_network.xml b/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
index 0adb918..679ec53 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="网络" name="network">
- <text type="string" length="1" name="text_box">
+ <text name="text_box">
最大带宽:
</text>
- <text type="string" length="1" name="text_box2">
+ <text name="text_box2">
kbps (每秒kb数)
</text>
- <text type="string" length="1" name="text_box3">
+ <text name="cache_size_label_l">
磁盘高速缓存大小:
</text>
- <radio_group name="disk cache">
- <radio_item type="string" length="1" name="radio">
- 50 MB
- </radio_item>
- <radio_item type="string" length="1" name="radio2">
- 200 MB
- </radio_item>
- <radio_item type="string" length="1" name="radio3">
- 500 MB
- </radio_item>
- <radio_item type="string" length="1" name="radio4">
- 1000 MB
- </radio_item>
- </radio_group>
- <button label="清除缓存" label_selected="清除缓存" name="clear_cache" />
+
+ <button label="清除缓存" name="clear_cache" />
+
+ <text name="cache_location_label">
+ 磁盘缓存位置:
+ </text>
+ <button
+ label="设置" label_selected="设置"
+ name="set_cache"/>
+ <button
+ label="重置" label_selected="设置"
+ name="reset_cache" />
+ <check_box
+ label="自定义连接端口"
+ name="connection_port_enabled" />
+ <spinner
+ label="端口号:"
+ name="connection_port" />
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml b/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
index 0d674b9..6eb1180 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
@@ -1,14 +1,39 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="弹出程序" name="popups">
- <text type="string" length="1" name="text_box">
- 不显示弹出程序:
+<panel
+ label="弹出窗口"
+ name="popups"
+ title="弹出窗口">
+ <text name="dont_show_label">
+ 不显示这些弹出窗口:
</text>
- <button label="Enable this popup" label_selected="Enable this popup"
- name="enable_popup" />
- <text type="string" length="1" name="text_box2">
- 显示弹出程序:
+ <scroll_list
+ name="disabled_popups" />
+ <button
+ label="启用该弹出窗口"
+ name="enable_popup" />
+ <text name="show_label">
+ 显示这些弹出窗口:
</text>
- <button label="重置 '下次显示'对话..."
- label_selected="重置 '下次显示'对话..."
- name="reset_dialogs_btn" />
+ <scroll_list
+ name="enabled_popups" />
+ <text
+ name="text_box2">
+ 其他人给与的记事卡、材质和地标:
+ </text>
+ <check_box
+ label="自动接受"
+ name="accept_new_inventory" />
+ <check_box
+ label="接受后自动打开"
+ name="show_new_inventory" />
+ <check_box label="在库存中自动显示新接收的物体"
+ name="show_in_inventory" />
+ <button width="225"
+ label="显示所有的“下次不再显示”对话框..."
+ name="reset_dialogs_btn"
+ tool_tip="启用所有可选的弹出窗口及“首次使用”提示。" />
+ <button width="225"
+ label="隐藏所有的“下次不再显示”对话框..."
+ name="skip_dialogs_btn"
+ tool_tip="禁用所有可选的弹出窗口及“首次使用”提示。" />
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml b/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
new file mode 100644
index 0000000..70e0bc2
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="皮肤" name="Skins panel">
+ <text name="muting_text">
+ 选择皮肤 (需要重启动)：
+ </text>
+ <radio_group name="skin_selection">
+ <radio_item name="default">默认</radio_item>
+ <radio_item name="silver">Silver</radio_item>
+ </radio_group>
+</panel>
+
+
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml b/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
new file mode 100644
index 0000000..faeae07
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+ height="408" hidden="false" label="语音聊天" left="102"
+ mouse_opaque="true" name="chat" width="517">
+ <text_editor name="voice_unavailable" >
+ 语音聊天不可用。
+ </text_editor>
+ <check_box
+ label="启用语音聊天"
+ name="enable_voice_check"/>
+ <radio_group name="ear_location" >
+ <radio_item name="0" >
+ 从摄像机的位置听语音聊天。
+ </radio_item>
+ <radio_item name="1" >
+ 从化身的位置听语音聊天。
+ </radio_item>
+ </radio_group>
+
+ <text name="push_to_talk_heading" >
+ 即按即说
+ </text>
+ <text_editor name="voice_chat_description" width="465">即按即说允许你控制什么时候传送声音。在切换模式中，按下并释放即按即说键来切换麦克风开关。不在切换模式的时候，麦克风仅在即按即说键按下时才有效。</text_editor>
+ <check_box
+ label="在第二人生查看器启动时，使用即按即说模式"
+ name="push_to_talk_check" />
+ <check_box label="以切换模式使用即按即说"
+ name="push_to_talk_toggle_check" />
+ <text type="string"
+ name="push_to_talk_label" >
+ 即按即说切换键:
+ </text>
+
+ <line_editor name="modifier_combo" />
+
+ <button
+ label="设置按键"
+ name="set_voice_hotkey_button" />
+ <button
+ label="使用鼠标中键"
+ name="set_voice_middlemouse_button" width="140" />
+
+ <text
+ name="privacy_heading">
+ 隐私选项
+ </text>
+ <check_box label="只接受我的朋友列表上的人的语音呼叫"
+ name="voice_call_friends_only_check" />
+
+ <text_editor name="device_settings_text" height="48" bottom_delta="-45">
+ *注意*: 运行设备选项或语音设置向导将临时将您从语音聊天断开，并且所作的更改将立即生效。
+ </text_editor>
+ <button
+ label="设备选项..."
+ name="device_settings_btn" />
+ <button
+ label="运行语音设置向导..."
+ name="launch_voice_wizard_button" />
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_web.xml b/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
new file mode 100644
index 0000000..c00c1e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+ height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
+ name="web" width="517">
+ <text name="cache_size_label_l">
+ 浏览器缓存:
+ </text>
+ <button
+ label="现在清除"
+ name="clear_cache" />
+ <text type="string" name="cookie_label" >
+ Cookie:
+ </text>
+ <check_box label="从网站接受 cookie"
+ name="cookies_enabled" />
+ <button
+ label="现在清除"
+ name="clear_cookies" />
+ <text name="proxy_label">
+ 代理服务器:
+ </text>
+ <check_box
+ label="启用网页代理服务器"
+ name="web_proxy_enabled" />
+ <text name="proxy_text_label">
+ 地址:
+ </text>
+ <line_editor
+ name="web_proxy_editor"
+ tool_tip="你想使用的代理服务器的名称或者 IP 地址" />
+ <spinner
+ label="端口号:"
+ name="web_proxy_port" />
+ <radio_group name="use_external_browser">
+ <radio_item
+ name="external"
+ tool_tip="使用系统默认网络浏览器打开帮助、网页链接, 等等。\n若全屏显示则不推荐使用。">
+ 使用外部浏览器(Firefox, Safari, Internet Explorer)
+ </radio_item>
+ <radio_item
+ name="internal"
+ tool_tip="使用内部浏览器打开帮助、网页链接, 等等。这个浏览器会在第二人生中打开一个新窗口。">
+ 使用内建浏览器
+ </radio_item>
+ </radio_group>
+ <text>
+ 浏览器主页:
+ </text>
+ <line_editor name="home_page" tool_tip="首次打开第二人生浏览器时的浏览页面" />
+ <text>
+ 代理服务器配置:
+ </text>
+ <check_box label="内部浏览器使用代理服务器" name="proxy_enabled"
+ tool_tip="请为因特网网络浏览器指定代理服务器配置。" />
+ <text>
+ 代理服务器:
+ </text>
+ <line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
+ <text>
+ 端口：
+ </text>
+ <line_editor name="proxy_port" />
+ <text>
+ 袜子：
+ </text>
+ <radio_group name="socks_4_5">
+ <radio_item>
+ Socks v4
+ </radio_item>
+ <radio_item>
+ Socks v5
+ </radio_item>
+ </radio_group>
+ <text>
+ 对以下内容不使用代理:
+ </text>
+ <line_editor name="proxy_exclusions"
+ tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
+ <check_box label="在元件上显示网页 (实验性功能, 需要重启)"
+ name="web_pages_on_prims_check" />
+ <text>
+ 安全地址：
+（登陆察看）
+ </text>
+ <button label="添加" name="add_trusted" />
+ <line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
+ <button label="移除" name="rem_trusted" />
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index 54fc8a9..2d242ed 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="契约合同" name="Covenant">
<text name="covenant_help_text">
- 对契约合同的更改将出现在此块不动产所有的土地上。
+ 对契约合同的更改将出现在此块地产所有的土地上。
</text>
<text name="region_name_lbl">
区域:
@@ -10,41 +10,41 @@
(未知)
</text>
<text name="estate_name_lbl">
- 私人领地:
+ 地产:
</text>
<text name="estate_name_text">
(未知)
</text>
<text name="covenent_instructions">
- 拖拽注释卡，以更改这块不动产的契约合同。
+ 要更改这块不动产的契约合同，请将记事卡拖动到这里。
</text>
<button label="?" name="covenant_help" />
- <button label="重至" name="reset_covenant" />
+ <button label="重置" name="reset_covenant" />
<text name="estate_owner_lbl">
- 不动产主人:
+ 地产持有人:
</text>
<text name="estate_owner_text">
(未知)
</text>
<text name="resellable_clause">
- 这块区域内被购买的土地可能可以被重新出售，也可能不能被重新出售。
+ 这块区域内购买的土地可能可以被重新出售，也可能不能被重新出售。
</text>
<text name="changeable_clause">
- 这块区域内被购买的土地可能可以被连接或划分，也可能不能被连接和划分。
+ 这块区域内购买的土地可能可以被合并或划分，也可能不能被合并和划分。
</text>
<text_editor name="covenant_editor">
请等待...
</text_editor>
<text name="can_resell">
- 这块区域内被购买的土地可以被重新出售.
+ 这块区域内购买的土地可以被重新出售。
</text>
<text name="can_not_resell">
- 这块区域内被购买的土地可能不能被重新出售。
+ 这块区域内购买的土地不能被重新出售。
</text>
<text name="can_change">
- 这块区域内被购买的土地可以被连接或者被划分。
+ 这块区域内购买的土地可以被合并或者被划分。
</text>
<text name="can_not_change">
- 这块区域内被购买的土地可能不能被联系或者被划分。
+ 这块区域内购买的土地不能被合并或者被划分。
</text>
</panel>
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 31e0672..780f6ea 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -6,29 +6,62 @@
<text name="region_text">
未知
</text>
- <check_box label="无效脚本" name="disable_scripts_check"
- tool_tip="关闭此区域内的所有脚本文件。" />
- <button label="?" name="disable_scripts_help" />
- <check_box label="无效冲突" name="disable_collisions_check"
- tool_tip="在此区域你关闭非化身的冲突模式。" />
- <button label="?" name="disable_collisions_help" />
- <check_box label="无效物理" name="disable_physics_check"
- tool_tip="在此区域内关闭所有的物理模式。" />
- <button label="?" name="disable_physics_help" />
+ <check_box label="禁用脚本" name="disable_scripts_check"
+ tool_tip="关闭此区域内的所有脚本。" />
+
+ <check_box label="禁用碰撞" name="disable_collisions_check"
+ tool_tip="关闭此区域除化身以外所有的碰撞。" />
+
+ <check_box label="禁用物理" name="disable_physics_check"
+ tool_tip="关闭此区域内所有的物理计算。" />
<button label="应用" name="apply_btn" />
- <button label="选择化身..." name="choose_avatar_btn" />
+ <text
+ name="objret_text_lbl">
+ 归还物体
+ </text>
+ <text
+ name="resident_text_lbl">
+ 居民:
+ </text>
+ <line_editor
+ name="target_avatar_name">
+ (无)
+ </line_editor>
+
+ <button label="选择..." name="choose_avatar_btn" />
+ <text
+ name="options_text_lbl">
+ 选项:
+ </text>
+
+ <check_box
+ label="仅归还有脚本的物体"
+ name="return_scripts"
+ tool_tip="只归还那些包含脚本的物体。" />
+ <check_box
+ label="仅归还在他人土地上的物体"
+ name="return_other_land"
+ tool_tip="只归还在属于别人土地上的物体。" />
+ <check_box
+ label="归还该地产所有区域中的物体"
+ name="return_estate_wide"
+ tool_tip="在所有组成这个地产的区域中归还物体。" />
+ <button
+ label="返还"
+ name="return_btn" />
+
<button label="归还化身的脚本东东至他人土地"
name="return_scripted_other_land_btn" />
<button label="归还化身所有的脚本东东" name="return_scripted_all_btn" />
- <button label="得到首要冲突源..." name="top_colliders_btn"
- tool_tip="最有可能面临潜在冲突的东东的列表。" />
+ <button label="得到首要碰撞源..." name="top_colliders_btn"
+ tool_tip="存在潜在碰撞最多物体的列表。" />
<button label="?" name="top_colliders_help" />
<button label="得到首要脚本..." name="top_scripts_btn"
- tool_tip="最耗时间运行脚本文档的东东的列表。" />
+ tool_tip="脚本运行最费时间物体的列表。" />
<button label="?" name="top_scripts_help" />
- <button label="重新进入地区" name="restart_btn"
- tool_tip="实施2分钟倒计时，并且重新启动此区域。" />
+ <button label="重新启动区域" name="restart_btn"
+ tool_tip="2 分钟倒计时后，重新启动此区域。" />
<button label="?" name="restart_help" />
- <button label="取消重新启动" name="cancel_restart_btn"
- tool_tip="撤销区域重起模式" />
+ <button label="延迟重新启动" name="cancel_restart_btn"
+ tool_tip="延迟区域重新启动一小时。" />
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index e09603b..6da1456 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="私人领地" name="Estate">
+<panel label="地产" name="Estate">
<text name="estate_help_text">
- 更改该桌面的设置会影响所有区域内的领地状况。
+ 对该选项卡中设定的更改会影响到
+地产内所有的区域。
</text>
<text name="estate_text">
- 私人领地:
+ 地产:
</text>
<text name="estate_name">
(未知)
@@ -16,22 +17,38 @@
(未知)
</text>
<text name="estate_manager_label">
- 领地经理人:
+ 经理人:
</text>
- <button label="?" name="estate_manager_help" />
<button label="添加..." name="add_estate_manager_btn" />
- <button label="移除e..." name="remove_estate_manager_btn" />
+ <button label="移除..." name="remove_estate_manager_btn" />
<check_box label="使用国际时间" name="use_global_time_check" />
- <button label="?" name="use_global_time_help" />
<check_box label="太阳固定" name="fixed_sun_check" />
- <button label="?" name="fixed_sun_help" />
- <slider label="状态" name="sun_hour_slider" />
+ <slider label="相位" name="sun_hour_slider" />
<check_box label="从大陆可视" name="externally_visible_check" />
- <button label="?" name="externally_visible_help" />
- <check_box label="从此处可以看见整个大陆" name="mainland_visible_check" />
- <button label="?" name="mainland_visible_help" />
- <check_box label="允许直接闪电传送" name="allow_direct_teleport" />
- <button label="?" name="allow_direct_teleport_help" />
+ <check_box label="从此处可以看见大陆" name="mainland_visible_check" />
+<text
+ name="Only Allow">
+ 限制访问到:
+ </text>
+ <check_box
+ label="支付信息在案的居民"
+ name="limit_payment"
+ tool_tip="封禁没有验证的居民。" />
+ <check_box
+ label="通过年龄验证的成年人"
+ name="limit_age_verified"
+ tool_tip="封禁没有验证年龄的居民。详细信息请参见 support.secondlife.com 。" />
+ <check_box
+ label="允许语音聊天"
+ name="voice_chat_check" />
+ <text
+ name="abuse_email_text">
+ 不良行为报告电子邮件地址:
+ </text>
+ <string
+ name="email_unsupported">不支持的功能</string>
+
+ <check_box label="允许直接瞬间移动" name="allow_direct_teleport" />
<text name="region_text_lbl">
拒绝通往支付情况信息:
</text>
@@ -40,23 +57,23 @@
<check_box label="否认使用过的支付信息" name="deny_transacted" />
<button label="应用" name="apply_btn" />
<text name="allow_resident_label">
- 允许居民:
+ 允许的居民:
</text>
<button label="?" name="allow_resident_help" />
<button label="添加..." name="add_allowed_avatar_btn" />
- <button label="移除e..." name="remove_allowed_avatar_btn" />
+ <button label="移除..." name="remove_allowed_avatar_btn" />
<text name="allow_group_label">
- 获准的社团:
+ 允许的社团:
</text>
<button label="?" name="allow_group_help" />
<button label="添加..." name="add_allowed_group_btn" />
- <button label="移除e..." name="remove_allowed_group_btn" />
+ <button label="移除..." name="remove_allowed_group_btn" />
<text name="ban_resident_label">
- 受限居民:
+ 封禁的居民:
</text>
<button label="?" name="ban_resident_help" />
<button label="添加..." name="add_banned_avatar_btn" />
- <button label="移除e..." name="remove_banned_avatar_btn" />
- <button label="发消息至独立产业..." name="message_estate_btn" />
- <button label="将用户从状态…踢走" name="kick_user_from_estate_btn" />
+ <button label="移除..." name="remove_banned_avatar_btn" />
+ <button label="向地产发送消息..." name="message_estate_btn" />
+ <button label="从地产将用户踢走..." name="kick_user_from_estate_btn" />
</panel>
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 0439f12..63dfe78 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -6,37 +6,43 @@
<text name="region_text">
未知
</text>
- <check_box label="锁定外形" name="block_terraform_check" />
- <button label="?" name="terraform_help" />
+ <text
+ name="version_channel_text_lbl">
+ 版本:
+ </text>
+ <text
+ name="version_channel_text">
+ 未知
+ </text>
+
+
+ <check_box label="锁定地形" name="block_terraform_check" />
<check_box label="锁定飞翔" name="block_fly_check" />
- <button label="?" name="fly_help" />
- <check_box label="允许损坏" name="allow_damage_check" />
- <button label="?" name="damage_help" />
+ <check_box label="允许伤害" name="allow_damage_check" />
<check_box label="限制推动" name="restrict_pushobject" />
- <button label="?" name="restrict_pushobject_help" />
<check_box label="允许土地转卖" name="allow_land_resell_check" />
- <button label="?" name="land_resell_help" />
- <check_box label="允许土地联合/分割" name="allow_parcel_changes_check" />
- <button label="?" name="parcel_changes_help" />
- <spinner label="代理限制" name="agent_limit_spin" />
- <button label="?" name="agent_limit_help" />
- <spinner label="奖励东东" name="object_bonus_spin" />
- <button label="?" name="object_bonus_help" />
+ <check_box label="允许土地合并/分割" name="allow_parcel_changes_check" />
+ <check_box
+ label="不要在搜索中显示土地"
+ name="block_parcel_search_check"
+ tool_tip="让人们在搜索结果中看到这个区域和它的地块" />
+ <spinner label="化身数目限制" name="agent_limit_spin" />
+ <spinner label="额外物体因数" name="object_bonus_spin" />
<text label="成人内容" name="access_text">
成人内容:
</text>
<combo_box label="成人" name="access_combo">
<combo_item name="PG">
- 在家长指导下的未成年人
+ 非限制级
</combo_item>
<combo_item name="Mature">
- 成人
+ 限制级
</combo_item>
</combo_box>
<button label="?" name="access_help" />
<button label="应用" name="apply_btn" />
- <button label="闪电传送一个用户回家..." name="kick_btn" />
- <button label="所有用户闪电传送回家..." name="kick_all_btn" />
- <button label="发送即时消息往…区域" name="im_btn" />
- <button label="管理降落点..." 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_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 3f6a408..73ec61a 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -10,21 +10,21 @@
<button label="?" name="water_height_help" />
<spinner label="地形提高限制" name="terrain_raise_spin" />
<button label="?" name="terrain_raise_help" />
- <spinner label="地形较低限制" name="terrain_lower_spin" />
+ <spinner label="地形降低限制" name="terrain_lower_spin" />
<button label="?" name="terrain_lower_help" />
- <check_box label="使用领地太阳" name="use_estate_sun_check" />
+ <check_box label="使用地产太阳" name="use_estate_sun_check" />
<button label="?" name="use_estate_sun_help" />
<check_box label="太阳固定" name="fixed_sun_check" />
<button label="?" name="fixed_sun_help" />
- <slider label="状态" name="sun_hour_slider" />
+ <slider label="相位" name="sun_hour_slider" />
<button label="应用" name="apply_btn" />
- <button label="下载 RAW地形..." name="download_raw_btn"
+ <button label="下载 RAW 地形..." name="download_raw_btn"
tool_tip="只对地产所有人开放而不对经理人开放。" />
<button label="?" name="download_raw_help" />
- <button label="上传RAW格式地形..." name="upload_raw_btn"
+ <button label="上传 RAW 地形..." name="upload_raw_btn"
tool_tip="只对地产所有人开放而不对经理人开放。" />
<button label="?" name="upload_raw_help" />
- <button label="硬地" name="bake_terrain_btn"
+ <button label="烘烤" name="bake_terrain_btn"
tool_tip="设置目前地形为上升/下降极限的中点。" />
<button label="?" name="bake_terrain_help" />
</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 93c86cb..4595a24 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_texture.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="地面材料" name="Textures">
+<panel label="地面材质" name="Textures">
<text name="region_text_lbl">
区域:
</text>
<text name="region_text">
未知
</text>
- <text name="base_texture_text">
- 基本质地（需要128*128，24bit.tga字节)
+ <text name="detail_texture_text">
+ 地面材质（要求 512×512, 24位 .tga 文件格式)。
</text>
<text name="height_text_lbl">
1 (低)
@@ -21,34 +21,20 @@
<text name="height_text_lbl4">
4 (高)
</text>
- <text name="detail_texture_text">
- 详细质地（要求512*512（分辨率），24bit.tga文件格式。
- </text>
+
<text name="height_text_lbl5">
- 1 (低)
+ 材质标高范围
</text>
<text name="height_text_lbl6">
- 2
- </text>
- <text name="height_text_lbl7">
- 3
- </text>
- <text name="height_text_lbl8">
- 4 (高)
- </text>
- <text name="height_text_lbl9">
- 材质范围
- </text>
- <text name="height_text_lbl10">
西南
</text>
- <text name="height_text_lbl11">
+ <text name="height_text_lbl7">
西北
</text>
- <text name="height_text_lbl12">
+ <text name="height_text_lbl8">
东南
</text>
- <text name="height_text_lbl13">
+ <text name="height_text_lbl9">
东北
</text>
<spinner label="低" name="height_start_spin_0" />
@@ -59,14 +45,14 @@
<spinner label="高" name="height_range_spin_1" />
<spinner label="高" name="height_range_spin_2" />
<spinner label="高" name="height_range_spin_3" />
- <text name="height_text_lbl14">
- These values represent the blend range for the textures above.
+ <text name="height_text_lbl10">
+ 这些值代表了以上材质的混合范围。
</text>
- <text name="height_text_lbl15">
- 测量单位为米，最低值是一号材质的最大高度。
+ <text name="height_text_lbl11">
+ 单位为米，最低值是一号材质的最大高度。
</text>
- <text name="height_text_lbl16">
- 并且最高值是4#材质的最低高度。
+ <text name="height_text_lbl12">
+ 而最高值是四号材质的最小高度。
</text>
<button label="应用" name="apply_btn" />
</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml b/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
new file mode 100644
index 0000000..a38236d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="active_speakers_panel">
+ <string
+ name="moderator_label">(管理员)</string>
+ <layout_stack>
+ <layout_panel
+ min_height="25"
+ name="moderation_mode_panel"
+ top_delta="0"
+ visible="false">
+ <combo_box
+ name="moderation_mode">
+ <combo_item
+ value="unmoderated">语音默认打开</combo_item>
+ <combo_item
+ value="moderated">语音默认关闭</combo_item>
+ </combo_box>
+ </layout_panel>
+
+ <layout_panel
+ name="moderate_chat_panel">
+ <scroll_list
+ name="speakers_list">
+ <column
+ label="名字"
+ name="speaker_name" />
+ </scroll_list>
+
+ <panel
+ name="speaker_controls">
+ <text
+ name="resident_name"
+ valign="center">Rumplstiltskin Califragilistic</text>
+ <button
+ label=""
+ name="mute_btn"
+ tool_tip="将该居民的语音音量设置为静音" />
+ <check_box
+ name="mute_text_btn"
+ label="屏蔽文字聊天" />
+ </panel>
+ </layout_panel>
+ <layout_panel
+ name="moderator_controls"
+ top_delta="0"
+ visible="false">
+ <text
+ right="-5"
+ name="moderator_controls_label">管理员控制:</text>
+ <check_box
+ name="moderator_allow_voice"
+ right="-5">允许语音聊天</check_box>
+ <check_box
+ name="moderator_allow_text"
+ right="-5">允许文字聊天</check_box>
+ </layout_panel>
+
+ </layout_stack>
+</panel>
+<!--Translated for Second Life 1.19.0 (79185)-->
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 cb5493c..66783a9 100644
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -1,28 +1,37 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="status">
- <text type="string" length="1" name="ParcelNameText"
- tool_tip="Name of land parcel on which you are standing. Click for About Land.">
+ <text name="ParcelNameText"
+ tool_tip="你现在所在的地块的名称。点击打开 ‘关于土地’ 窗口。">
土地的名称在此
</text>
- <text type="string" length="1" name="BalanceText" tool_tip="帐户余额。">
- L$
+ <text name="BalanceText" tool_tip="帐户余额。">
+ 请稍候...
</text>
- <button label="" label_selected="" name="buycurrency" tool_tip="购买货币" />
- <text type="string" length="12" name="TimeText" tool_tip="当前时间（太平洋时区）">
+ <button name="buycurrency" tool_tip="购买货币" />
+ <text name="TimeText" tool_tip="当前时间（太平洋时区）">
12:00 AM
</text>
- <button label="" label_selected="" name="scriptout" tool_tip="脚本警告及错误。" />
- <button label="" label_selected="" name="health" tool_tip="健康" />
- <text type="string" length="1" name="HealthText" tool_tip="健康">
+ <string name="StatBarDaysOfWeek">
+ 星期日:星期一:星期二:星期三:星期四:星期五:星期六
+ </string>
+ <string name="StatBarMonthsOfYear">
+ 一月:二月:三月:四月:五月:六月:七月:八月:九月:十月:十一月:十二月
+ </string>
+ <button name="scriptout" tool_tip="脚本警告及错误。" />
+ <button name="health" tool_tip="健康" />
+ <text name="HealthText" tool_tip="健康">
100%
</text>
- <button label="" label_selected="" name="fly" tool_tip="无法飞行" />
- <button label="" label_selected="" name="build" tool_tip="无建筑" />
- <button label="" label_selected="" name="scripts" tool_tip="无脚本" />
- <button label="" label_selected="" name="restrictpush" tool_tip="限制 llPushObject" />
- <button label="" label_selected="" name="buyland" tool_tip="购买这块土地" />
+ <button name="fly" tool_tip="不允许飞行" />
+ <button name="build" tool_tip="不允许建造" />
+ <button name="scripts" tool_tip="不允许脚本" />
+ <button name="restrictpush" tool_tip="不允许推动" />
+ <button name="status_no_voice" tool_tip="此处语音不可用" />
+ <button name="buyland" tool_tip="购买这块土地" />
+ <line_editor label="搜索" name="search_editor" tool_tip="搜索 Second Life" />
+ <button name="search_btn" tool_tip="搜索 Second Life" />
<text name="packet_loss_tooltip">
- 损失打包
+ 封包丢失率
</text>
<text name="bandwidth_tooltip">
带宽
diff --git a/indra/newview/skins/default/xui/zh/panel_toolbar.xml b/indra/newview/skins/default/xui/zh/panel_toolbar.xml
index 8bdf2dd..e9c381d 100644
--- a/indra/newview/skins/default/xui/zh/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_toolbar.xml
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="toolbar">
+ <string name="Redock Windows">
+ 恢复停靠窗口
+ </string>
<layout_stack name="toolbar_stack">
- <button label="即时通" name="im_btn" tool_tip="用即时通联系你的朋友。" />
- <button label="" name="chat_btn"
- tool_tip="与附近的人交谈.点击交谈之后点击历史去查找交谈记录。" />
- <button label="伙伴"" name="friends_btn"
- tool_tip="查找并与你的好朋友交流。" />
- <button label="飞翔" label_selected="停止飞翔" name="fly_btn"
- tool_tip="开始飞行。使用EC或者PgUp/PgDn来控制飞行高度。" />
- <button label="快照" name="snapshot_btn"
- tool_tip="将屏幕截图保存到硬盘或清单中." />
- <button label="搜索" name="directory_btn"
- tool_tip="搜索地区，时间，任务以及更多。" />
- <button label="建造" name="build_btn" tool_tip="创建新的东东" />
- <button label="迷你地图" name="radar_btn"
- tool_tip="你周围区域的地图。 (Ctrl-Shift-M)" />
- <button label="地图" name="map_btn" tool_tip="全部完整地图。 (Ctrl-M)" />
- <button label="库存" name="inventory_btn" tool_tip="你的东东栏。 (Ctrl-I)" />
- </layout_stack>
+ <button label="即时通" name="im_btn" tool_tip="用即时通联系你的朋友。" />
+ <button label="" name="chat_btn" tool_tip="显示聊天栏。(回车键)" />
+ <flyout_button label="交流" name="communicate_btn"
+ tool_tip="查找并与你的好友和社团交流。" />
+ <button label="飞翔" label_selected="停止飞翔" name="fly_btn"
+ tool_tip="开始飞行。使用E/C键或者PgUp/PgDn来控制飞行高度。" />
+ <button label="快照" name="snapshot_btn"
+ tool_tip="将屏幕截图保存到硬盘或库存中。" />
+ <button label="搜索" name="directory_btn"
+ tool_tip="搜索地点，事件，人物以及更多。" />
+ <button label="建造" name="build_btn" tool_tip="创建新的物品。" />
+ <button label="迷你地图" name="radar_btn"
+ tool_tip="你周围区域的地图。 (Ctrl-Shift-M)" />
+ <button label="地图" name="map_btn" tool_tip="世界地图。 (Ctrl-M)" />
+ <button label="库存" name="inventory_btn" tool_tip="你的物品栏。 (Ctrl-I)" />
+ </layout_stack>
</panel>
+<!-- Translated for Second Life 1.19.0 (80267) -->
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_controls.xml b/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
new file mode 100644
index 0000000..4ff2f81
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="voice_controls">
+ <button label="" name="speakers_btn"
+ tool_tip="显示你周围使用语音聊天的居民" />
+ <button label="交谈" name="push_to_talk" tool_tip="按住按钮来通话" />
+ <button label="" name="ptt_lock" tool_tip="点击锁来切换到通话模式" />
+ <button label="" name="show_channel" tool_tip="显示当前的语音频道" />
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_enable.xml b/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
new file mode 100644
index 0000000..84444e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="content_panel">
+
+ <text_editor name="voice_intro_text1" word_wrap="true">
+ 欢迎使用 Second Life 语音聊天! 语音聊天让你可以与其他居民进行口头交流。该向导会帮助你完成设置语音聊天的各个步骤。请注意语音聊天需要带麦克风的立体声耳机；点击帮助按钮了解更多信息。
+ </text_editor>
+
+ <text_editor name="voice_intro_text2" word_wrap="true">
+ 您现在想要启用语音聊天吗？
+ </text_editor>
+ <radio_group name="voice_enable">
+ <radio_item name="1">当然，启用语音聊天。</radio_item>
+ <radio_item name="0">不要就是不要，现在不启用语音聊天</radio_item>
+ </radio_group>
+
+ <text_editor
+ name="voice_intro_text3"
+ word_wrap="true">你可以在任何时候，在偏好设置的语音聊天选项卡中启用启用语音聊天。</text_editor>
+
+ <text_editor
+ name="voice_intro_text4"
+ word_wrap="true">点击继续按钮来设置语音聊天选项，或者点击完成继续使用 Second Life。</text_editor>
+
+ </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_options.xml b/indra/newview/skins/default/xui/zh/panel_voice_options.xml
new file mode 100644
index 0000000..5115652
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_voice_options.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="content_panel">
+ <text_editor
+ name="voice_intro_text1"
+ word_wrap="true">
+ 使用以下的选项设置你的语音聊天体验。
+ </text_editor>
+ <radio_group
+ draw_border="false"
+ name="ear_location" >
+ <radio_item
+ name="0">
+ 从摄像机的位置听语音聊天。
+ </radio_item>
+ <radio_item
+ name="1" >
+ 从化身的位置听语音聊天。
+ </radio_item>
+ </radio_group>
+ <check_box
+ initial_value="false"
+ label="只接受我的朋友列表上的人的语音呼叫"
+ name="push_to_talk_check" />
+ <check_box
+ initial_value="false"
+ label="在查看器启动时，使用即按即说"
+ name="push_to_talk_check" />
+ <check_box
+ initial_value="false"
+ label="以切换模式使用即按即说"
+ name="push_to_talk_toggle_check" />
+ <text
+ name="push_to_talk_label"
+ word_wrap="true">
+ 即按即说切换键:
+ </text>
+ <line_editor
+ name="modifier_combo" />
+ <button
+ label="设置按键"
+ name="set_voice_hotkey_button" />
+ <button
+ label="使用鼠标中键"
+ name="set_voice_middlemouse_button" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml b/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..67695f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="voice_remote">
+ <button label="" name="end_call_btn" tool_tip="结束通话" />
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 9f6f957..c7b4733 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -1,183 +1,204 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<role_actions>
<action_set
- description="这些能力包括添加或移除社团成员的权利，并且有权利接纳没有邀请函的成员"
+ description="这些能力包括添加或移除社团成员，以及允许新团员不经过邀请就可以加入的权利。"
name="Membership">
- <action description="邀请朋友加入社团"
- longdescription="Invite People to this Group using the 'Invite New Person...' button in the Members & Roles tab > Members sub-tab."
+ <action description="邀请加入社团"
+ longdescription="使用 ‘会员和角色’ 标签页 > ‘会员’子标签页下的 ‘邀请一个新人 ...’ 按钮邀请别人加入这个社团。"
name="member invite" value="1" />
- <action description="从社团驱逐会员"
- longdescription="Eject Members from this Group using the 'Eject From Group' button in the Members & Roles tab > Members sub-tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability."
+ <action description="从社团驱逐团员"
+ longdescription="使用 ‘会员和角色’ 标签页 > ‘会员’ 子标签页下的 ‘从社团中驱逐’ 按钮将团员从社团关于土地 > 一般踢出。一位 ‘团长’ 可以驱逐除了另一位 ‘团长’ 以外的所有人。如果您不是 ‘团长’，团员只有当且仅当他们只有 ‘普通人’ 角色，而 *没有* 其他角色的时候，才可以被驱逐。要将团员从角色移除，你需要有 ‘从角色移除会员’ 的能力。"
name="member eject" value="2" />
- <action description="绑定 '打开登记'并更改'登记费用'"
- longdescription="Toggle 'Open Enrollment' to let new Members join without an invitation, and change 'Signup Fee' in the Group Preferences section of the General tab."
+ <action description="切换 ‘公开注册’ 并更改 ‘注册费用‘ "
+ longdescription="切换 ‘公开注册’ 来让新会员不需要邀请就可以加入，并且更改一般标签页下社团偏好设定一栏中的 ‘注册费用’。"
name="member options" value="3" />
</action_set>
<action_set
description="这些能力包括添加，移除或改变社团角色的权利，从角色中添加或移除组员的权利，以及为角色分配能力的权利"
name="Roles">
<action description="创建新角色"
- longdescription="Create new Roles in the Members & Roles tab > Roles sub-tab."
+ longdescription="在 ‘会员和角色’ 标签页 > ‘角色’ 子标签页下创建角色。"
name="role create" value="4" />
<action description="删除角色"
- longdescription="Delete Roles in the Members & Roles tab > Roles sub-tab."
+ longdescription="在 ‘会员和角色’ 标签页 > ‘角色’ 子标签页下删除角色。"
name="role delete" value="5" />
<action description="改变角色的名字, 头衔和其他描述"
- longdescription="Change Role names, titles, and descriptions at the bottom of the the Members & Roles tab > Roles sub-tab after selecting a Role."
+ longdescription="选择角色后，在 ‘会员和角色’ 标签页 > ‘角色’ 子标签页下改变角色的名字、头衔和其他描述。"
name="role properties" value="6" />
<action description="给会员分配分配者的角色"
- longdescription="Assign Members to Roles in the Assigned Roles section of the Members & Roles tab > Members sub-tab. A member with this power can only add members to a role the assigner is already in."
+ longdescription="在 ‘会员和角色’ 标签页 > ‘会员’ 子标签页下给团员分配 ‘已分配的角色’ 一栏中的角色。有这个能力的团员只能给团员添加分配者已经有的角色。"
name="role assign member limited" value="7" />
<action description="给会员分配任何角色"
- longdescription="Assign Members to Any Role in the Assigned Roles section of the Members & Roles tab > Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability."
+ longdescription="在 ‘会员和角色’ 标签页 > ‘会员’ 子标签页下给团员分配任意角色。 *警告* 任何具有该角色的会员拥有这项能力后，都可以给他们自己——以及任何其他的会员各种角色——分配权利比他们目前所拥有的权利大得多的角色，并可能提拔他们自己到相近于团长权利的位置上。请在分配这项能力之前确定自己这么做将带来的后果。"
name="role assign member" value="8" />
<action description="禁止会员继续扮演该项角色"
- longdescription="Remove Members from Roles in the Assigned Roles section of the Members & Roles tab > Members sub-tab. Owners can't be removed."
+ longdescription="在 ‘会员和角色’ 标签页 > ‘角色’ 子标签页下从移除会员的角色。团长不能被移除。"
name="role remove member" value="9" />
- <action description="分配或移除角色的能力"
- longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members & Roles tab > Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability."
+ <action description="分配或移除角色能力"
+ longdescription="在 ‘会员和角色’ 标签页 > ‘角色’ 子标签页下为角色分配或移除能力的能力。*警告* 任何具有该角色的会员拥有这项能力后，都可以给他们自己——或者其他会员——分配所有的能力，甚至可以提拔他们自己到相近于团长权利的位置上。请在分配这项能力之前确定自己这么做将带来的后果。"
name="role change actions" value="10" />
</action_set>
<action_set
- description="这些能力包括修改社团身份的权利，例如更改公众可见度，宪章和徽章"
+ description="这些能力包括修改社团标识的权利，例如更改公众可见度、宪章和徽章"
name="Group Identity">
<action
- description="改变宪章,徽章, '在网络上发布',公开会员在社团中的信息"
- longdescription="Change Charter, Insignia, 'Publish on the Web', and which members are publicly visible in Group Information. This is done in the General tab."
+ description="改变宪章、徽章、 ‘在搜索中显示‘"
+ longdescription="改变宪章、徽章、 ‘在搜索中显示‘。这些动作在 ‘一般’ 标签页中完成。"
name="group change identity" value="11" />
</action_set>
<action_set
- description="这些能力包括转让，修改，并出售社团所拥有的部分土地的权利。转到“关于土地“窗口，点击右键并选择“关于土地...“，或者点击在菜单条上的土地信息。"
+ description="这些能力包括转让、修改、并出售社团所拥有的土地的权利。要转到 “关于土地” 窗口，在地面上点击右键并选择 “关于土地...”，或者点击在菜单条上的土地信息。"
name="Parcel Management">
<action description="转让土地或购买土地给社团"
- longdescription="Deed land and buy land for group. This is done in About Land > General tab."
+ longdescription="转让土地，以及为社团购买土地。这在 关于土地 > 一般 标签页中完成。"
name="land deed" value="12" />
- <action description="把土地放弃还给林登长官"
- longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land > General tab, reverting it to Linden ownership without a sale! Be sure you know what you're doing before assigning this Ability."
+<!-- 不是说过 Governor Linden 不翻译吗?! -->
+ <action description="把土地放弃还给 Governor Linden"
+ longdescription="放弃土地，转移所有权给 Governor Linden。 *警告* 任何具有该角色的会员拥有这项能力后，都可以在 关于土地 > 一般 选项卡中放弃土地，将其返还为林登所有而不需要通过交易! 请在分配这项能力之前确定自己这么做将带来的后果。"
name="land release" value="13" />
- <action description="设置待售土地的信息"
- longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land > General tab as they wish! Be sure you know what you're doing before assigning this Ability."
+ <action description="设置土地待售信息"
+ longdescription="设置土地待售信息。 *警告* 任何具有该角色的会员拥有这项能力后都可以在 关于土地 > 一般 选项卡中任意销售社团拥有的土地! 请在分配这项能力之前确定自己这么做将带来的后果。"
name="land set sale info" value="14" />
- <action description="划分并加入土地"
- longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. "
+ <action description="分割及合并土地"
+ longdescription="分割及合并地块。 右键点击地面，选择 ‘编辑地形’，然后拖动鼠标选择土地。要分割土地，选择想要分割的区域然后点击 ‘分割...’。 要合并，选择两个或两个以上相邻的地块，然后点击 ‘合并...’。"
name="land divide join" value="15" />
</action_set>
<action_set
description="这些能力包括改变土地名称和发布设置，查找目的地可见度，选择着陆点和闪电传运点的路线的权利。"
name="Parcel Identity">
- <action description="绑定'在查找地点中显示'并设定分类"
- longdescription="Toggle 'Show in Find Places' and setting a parcel's category in About Land > Options tab."
+ <action description="切换 ‘在查找地点中显示’ 并设定分类"
+ longdescription="关于土地 > 选项 标签页中切换 ‘在查找地点中显示’，并设定地块的分类。"
name="land find places" value="17" />
<action
- description="改变土地名称, 描述和 '在网络上发布'的设置"
- longdescription="Change parcel name, description, and 'Publish on the Web' settings. This is done in About Land > Options tab."
+ description="改变土地名称、描述和 ‘在网络上发布’ 的设置"
+ longdescription="改变土地名称、描述和 ‘在网络上发布’ 的设置。这些动作在 关于土地 > 选项 标签页中完成。"
name="land change identity" value="18" />
- <action description="设置着陆点，并设置闪电传送路径"
- longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land > Options tab."
+ <action description="设置着陆点并设置瞬间移动路径"
+ longdescription="在社团用有的地块上，具有拥有这项能力的角色的会员可以设定着陆点，也就是瞬间移动抵达的位置，以及详细控制瞬间移动路径。这些动作在 关于土地 > 选项 标签页中完成。"
name="land set landing point" value="19" />
</action_set>
<action_set
- description="这些能力包括影响影响土地选项的权利，例如“创建东东”，“编辑地形”，音乐和媒体设置等。"
+ description="这些能力包括影响影响土地选项的权利，例如 “创建物体”，“编辑地形”，音乐和媒体设置等。"
name="Parcel Settings">
<action description="改变音乐和多媒体设置"
- longdescription="Change streaming music and movie settings in About Land > Media tab."
+ longdescription="在关于土地 > 选项 标签页中改变音乐和多媒体设置。"
name="land change media" value="20" />
- <action description="绑定'编辑地形'"
- longdescription="Toggle 'Edit Terrain'. *WARNING* About Land > Options tab > Edit Terrain allows anyone to terraform your land's shape, and place and move Linden plants. Be sure you know what you're doing before assigning this Ability. Editing terrain is toggled in About Land > Options tab."
+ <action description="切换 '编辑地形'"
+ longdescription="切换 '编辑地形'。 *警告* 关于土地 > 选项 > 编辑地形 允许任何人编辑土地的地形，以及放置或移动林登植被。请在分配这项能力之前确定自己这么做将带来的后果。编辑地形 在 关于土地 > 选项 下。"
name="land edit" value="21" />
- <action description="绑定各项步骤：关于土地>选择设定"
- longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Create Objects', 'Edit Terrain', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab."
+ <action description="编辑各种 关于土地 > 选项 下的设置"
+ longdescription="在关于土地 > 选项 标签页中切换 ‘安全 (无损伤)’、 ‘飞翔’, 以及允许其他居民在社团所拥有的土地上: ‘创建物体’、 ‘编辑地形’、 ‘创造地标’、 以及 ‘运行脚本‘。"
name="land options" value="22" />
</action_set>
<action_set
- description="这些能力包括允许组员绕过社团拥有土地的限制的权利"
+ description="这些能力包括允许团员绕过社团拥有土地上的限制的权限。"
name="Parcel Powers">
<action description="永远允许 '编辑地形'"
- 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."
+ longdescription="具有拥有这项能力的角色的会员可以在社团拥有的地块上编辑地形，即使 关于土地 > 选项 中的相关设置被关闭。"
name="land allow edit land" value="23" />
- <action description="永远允许 '起飞'"
- 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."
+ <action description="永远允许 '飞翔'"
+ longdescription="具有拥有这项能力的角色的会员可以在社团拥有的地块上飞行，即使 关于土地 > 选项 中的相关设置被关闭。"
name="land allow fly" value="24" />
- <action description="永远允许'创建东东'"
- 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."
+ <action description="永远允许'创建物体'"
+ longdescription="具有拥有这项能力的角色的会员可以在社团拥有的地块上创建物体，即使 关于土地 > 选项 中的相关设置被关闭。"
name="land allow create" value="25" />
<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."
+ longdescription="具有拥有这项能力的角色的会员可以创建社团拥有的地块的地标，即使 关于土地 > 选项 中的相关设置被关闭。"
name="land allow landmark" value="26" />
<action description="允许在社团土地上'把家建在这里'"
- longdescription="Members in a Role with this Ability can use World menu > Set Home to Here on a group parcel (either land set or deeded to this group)."
+ longdescription="具有拥有这项能力的角色的会员可以在社团的土地上使用 世界菜单 > 把家设在这里 (无论是捐献的还是持有的)。"
name="land allow set home" value="28" />
</action_set>
<action_set
- description="这些能力包括允许或限制通往社团拥有的土地的权利，包括冻结和驱逐组员权利。"
+ description="这些能力包括允许或限制访问社团拥有的土地的权限，包括冻结和驱逐居民的权限。"
name="Parcel Access">
- <action description="管理可进入土地名单"
- longdescription="Manage parcel Access lists in About Land > Access tab."
+ <action description="管理土地允许进入名单"
+ longdescription="在 关于土地 > 访问 标签页下管理允许进入名单。"
name="land manage allowed" value="29" />
- <action description="管理不可进入土地名单"
- longdescription="Manage parcel Ban lists in About Land > Ban tab."
+ <action description="管理土地禁止进入名单"
+ longdescription="在 关于土地 > 访问 标签页下管理禁止进入名单。"
name="land manage banned" value="30" />
- <action description="改变土地上 '出售通行证...'的设置"
- longdescription="Change parcel 'Sell passes...' settings in About Land > Access tab."
+ <action description="改变土地上 ‘出售通行证...’ 的设置"
+ longdescription="在 关于土地 > 访问 标签页下改变 ‘出售通行证...’ 的设置。"
name="land manage passes" value="31" />
<action description="从土地上驱逐或冻结居民"
- longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More >, and selecting 'Eject...' or 'Freeze...'."
+ longdescription="具有拥有这项能力的角色的会员可以对不受欢迎的居民使用右键点击，选择“更多 > 冻结...” 或者 “驱逐...”。"
name="land admin" value="32" />
</action_set>
<action_set
- description="这些能力包括允许组员归还东东，定位或移动林登设备的权利。这对组员清理垃圾和美化景观时很有用，当这项能力在使用时应该注意，因为一旦选择归还东东后则无法撤销。"
+ description="这些能力包括允许组员返还物体、放置或移动林登植被。这在组员清理垃圾和美化景观时很有用，但这些能力在使用时应该注意，因为一旦物体归还就无法撤销。"
name="Parcel Content">
- <action description="归还社团拥有的东东"
- longdescription="Return objects on group-owned parcels that are owned by the group in About Land > Objects tab."
+ <action description="归还社团拥有的物体"
+ longdescription="在 关于土地 > 物体 标签页下归还社团拥有的土地上社团所拥有的物体。"
name="land return group owned" value="48" />
- <action description="归还放置在社团处的东东"
- longdescription="Return objects on group-owned parcels that are set to the group in About Land > Objects tab."
+ <action description="归还放置在社团处的物体"
+ longdescription="在 关于土地 > 物体 标签页下归还社团土地上设置到社团的物体。"
name="land return group set" value="33" />
- <action description="归还非社团所有的东东"
- longdescription="Return objects on group-owned parcels that are non-group in About Land > Objects tab."
+ <action description="归还非社团所有的物体"
+ longdescription="在 关于土地 > 物体 标签页下归还社团土地上非社团的物体。"
name="land return non group" value="34" />
<action description="使用林登植物美化土地"
- longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory's Library > Objects folder or they can be created via the Build button."
+ longdescription="放置和移动林登树木、花草。这些东西可以在你的库存的 Library > Objects 文件夹下找到，也可以用 建造 按钮创建。"
name="land gardening" value="35" />
</action_set>
<action_set
- description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. "
+ description="这些能力包括转让、修改和销售社团拥有的物体的权限。这些更改在 编辑工具 > 一般标签页中完成。右键点击物体选择 ‘编辑’ 来查看设置。"
name="Object Management">
- <action description="转让东东给社团"
- longdescription="Deed objects to group in the Edit Tools > General Tab."
+ <action description="转让物体给社团"
+ longdescription="在 编辑工具 > 一般 标签页下转让物体。"
name="object deed" value="36" />
- <action description="处理(移动，复制，修改)社团所有的东东"
- longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools > General Tab."
+ <action description="处理 (移动、复制、修改) 社团拥有的物体"
+ longdescription="在 编辑工具 > 一般 标签页下处理 (移动、复制、修改) 社团拥有的物体。"
name="object manipulate" value="38" />
- <action description="把社团拥有的东东舍维待售"
- longdescription="Set group-owned objects for sale in the Edit Tools > General tab."
+ <action description="把社团拥有的物体设为待售"
+ longdescription="在 编辑工具 > 一般 标签页下设定社团拥有的物体予以出售。"
name="object set sale" value="39" />
</action_set>
<action_set
- description="这些能力包括要求组员偿还社团贷款和获得社团红利，以及限制进入社团帐号历史纪录的权利。"
+ description="这些能力包括要求组员偿还社团贷款和获得社团红利，以及限制访问社团帐号历史纪录的权利。"
name="Accounting">
<action description="偿还社团债务/获得社团红利"
- longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+ longdescription="具有拥有这项能力的角色的会员将会自动社团债务及取得社团红利。这意味着他们将每天收到社团土地销售额的一部分，以及为例如地块刊登费等的东西掏腰包。"
name="accounting accountable" value="40" />
</action_set>
<action_set
description="这些能力包括允许组员发送，接受和浏览社团通知的权利"
name="Notices">
<action description="发送通知"
- longdescription="Members in a Role with this Ability can send Notices in Group Information > Notices tab."
+ longdescription="具有拥有这项能力的角色的会员可以在 社团信息 > 通知 标签页中发送通知。"
name="notices send" value="42" />
<action description="接受通知/回顾原来的通知"
- longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information > Notices tab."
+ longdescription="具有拥有这项能力的角色的会员可以在 社团信息 > 通知 标签页中接受和查看以前的通知。"
name="notices receive" value="43" />
</action_set>
<action_set
description="这些能力包括允许组员提出议案，为议案投票，和浏览投票历史纪录的权利"
name="Proposals">
- <action description="创建提议本"
- longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information > Proposals tab."
+ <action description="创建议案"
+ longdescription="具有拥有这项能力的角色的会员可以在 社团信息 > 议案 标签页中创建议案以供投票。"
name="proposal start" value="44" />
<action description="为议案投票"
- longdescription="Members in a Role with this Ability can vote on proposals in Group Information > Proposals tab."
+ longdescription="具有拥有这项能力的角色的会员可以在 社团信息 > 议案 标签页中对议案投票。"
name="proposal vote" value="45" />
</action_set>
+ <action_set
+ description="这些能力包括允许或限制社团聊天会话及社团语音会话的权限。"
+ name="Chat">
+ <action
+ description="加入社团聊天"
+ longdescription="具有拥有这项能力的角色的会员可以加入社团文字或语音聊天。"
+ name="join group chat"
+ value="16" />
+ <action
+ description="加入社团语音聊天"
+ longdescription="具有拥有这项能力的角色的会员可以加入社团语音聊天会话。注意: 需要加入社团聊天能力 才能访问语音聊天会话。"
+ name="join voice chat"
+ value="27" />
+ <action
+ description="管理社团聊天"
+ longdescription="具有拥有这项能力的角色的会员可以控制社团文字和语音聊天的访问，并且可以管理社团和语音聊天。"
+ name="moderate group chat"
+ value="37" />
+ </action_set>
+
</role_actions>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index b262393..225a2fe 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1,2 +1,171 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<strings />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 该文件包括从前写死在代码中的字符串。
+ 仅用于不属于浮动框的那些。
+ 例如在化身聊天气泡中的字符串，
+ 以及从一个部件返回而在许多地方可能会出现的那些。-->
+<strings>
+ <!--登录-->
+ <string name="LoginInProgress">正在登录。 [APP_NAME] 可能会看上去没有反应。 请稍候。</string>
+ <string name="LoginAuthenticating">认证中</string>
+ <string name="LoginMaintenance">正在进行帐户维护...</string>
+ <string name="LoginAttempt">上次登录尝试失败。正在登录，第 [NUMBER] 次尝试</string>
+ <string name="LoginPrecaching">世界加载中...</string>
+ <string name="LoginInitializingBrowser">正在初始化内置浏览器...</string>
+ <string name="LoginInitializingMultimedia">正在初始化多媒体...</string>
+ <string name="LoginVerifyingCache">正在验证缓存文件 (可能需要 60-90 秒)...</string>
+ <string name="LoginProcessingResponse">处理回复...</string>
+ <string name="LoginInitializingWorld">正在初始化世界...</string>
+ <string name="LoginDecodingImages">正在解码图像...</string>
+ <string name="LoginInitializingQuicktime">正在初始化 QuickTime...</string>
+ <string name="LoginQuicktimeNotFound">没有找到 QuickTime - 不能初始化。</string>
+ <string name="LoginQuicktimeOK">QuickTime 初始化成功。</string>
+ <string name="LoginWaitingForRegionHandshake">等待区域握手信号……...</string>
+ <string name="LoginConnectingToRegion">正在连接到区域...</string>
+ <string name="LoginDownloadingClothing">下载装束中...</string>
+ <string name="LoginFailedNoNetwork">网络错误： 无法建立连接，请检查您的网络连接。</string>
+
+ <!-- 断开连接 -->
+ <string name="AgentLostConnection">
+ 该区域可能存在问题。请检查您到互联网的连接。
+ </string>
+ <!-- 工具提示, llhoverview.cpp. -->
+ <string name="TooltipNoName">(没有名字)</string> <!-- 物体没有名字 -->
+ <string name="TooltipOwner">主人:</string> <!-- 接着是拥有者的名字 -->
+ <string name="TooltipPublic">公共</string> <!-- 对象的公共权限 -->
+ <string name="TooltipIsGroup">(社团)</string> <!-- 该文字前是社团名称 -->
+ <string name="TooltipFlagScript">脚本</string>
+ <string name="TooltipFlagPhysics">物理</string>
+ <string name="TooltipFlagTouch">触摸</string>
+ <string name="TooltipFlagL$">L$</string>
+ <string name="TooltipFlagDropInventory">放置物体</string>
+ <string name="TooltipFlagPhantom">幻影</string>
+ <string name="TooltipFlagTemporary">暂时</string>
+ <string name="TooltipFlagRightClickMenu">(点击右键, 打开菜单)</string>
+ <string name="TooltipFreeToCopy">可任意复制</string>
+ <string name="TooltipForSaleL$">待售: L$[AMOUNT]</string> <!-- L$ version -->
+ <string name="TooltipForSaleMsg">待售: [MESSAGE]</string> <!-- Message (RetrievingData) -->
+ <string name="TooltipFlagGroupBuild">社团可建造</string>
+ <string name="TooltipFlagNoBuild">不可建造</string>
+ <string name="TooltipFlagNoEdit">社团可建造</string>
+ <string name="TooltipFlagNotSafe">不安全</string><!-- damage area -->
+ <string name="TooltipFlagNoFly">不可飞行</string>
+ <string name="TooltipFlagGroupScripts">仅社团脚本</string>
+ <string name="TooltipFlagNoScripts">无脚本</string>
+ <string name="TooltipMustSingleDrop">仅可以拖动单个物品到这里</string>
+ <string name="TooltipLand">土地: </string>
+
+ <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+ <string name="RetrievingData">获取中...</string>
+ <string name="ReleaseNotes">更新注释</string>
+ <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+ <string name="LoadingData">加载中...</string>
+
+
+ <!-- namecache -->
+ <!-- 化身名称: 为 LLUUID::null 显示的字符串 -->
+ <string name="AvatarNameNobody">(没有人)</string>
+
+ <!-- 化身名称: 取得名称时显示的文字-->
+ <string name="AvatarNameWaiting">(等待中)</string>
+
+ <!-- 化身名称: 替代 AvatarNameFetching 显示的文字, 彩蛋。 -->
+ <string name="AvatarNameHippos">(是河马)</string>
+
+ <!-- 社团名称: 为 LLUUID::null 显示的字符串 -->
+ <string name="GroupNameNone">(无社团)</string>
+
+ <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+ <string name="AssetErrorNone">没有错误</string>
+ <string name="AssetErrorRequestFailed">资产请求: 失败</string>
+ <string name="AssetErrorNonexistentFile">资产请求: 不存在的文件</string>
+ <string name="AssetErrorNotInDatabase">资产请求: 数据库中未找到资产</string>
+ <string name="AssetErrorEOF">文件末端</string>
+ <string name="AssetErrorCannotOpenFile">无法打开文件</string>
+ <string name="AssetErrorFileNotFound">文件未找到</string>
+ <string name="AssetErrorTCPTimeout">文件传输超时</string>
+ <string name="AssetErrorCircuitGone">通路没有了</string>
+ <string name="AssetErrorUnknownStatus">未知状态</string>
+
+ <!-- llvoavatar. 显示在化身的聊天气球中 -->
+ <string name="AvatarEditingApparance">(正在编辑外观)</string>
+ <string name="AvatarAway">离开</string>
+ <string name="AvatarBusy">忙碌</string>
+ <string name="AvatarMuted">已屏蔽</string>
+
+ <!-- animations -->
+ <string name="anim_express_afraid">害怕</string>
+ <string name="anim_express_anger">生气</string>
+ <string name="anim_away">离开</string>
+ <string name="anim_backflip">后空翻</string>
+ <string name="anim_express_laugh">Belly Laugh</string>
+ <string name="anim_express_toothsmile">BigSmile</string>
+ <string name="anim_blowkiss">飞吻</string>
+ <string name="anim_express_bored">无聊</string>
+ <string name="anim_bow">鞠躬</string>
+ <string name="anim_clap">鼓掌</string>
+ <string name="anim_courtbow">宫廷式鞠躬</string>
+ <string name="anim_express_cry">哭泣</string>
+ <string name="anim_dance1">舞蹈 1</string>
+ <string name="anim_dance2">舞蹈 2</string>
+ <string name="anim_dance3">舞蹈 3</string>
+ <string name="anim_dance4">舞蹈 4</string>
+ <string name="anim_dance5">舞蹈 5</string>
+ <string name="anim_dance6">舞蹈 6</string>
+ <string name="anim_dance7">舞蹈 7</string>
+ <string name="anim_dance8">舞蹈 8</string>
+ <string name="anim_express_disdain">Disdain</string>
+ <string name="anim_drink">喝</string>
+ <string name="anim_express_embarrased">害羞</string>
+ <string name="anim_angry_fingerwag">摇手指</string>
+ <string name="anim_fist_pump">Fist Pump</string>
+ <string name="anim_yoga_float">浮空瑜伽</string>
+ <string name="anim_express_frown">皱眉</string>
+ <string name="anim_impatient">不耐烦</string>
+ <string name="anim_jumpforjoy">高兴得跳起来</string>
+ <string name="anim_kissmybutt">亲我的屁股吧</string>
+ <string name="anim_express_kiss">亲吻</string>
+ <string name="anim_laugh_short">大笑</string>
+ <string name="anim_musclebeach">肌肉海滩</string>
+ <string name="anim_no_unhappy">不要 (不高兴地)</string>
+ <string name="anim_no_head">不要</string>
+ <string name="anim_nyanya">喵~喵~喵~</string>
+ <string name="anim_punch_onetwo">One-Two Punch</string>
+ <string name="anim_express_open_mouth">张开嘴</string>
+ <string name="anim_peace">和平</string>
+ <string name="anim_point_you">指别人</string>
+ <string name="anim_point_me">指自己</string>
+ <string name="anim_punch_l">左拳</string>
+ <string name="anim_punch_r">右拳</string>
+ <string name="anim_rps_countdown">RPS 计数</string>
+ <string name="anim_rps_paper">RPS 布</string>
+ <string name="anim_rps_rock">RPS 石头</string>
+ <string name="anim_rps_scissors">RPS 剪刀</string>
+ <string name="anim_express_repulsed">Repulsed</string>
+ <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
+ <string name="anim_express_sad">伤心</string>
+ <string name="anim_salute">敬礼</string>
+ <string name="anim_shout">喊叫</string>
+ <string name="anim_express_shrug">耸肩</string>
+ <string name="anim_express_smile">微笑</string>
+ <string name="anim_smoke_idle">吸烟 空闲</string>
+ <string name="anim_smoke_inhale">吸烟 吸气</string>
+ <string name="anim_smoke_throw_down">吸烟 扔下去</string>
+ <string name="anim_express_surprise">吃惊</string>
+ <string name="anim_sword_strike_r">剑刺</string>
+ <string name="anim_angry_tantrum">Tantrum</string>
+ <string name="anim_express_tongue_out">伸舌头</string>
+ <string name="anim_hello">招手</string>
+ <string name="anim_whisper">悄悄话</string>
+ <string name="anim_whistle">吹口哨</string>
+ <string name="anim_express_wink">眨眼</string>
+ <string name="anim_wink_hollywood">眨眼 (好莱坞式)</string>
+ <string name="anim_express_worry">担心</string>
+ <string name="anim_yes_happy">是的 (高兴地)</string>
+ <string name="anim_yes_head">是的</string>
+ <string name="texture_loading">加载中...</string>
+ <string name="worldmap_offline">脱机</string>
+
+ <!-- Chat -->
+ <string name="whisper">小声说:</string>
+ <string name="shout">大喊:</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/zh/strings_long.xml b/indra/newview/skins/default/xui/zh/strings_long.xml
deleted file mode 100644
index b262393..0000000
--- a/indra/newview/skins/default/xui/zh/strings_long.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<strings />
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
new file mode 100644
index 0000000..95a0b54
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages>
+ <message_set
+ name="errors">
+ <message
+ name="invalid_tport">
+ 处理您的瞬间移动请求时发生错误。您可能需要重新登入以后才能
+瞬间移动。如果您仍继续遇到这条消息，请到以下地址参考技术支持
+常见问题:
+www.secondlife.com/support
+ </message>
+ <message
+ name="invalid_region_handoff">
+ 处理您的区域变换时发生错误。您可能需要重新登入以后才能
+瞬间移动。如果您仍继续遇到这条消息，请到以下地址参考技术支持
+常见问题:
+www.secondlife.com/support
+ </message>
+ <message
+ name="blocked_tport">
+ 抱歉，当前不允许瞬间移动。请稍候再试。
+如果您仍然不能瞬间移动，请登出后重新登录解决问题。
+ </message>
+ <message
+ name="nolandmark_tport">
+ 抱歉，系统无法找到地标目的地。
+ </message>
+ <message
+ name="timeout_tport">
+ 抱歉，系统无法完成瞬间移动连接。
+请稍候再试。
+ </message>
+ <message
+ name="noaccess_tport">
+ 抱歉，您不能访问瞬间移动目标。
+ </message>
+ <message
+ name="missing_attach_tport">
+ 您的装备还没有到齐。请再等几秒钟，或者登出后重新登录以后
+再试着瞬间移动。
+ </message>
+ <message
+ name="too_many_uploads_tport">
+ 该区域内的资产队列当前堵塞，所以您的瞬间移动请求将不能按时完成。
+请稍候再试，或前往较空闲的区域再试。
+ </message>
+ <message
+ name="expired_tport">
+ 抱歉，系统无法按时地完成您的瞬间移动请求。请稍候再试。
+ </message>
+ <message
+ name="expired_region_handoff">
+ 抱歉，系统无法按时地完成您的区域变换请求。请稍候再试。
+ </message>
+ <message
+ name="no_host">
+ 无法找到瞬间移动目标。目标可能暂时不可用，或者已不存在。请稍后再试。
+ </message>
+ <message
+ name="no_inventory_host">
+ 库存系统当前不可用。
+ </message>
+ </message_set>
+ <message_set
+ name="progress">
+ <message
+ name="sending_dest">
+ 正在发送到目标地点。
+ </message>
+ <message
+ name="redirecting">
+ 正在重定向到新的地点。
+ </message>
+ <message
+ name="relaying">
+ 正在转达到目标地点。
+ </message>
+ <message
+ name="sending_home">
+ 发送家位置请求。
+ </message>
+ <message
+ name="sending_landmark">
+ 正在发送地标位置请求。
+ </message>
+ <message
+ name="completing">
+ 正在完成瞬间移动。
+ </message>
+ <message
+ name="resolving">
+ 正在解析目标。
+ </message>
+ <message
+ name="contacting">
+ 正在联系新的区域。
+ </message>
+ <message
+ name="arriving">
+ 正在抵达……
+ </message>
+ <message
+ name="requesting">
+ 正在请求瞬间移动……
+ </message>
+ </message_set>
+</teleport_messages>
+
+
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids
More information about the Pkg-games-commits
mailing list