diff options
Diffstat (limited to 'indra')
196 files changed, 5569 insertions, 925 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2c974fb4ff..0266239454 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -171,7 +171,10 @@ if (LINUX) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. add_definitions(-DLL_IGNORE_SIGCHLD) - add_definitions(-march=pentium4 -mfpmath=sse) + if (WORD_SIZE EQUAL 32) + add_definitions(-march=pentium4) + endif (WORD_SIZE EQUAL 32) + add_definitions(-mfpmath=sse) #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 8beae555fb..99d0ad7e14 100644 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -24,16 +24,24 @@ * $/LicenseInfo$ */ +#include "linden_common.h" #include "llcrashloggerlinux.h" int main(int argc, char **argv) { + llinfos << "Starting crash reporter." << llendl; + LLCrashLoggerLinux app; app.parseCommandOptions(argc, argv); - app.init(); + + if (! app.init()) + { + llwarns << "Unable to initialize application." << llendl; + return 1; + } + app.mainLoop(); app.cleanup(); + llinfos << "Crash reporter finished normally." << llendl; return 0; } - - diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 7449c6426f..7316717193 100644 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -30,8 +30,6 @@ #include "linden_common.h" -#include "boost/tokenizer.hpp" - #include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME #include "llerror.h" #include "llfile.h" diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index d0f287657e..0745696ef3 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -387,8 +387,6 @@ const S32 MAP_SIM_RETURN_NULL_SIMS = 0x00010000; const S32 MAP_SIM_PRELUDE = 0x00020000; // Crash reporter behavior -const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml"; -const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior"; const S32 CRASH_BEHAVIOR_ASK = 0; const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1; const S32 CRASH_BEHAVIOR_NEVER_SEND = 2; diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index e8616a9be6..99e61433c6 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -1,6 +1,6 @@ /** * @file llsys.cpp - * @brief Impelementation of the basic system query functions. + * @brief Implementation of the basic system query functions. * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if LL_WINDOWS +#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally +#endif + #include "linden_common.h" #include "llsys.h" @@ -36,22 +40,43 @@ #endif #include "llprocessor.h" +#include "llerrorcontrol.h" +#include "llevents.h" +#include "lltimer.h" +#include "llsdserialize.h" +#include "llsdutil.h" +#include <boost/bind.hpp> +#include <boost/circular_buffer.hpp> +#include <boost/regex.hpp> +#include <boost/foreach.hpp> +#include <boost/lexical_cast.hpp> +#include <boost/range.hpp> +#include <boost/utility/enable_if.hpp> +#include <boost/type_traits/is_integral.hpp> +#include <boost/type_traits/is_float.hpp> + +using namespace llsd; #if LL_WINDOWS # define WIN32_LEAN_AND_MEAN # include <winsock2.h> # include <windows.h> +# include <psapi.h> // GetPerformanceInfo() et al. #elif LL_DARWIN # include <errno.h> # include <sys/sysctl.h> # include <sys/utsname.h> # include <stdint.h> # include <Carbon/Carbon.h> +# include <sys/wait.h> +# include <string.h> +# include <stdexcept> #elif LL_LINUX # include <errno.h> # include <sys/utsname.h> # include <unistd.h> # include <sys/sysinfo.h> +# include <stdexcept> const char MEMINFO_FILE[] = "/proc/meminfo"; #elif LL_SOLARIS # include <stdio.h> @@ -70,6 +95,15 @@ extern int errno; static const S32 CPUINFO_BUFFER_SIZE = 16383; LLCPUInfo gSysCPU; +// Don't log memory info any more often than this. It also serves as our +// framerate sample size. +static const F32 MEM_INFO_THROTTLE = 20; +// Sliding window of samples. We intentionally limit the length of time we +// remember "the slowest" framerate because framerate is very slow at login. +// If we only triggered FrameWatcher logging when the session framerate +// dropped below the login framerate, we'd have very little additional data. +static const F32 MEM_INFO_WINDOW = 10*60; + #if LL_WINDOWS #ifndef DLLVERSIONINFO typedef struct _DllVersionInfo @@ -613,8 +647,78 @@ void LLCPUInfo::stream(std::ostream& s) const s << "->mCPUString: " << mCPUString << std::endl; } +// Helper class for LLMemoryInfo: accumulate stats in the form we store for +// LLMemoryInfo::getStatsMap(). +class Stats +{ +public: + Stats(): + mStats(LLSD::emptyMap()) + {} + + // Store every integer type as LLSD::Integer. + template <class T> + void add(const LLSD::String& name, const T& value, + typename boost::enable_if<boost::is_integral<T> >::type* = 0) + { + mStats[name] = LLSD::Integer(value); + } + + // Store every floating-point type as LLSD::Real. + template <class T> + void add(const LLSD::String& name, const T& value, + typename boost::enable_if<boost::is_float<T> >::type* = 0) + { + mStats[name] = LLSD::Real(value); + } + + // Hope that LLSD::Date values are sufficiently unambiguous. + void add(const LLSD::String& name, const LLSD::Date& value) + { + mStats[name] = value; + } + + LLSD get() const { return mStats; } + +private: + LLSD mStats; +}; + +// Wrap boost::regex_match() with a function that doesn't throw. +template <typename S, typename M, typename R> +static bool regex_match_no_exc(const S& string, M& match, const R& regex) +{ + try + { + return boost::regex_match(string, match, regex); + } + catch (const std::runtime_error& e) + { + LL_WARNS("LLMemoryInfo") << "error matching with '" << regex.str() << "': " + << e.what() << ":\n'" << string << "'" << LL_ENDL; + return false; + } +} + +// Wrap boost::regex_search() with a function that doesn't throw. +template <typename S, typename M, typename R> +static bool regex_search_no_exc(const S& string, M& match, const R& regex) +{ + try + { + return boost::regex_search(string, match, regex); + } + catch (const std::runtime_error& e) + { + LL_WARNS("LLMemoryInfo") << "error searching with '" << regex.str() << "': " + << e.what() << ":\n'" << string << "'" << LL_ENDL; + return false; + } +} + LLMemoryInfo::LLMemoryInfo() { + refresh(); } #if LL_WINDOWS @@ -638,11 +742,7 @@ static U32 LLMemoryAdjustKBResult(U32 inKB) U32 LLMemoryInfo::getPhysicalMemoryKB() const { #if LL_WINDOWS - MEMORYSTATUSEX state; - state.dwLength = sizeof(state); - GlobalMemoryStatusEx(&state); - - return LLMemoryAdjustKBResult((U32)(state.ullTotalPhys >> 10)); + return LLMemoryAdjustKBResult(mStatsMap["Total Physical KB"].asInteger()); #elif LL_DARWIN // This might work on Linux as well. Someone check... @@ -690,12 +790,82 @@ U32 LLMemoryInfo::getPhysicalMemoryClamped() const void LLMemoryInfo::getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb) { #if LL_WINDOWS - MEMORYSTATUSEX state; - state.dwLength = sizeof(state); - GlobalMemoryStatusEx(&state); + // Sigh, this shouldn't be a static method, then we wouldn't have to + // reload this data separately from refresh() + LLSD statsMap(loadStatsMap()); + + avail_physical_mem_kb = statsMap["Avail Physical KB"].asInteger(); + avail_virtual_mem_kb = statsMap["Avail Virtual KB"].asInteger(); + +#elif LL_DARWIN + // mStatsMap is derived from vm_stat, look for (e.g.) "kb free": + // $ vm_stat + // Mach Virtual Memory Statistics: (page size of 4096 bytes) + // Pages free: 462078. + // Pages active: 142010. + // Pages inactive: 220007. + // Pages wired down: 159552. + // "Translation faults": 220825184. + // Pages copy-on-write: 2104153. + // Pages zero filled: 167034876. + // Pages reactivated: 65153. + // Pageins: 2097212. + // Pageouts: 41759. + // Object cache: 841598 hits of 7629869 lookups (11% hit rate) + avail_physical_mem_kb = -1 ; + avail_virtual_mem_kb = -1 ; - avail_physical_mem_kb = (U32)(state.ullAvailPhys/1024) ; - avail_virtual_mem_kb = (U32)(state.ullAvailVirtual/1024) ; +#elif LL_LINUX + // mStatsMap is derived from MEMINFO_FILE: + // $ cat /proc/meminfo + // MemTotal: 4108424 kB + // MemFree: 1244064 kB + // Buffers: 85164 kB + // Cached: 1990264 kB + // SwapCached: 0 kB + // Active: 1176648 kB + // Inactive: 1427532 kB + // Active(anon): 529152 kB + // Inactive(anon): 15924 kB + // Active(file): 647496 kB + // Inactive(file): 1411608 kB + // Unevictable: 16 kB + // Mlocked: 16 kB + // HighTotal: 3266316 kB + // HighFree: 721308 kB + // LowTotal: 842108 kB + // LowFree: 522756 kB + // SwapTotal: 6384632 kB + // SwapFree: 6384632 kB + // Dirty: 28 kB + // Writeback: 0 kB + // AnonPages: 528820 kB + // Mapped: 89472 kB + // Shmem: 16324 kB + // Slab: 159624 kB + // SReclaimable: 145168 kB + // SUnreclaim: 14456 kB + // KernelStack: 2560 kB + // PageTables: 5560 kB + // NFS_Unstable: 0 kB + // Bounce: 0 kB + // WritebackTmp: 0 kB + // CommitLimit: 8438844 kB + // Committed_AS: 1271596 kB + // VmallocTotal: 122880 kB + // VmallocUsed: 65252 kB + // VmallocChunk: 52356 kB + // HardwareCorrupted: 0 kB + // HugePages_Total: 0 + // HugePages_Free: 0 + // HugePages_Rsvd: 0 + // HugePages_Surp: 0 + // Hugepagesize: 2048 kB + // DirectMap4k: 434168 kB + // DirectMap2M: 477184 kB + // (could also run 'free', but easier to read a file than run a program) + avail_physical_mem_kb = -1 ; + avail_virtual_mem_kb = -1 ; #else //do not know how to collect available memory info for other systems. @@ -708,56 +878,389 @@ void LLMemoryInfo::getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_v void LLMemoryInfo::stream(std::ostream& s) const { + // We want these memory stats to be easy to grep from the log, along with + // the timestamp. So preface each line with the timestamp and a + // distinctive marker. Without that, we'd have to search the log for the + // introducer line, then read subsequent lines, etc... + std::string pfx(LLError::utcTime() + " <mem> "); + + // Max key length + size_t key_width(0); + BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap)) + { + size_t len(pair.first.length()); + if (len > key_width) + { + key_width = len; + } + } + + // Now stream stats + BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap)) + { + s << pfx << std::setw(key_width+1) << (pair.first + ':') << ' '; + LLSD value(pair.second); + if (value.isInteger()) + s << std::setw(12) << value.asInteger(); + else if (value.isReal()) + s << std::fixed << std::setprecision(1) << value.asReal(); + else if (value.isDate()) + value.asDate().toStream(s); + else + s << value; // just use default LLSD formatting + s << std::endl; + } +} + +LLSD LLMemoryInfo::getStatsMap() const +{ + return mStatsMap; +} + +LLMemoryInfo& LLMemoryInfo::refresh() +{ + mStatsMap = loadStatsMap(); + + LL_DEBUGS("LLMemoryInfo") << "Populated mStatsMap:\n"; + LLSDSerialize::toPrettyXML(mStatsMap, LL_CONT); + LL_ENDL; + + return *this; +} + +LLSD LLMemoryInfo::loadStatsMap() +{ + // This implementation is derived from stream() code (as of 2011-06-29). + Stats stats; + + // associate timestamp for analysis over time + stats.add("timestamp", LLDate::now()); + #if LL_WINDOWS MEMORYSTATUSEX state; state.dwLength = sizeof(state); GlobalMemoryStatusEx(&state); - s << "Percent Memory use: " << (U32)state.dwMemoryLoad << '%' << std::endl; - s << "Total Physical KB: " << (U32)(state.ullTotalPhys/1024) << std::endl; - s << "Avail Physical KB: " << (U32)(state.ullAvailPhys/1024) << std::endl; - s << "Total page KB: " << (U32)(state.ullTotalPageFile/1024) << std::endl; - s << "Avail page KB: " << (U32)(state.ullAvailPageFile/1024) << std::endl; - s << "Total Virtual KB: " << (U32)(state.ullTotalVirtual/1024) << std::endl; - s << "Avail Virtual KB: " << (U32)(state.ullAvailVirtual/1024) << std::endl; + stats.add("Percent Memory use", state.dwMemoryLoad); + stats.add("Total Physical KB", state.ullTotalPhys/1024); + stats.add("Avail Physical KB", state.ullAvailPhys/1024); + stats.add("Total page KB", state.ullTotalPageFile/1024); + stats.add("Avail page KB", state.ullAvailPageFile/1024); + stats.add("Total Virtual KB", state.ullTotalVirtual/1024); + stats.add("Avail Virtual KB", state.ullAvailVirtual/1024); + + PERFORMANCE_INFORMATION perf; + perf.cb = sizeof(perf); + GetPerformanceInfo(&perf, sizeof(perf)); + + SIZE_T pagekb(perf.PageSize/1024); + stats.add("CommitTotal KB", perf.CommitTotal * pagekb); + stats.add("CommitLimit KB", perf.CommitLimit * pagekb); + stats.add("CommitPeak KB", perf.CommitPeak * pagekb); + stats.add("PhysicalTotal KB", perf.PhysicalTotal * pagekb); + stats.add("PhysicalAvail KB", perf.PhysicalAvailable * pagekb); + stats.add("SystemCache KB", perf.SystemCache * pagekb); + stats.add("KernelTotal KB", perf.KernelTotal * pagekb); + stats.add("KernelPaged KB", perf.KernelPaged * pagekb); + stats.add("KernelNonpaged KB", perf.KernelNonpaged * pagekb); + stats.add("PageSize KB", pagekb); + stats.add("HandleCount", perf.HandleCount); + stats.add("ProcessCount", perf.ProcessCount); + stats.add("ThreadCount", perf.ThreadCount); + + PROCESS_MEMORY_COUNTERS_EX pmem; + pmem.cb = sizeof(pmem); + // GetProcessMemoryInfo() is documented to accept either + // PROCESS_MEMORY_COUNTERS* or PROCESS_MEMORY_COUNTERS_EX*, presumably + // using the redundant size info to distinguish. But its prototype + // specifically accepts PROCESS_MEMORY_COUNTERS*, and since this is a + // classic-C API, PROCESS_MEMORY_COUNTERS_EX isn't a subclass. Cast the + // pointer. + GetProcessMemoryInfo(GetCurrentProcess(), PPROCESS_MEMORY_COUNTERS(&pmem), sizeof(pmem)); + + stats.add("Page Fault Count", pmem.PageFaultCount); + stats.add("PeakWorkingSetSize KB", pmem.PeakWorkingSetSize/1024); + stats.add("WorkingSetSize KB", pmem.WorkingSetSize/1024); + stats.add("QutaPeakPagedPoolUsage KB", pmem.QuotaPeakPagedPoolUsage/1024); + stats.add("QuotaPagedPoolUsage KB", pmem.QuotaPagedPoolUsage/1024); + stats.add("QuotaPeakNonPagedPoolUsage KB", pmem.QuotaPeakNonPagedPoolUsage/1024); + stats.add("QuotaNonPagedPoolUsage KB", pmem.QuotaNonPagedPoolUsage/1024); + stats.add("PagefileUsage KB", pmem.PagefileUsage/1024); + stats.add("PeakPagefileUsage KB", pmem.PeakPagefileUsage/1024); + stats.add("PrivateUsage KB", pmem.PrivateUsage/1024); + #elif LL_DARWIN uint64_t phys = 0; size_t len = sizeof(phys); - if(sysctlbyname("hw.memsize", &phys, &len, NULL, 0) == 0) + if (sysctlbyname("hw.memsize", &phys, &len, NULL, 0) == 0) { - s << "Total Physical KB: " << phys/1024 << std::endl; + stats.add("Total Physical KB", phys/1024); } else { - s << "Unable to collect memory information"; + LL_WARNS("LLMemoryInfo") << "Unable to collect hw.memsize memory information" << LL_ENDL; + } + + FILE* pout = popen("vm_stat 2>&1", "r"); + if (! pout) // popen() couldn't run vm_stat + { + // Save errno right away. + int popen_errno(errno); + LL_WARNS("LLMemoryInfo") << "Unable to collect vm_stat memory information: "; + char buffer[256]; + if (0 == strerror_r(popen_errno, buffer, sizeof(buffer))) + { + LL_CONT << buffer; + } + else + { + LL_CONT << "errno " << popen_errno; + } + LL_CONT << LL_ENDL; + } + else // popen() launched vm_stat + { + // Mach Virtual Memory Statistics: (page size of 4096 bytes) + // Pages free: 462078. + // Pages active: 142010. + // Pages inactive: 220007. + // Pages wired down: 159552. + // "Translation faults": 220825184. + // Pages copy-on-write: 2104153. + // Pages zero filled: 167034876. + // Pages reactivated: 65153. + // Pageins: 2097212. + // Pageouts: 41759. + // Object cache: 841598 hits of 7629869 lookups (11% hit rate) + + // Intentionally don't pass the boost::no_except flag. These + // boost::regex objects are constructed with string literals, so they + // should be valid every time. If they become invalid, we WANT an + // exception, hopefully even before the dev checks in. + boost::regex pagesize_rx("\\(page size of ([0-9]+) bytes\\)"); + boost::regex stat_rx("(.+): +([0-9]+)\\."); + boost::regex cache_rx("Object cache: ([0-9]+) hits of ([0-9]+) lookups " + "\\(([0-9]+)% hit rate\\)"); + boost::cmatch matched; + LLSD::Integer pagesizekb(4096/1024); + + // Here 'pout' is vm_stat's stdout. Search it for relevant data. + char line[100]; + line[sizeof(line)-1] = '\0'; + while (fgets(line, sizeof(line)-1, pout)) + { + size_t linelen(strlen(line)); + // Truncate any trailing newline + if (line[linelen - 1] == '\n') + { + line[--linelen] = '\0'; + } + LL_DEBUGS("LLMemoryInfo") << line << LL_ENDL; + if (regex_search_no_exc(line, matched, pagesize_rx)) + { + // "Mach Virtual Memory Statistics: (page size of 4096 bytes)" + std::string pagesize_str(matched[1].first, matched[1].second); + try + { + // Reasonable to assume that pagesize will always be a + // multiple of 1Kb? + pagesizekb = boost::lexical_cast<LLSD::Integer>(pagesize_str)/1024; + } + catch (const boost::bad_lexical_cast&) + { + LL_WARNS("LLMemoryInfo") << "couldn't parse '" << pagesize_str + << "' in vm_stat line: " << line << LL_ENDL; + continue; + } + stats.add("page size", pagesizekb); + } + else if (regex_match_no_exc(line, matched, stat_rx)) + { + // e.g. "Pages free: 462078." + // Strip double-quotes off certain statistic names + const char *key_begin(matched[1].first), *key_end(matched[1].second); + if (key_begin[0] == '"' && key_end[-1] == '"') + { + ++key_begin; + --key_end; + } + LLSD::String key(key_begin, key_end); + LLSD::String value_str(matched[2].first, matched[2].second); + LLSD::Integer value(0); + try + { + value = boost::lexical_cast<LLSD::Integer>(value_str); + } + catch (const boost::bad_lexical_cast&) + { + LL_WARNS("LLMemoryInfo") << "couldn't parse '" << value_str + << "' in vm_stat line: " << line << LL_ENDL; + continue; + } + // Store this statistic. + stats.add(key, value); + // Is this in units of pages? If so, convert to Kb. + static const LLSD::String pages("Pages "); + if (key.substr(0, pages.length()) == pages) + { + // Synthesize a new key with kb in place of Pages + LLSD::String kbkey("kb "); + kbkey.append(key.substr(pages.length())); + stats.add(kbkey, value * pagesizekb); + } + } + else if (regex_match_no_exc(line, matched, cache_rx)) + { + // e.g. "Object cache: 841598 hits of 7629869 lookups (11% hit rate)" + static const char* cache_keys[] = { "cache hits", "cache lookups", "cache hit%" }; + std::vector<LLSD::Integer> cache_values; + for (size_t i = 0; i < (sizeof(cache_keys)/sizeof(cache_keys[0])); ++i) + { + LLSD::String value_str(matched[i+1].first, matched[i+1].second); + LLSD::Integer value(0); + try + { + value = boost::lexical_cast<LLSD::Integer>(value_str); + } + catch (boost::bad_lexical_cast&) + { + LL_WARNS("LLMemoryInfo") << "couldn't parse '" << value_str + << "' in vm_stat line: " << line << LL_ENDL; + continue; + } + stats.add(cache_keys[i], value); + } + } + else + { + LL_WARNS("LLMemoryInfo") << "unrecognized vm_stat line: " << line << LL_ENDL; + } + } + int status(pclose(pout)); + if (status == -1) // pclose() couldn't retrieve rc + { + // Save errno right away. + int pclose_errno(errno); + // The ECHILD error happens so frequently that unless filtered, + // the warning below spams the log file. This is too bad, because + // sometimes the logic above fails to produce any output derived + // from vm_stat, but we've been unable to observe any specific + // error indicating the problem. + if (pclose_errno != ECHILD) + { + LL_WARNS("LLMemoryInfo") << "Unable to obtain vm_stat termination code: "; + char buffer[256]; + if (0 == strerror_r(pclose_errno, buffer, sizeof(buffer))) + { + LL_CONT << buffer; + } + else + { + LL_CONT << "errno " << pclose_errno; + } + LL_CONT << LL_ENDL; + } + } + else // pclose() retrieved rc; analyze + { + if (WIFEXITED(status)) + { + int rc(WEXITSTATUS(status)); + if (rc != 0) + { + LL_WARNS("LLMemoryInfo") << "vm_stat terminated with rc " << rc << LL_ENDL; + } + } + else if (WIFSIGNALED(status)) + { + LL_WARNS("LLMemoryInfo") << "vm_stat terminated by signal " << WTERMSIG(status) + << LL_ENDL; + } + } } + #elif LL_SOLARIS - U64 phys = 0; + U64 phys = 0; - phys = (U64)(sysconf(_SC_PHYS_PAGES)) * (U64)(sysconf(_SC_PAGESIZE)/1024); + phys = (U64)(sysconf(_SC_PHYS_PAGES)) * (U64)(sysconf(_SC_PAGESIZE)/1024); - s << "Total Physical KB: " << phys << std::endl; -#else - // *NOTE: This works on linux. What will it do on other systems? - LLFILE* meminfo = LLFile::fopen(MEMINFO_FILE,"rb"); - if(meminfo) + stats.add("Total Physical KB", phys); + +#elif LL_LINUX + std::ifstream meminfo(MEMINFO_FILE); + if (meminfo.is_open()) { - char line[MAX_STRING]; /* Flawfinder: ignore */ - memset(line, 0, MAX_STRING); - while(fgets(line, MAX_STRING, meminfo)) + // MemTotal: 4108424 kB + // MemFree: 1244064 kB + // Buffers: 85164 kB + // Cached: 1990264 kB + // SwapCached: 0 kB + // Active: 1176648 kB + // Inactive: 1427532 kB + // ... + // VmallocTotal: 122880 kB + // VmallocUsed: 65252 kB + // VmallocChunk: 52356 kB + // HardwareCorrupted: 0 kB + // HugePages_Total: 0 + // HugePages_Free: 0 + // HugePages_Rsvd: 0 + // HugePages_Surp: 0 + // Hugepagesize: 2048 kB + // DirectMap4k: 434168 kB + // DirectMap2M: 477184 kB + + // Intentionally don't pass the boost::no_except flag. This + // boost::regex object is constructed with a string literal, so it + // should be valid every time. If it becomes invalid, we WANT an + // exception, hopefully even before the dev checks in. + boost::regex stat_rx("(.+): +([0-9]+)( kB)?"); + boost::smatch matched; + + std::string line; + while (std::getline(meminfo, line)) { - line[strlen(line)-1] = ' '; /*Flawfinder: ignore*/ - s << line; + LL_DEBUGS("LLMemoryInfo") << line << LL_ENDL; + if (regex_match_no_exc(line, matched, stat_rx)) + { + // e.g. "MemTotal: 4108424 kB" + LLSD::String key(matched[1].first, matched[1].second); + LLSD::String value_str(matched[2].first, matched[2].second); + LLSD::Integer value(0); + try + { + value = boost::lexical_cast<LLSD::Integer>(value_str); + } + catch (const boost::bad_lexical_cast&) + { + LL_WARNS("LLMemoryInfo") << "couldn't parse '" << value_str + << "' in " << MEMINFO_FILE << " line: " + << line << LL_ENDL; + continue; + } + // Store this statistic. + stats.add(key, value); + } + else + { + LL_WARNS("LLMemoryInfo") << "unrecognized " << MEMINFO_FILE << " line: " + << line << LL_ENDL; + } } - fclose(meminfo); } else { - s << "Unable to collect memory information"; + LL_WARNS("LLMemoryInfo") << "Unable to collect memory information" << LL_ENDL; } + +#else + LL_WARNS("LLMemoryInfo") << "Unknown system; unable to collect memory information" << LL_ENDL; + #endif + + return stats.get(); } std::ostream& operator<<(std::ostream& s, const LLOSInfo& info) @@ -778,6 +1281,143 @@ std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info) return s; } +class FrameWatcher +{ +public: + FrameWatcher(): + // Hooking onto the "mainloop" event pump gets us one call per frame. + mConnection(LLEventPumps::instance() + .obtain("mainloop") + .listen("FrameWatcher", boost::bind(&FrameWatcher::tick, this, _1))), + // Initializing mSampleStart to an invalid timestamp alerts us to skip + // trying to compute framerate on the first call. + mSampleStart(-1), + // Initializing mSampleEnd to 0 ensures that we treat the first call + // as the completion of a sample window. + mSampleEnd(0), + mFrames(0), + // Both MEM_INFO_WINDOW and MEM_INFO_THROTTLE are in seconds. We need + // the number of integer MEM_INFO_THROTTLE sample slots that will fit + // in MEM_INFO_WINDOW. Round up. + mSamples(int((MEM_INFO_WINDOW / MEM_INFO_THROTTLE) + 0.7)), + // Initializing to F32_MAX means that the first real frame will become + // the slowest ever, which sounds like a good idea. + mSlowest(F32_MAX) + {} + + bool tick(const LLSD&) + { + F32 timestamp(mTimer.getElapsedTimeF32()); + + // Count this frame in the interval just completed. + ++mFrames; + + // Have we finished a sample window yet? + if (timestamp < mSampleEnd) + { + // no, just keep waiting + return false; + } + + // Set up for next sample window. Capture values for previous frame in + // local variables and reset data members. + U32 frames(mFrames); + F32 sampleStart(mSampleStart); + // No frames yet in next window + mFrames = 0; + // which starts right now + mSampleStart = timestamp; + // and ends MEM_INFO_THROTTLE seconds in the future + mSampleEnd = mSampleStart + MEM_INFO_THROTTLE; + + // On the very first call, that's all we can do, no framerate + // computation is possible. + if (sampleStart < 0) + { + return false; + } + + // How long did this actually take? As framerate slows, the duration + // of the frame we just finished could push us WELL beyond our desired + // sample window size. + F32 elapsed(timestamp - sampleStart); + F32 framerate(frames/elapsed); + + // Remember previous slowest framerate because we're just about to + // update it. + F32 slowest(mSlowest); + // Remember previous number of samples. + boost::circular_buffer<F32>::size_type prevSize(mSamples.size()); + + // Capture new framerate in our samples buffer. Once the buffer is + // full (after MEM_INFO_WINDOW seconds), this will displace the oldest + // sample. ("So they all rolled over, and one fell out...") + mSamples.push_back(framerate); + + // Calculate the new minimum framerate. I know of no way to update a + // rolling minimum without ever rescanning the buffer. But since there + // are only a few tens of items in this buffer, rescanning it is + // probably cheaper (and certainly easier to reason about) than + // attempting to optimize away some of the scans. + mSlowest = framerate; // pick an arbitrary entry to start + for (boost::circular_buffer<F32>::const_iterator si(mSamples.begin()), send(mSamples.end()); + si != send; ++si) + { + if (*si < mSlowest) + { + mSlowest = *si; + } + } + + // We're especially interested in memory as framerate drops. Only log + // when framerate drops below the slowest framerate we remember. + // (Should always be true for the end of the very first sample + // window.) + if (framerate >= slowest) + { + return false; + } + // Congratulations, we've hit a new low. :-P + + LL_INFOS("FrameWatcher") << ' '; + if (! prevSize) + { + LL_CONT << "initial framerate "; + } + else + { + LL_CONT << "slowest framerate for last " << int(prevSize * MEM_INFO_THROTTLE) + << " seconds "; + } + LL_CONT << std::fixed << std::setprecision(1) << framerate << '\n' + << LLMemoryInfo() << LL_ENDL; + + return false; + } + +private: + // Storing the connection in an LLTempBoundListener ensures it will be + // disconnected when we're destroyed. + LLTempBoundListener mConnection; + // Track elapsed time + LLTimer mTimer; + // Some of what you see here is in fact redundant with functionality you + // can get from LLTimer. Unfortunately the LLTimer API is missing the + // feature we need: has at least the stated interval elapsed, and if so, + // exactly how long has passed? So we have to do it by hand, sigh. + // Time at start, end of sample window + F32 mSampleStart, mSampleEnd; + // Frames this sample window + U32 mFrames; + // Sliding window of framerate samples + boost::circular_buffer<F32> mSamples; + // Slowest framerate in mSamples + F32 mSlowest; +}; + +// Need an instance of FrameWatcher before it does any good +static FrameWatcher sFrameWatcher; + BOOL gunzip_file(const std::string& srcfile, const std::string& dstfile) { std::string tmpfile; diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index 41a4f25000..739e795d3a 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -36,6 +36,7 @@ // llinfos << info << llendl; // +#include "llsd.h" #include <iosfwd> #include <string> @@ -117,6 +118,27 @@ public: //get the available memory infomation in KiloBytes. static void getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb); + + // Retrieve a map of memory statistics. The keys of the map are platform- + // dependent. The values are in kilobytes to try to avoid integer overflow. + LLSD getStatsMap() const; + + // Re-fetch memory data (as reported by stream() and getStatsMap()) from the + // system. Normally this is fetched at construction time. Return (*this) + // to permit usage of the form: + // @code + // LLMemoryInfo info; + // ... + // info.refresh().getStatsMap(); + // @endcode + LLMemoryInfo& refresh(); + +private: + // set mStatsMap + static LLSD loadStatsMap(); + + // Memory stats for getStatsMap(). + LLSD mStatsMap; }; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 3dcaca4f16..6c1d233425 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 8; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 68e45f36e4..93f3c910bd 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -31,10 +31,12 @@ #include "llcrashlogger.h" #include "linden_common.h" #include "llstring.h" -#include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME +#include "indra_constants.h" // CRASH_BEHAVIOR_... #include "llerror.h" +#include "llerrorcontrol.h" #include "lltimer.h" #include "lldir.h" +#include "llfile.h" #include "llsdserialize.h" #include "lliopipe.h" #include "llpumpio.h" @@ -54,7 +56,7 @@ public: virtual void error(U32 status, const std::string& reason) { - gBreak = true; + gBreak = true; } virtual void result(const LLSD& content) @@ -64,21 +66,8 @@ public: } }; -bool LLCrashLoggerText::mainLoop() -{ - std::cout << "Entering main loop" << std::endl; - sendCrashLogs(); - return true; -} - -void LLCrashLoggerText::updateApplication(const std::string& message) -{ - LLCrashLogger::updateApplication(message); - std::cout << message << std::endl; -} - LLCrashLogger::LLCrashLogger() : - mCrashBehavior(CRASH_BEHAVIOR_ASK), + mCrashBehavior(CRASH_BEHAVIOR_ALWAYS_SEND), mCrashInPreviousExec(false), mCrashSettings("CrashSettings"), mSentCrashLogs(false), @@ -281,26 +270,48 @@ LLSD LLCrashLogger::constructPostData() return mCrashInfo; } +const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml"; + S32 LLCrashLogger::loadCrashBehaviorSetting() { + // First check user_settings (in the user's home dir) std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); + if (! mCrashSettings.loadFromFile(filename)) + { + // Next check app_settings (in the SL program dir) + std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, CRASH_SETTINGS_FILE); + mCrashSettings.loadFromFile(filename); + } - mCrashSettings.loadFromFile(filename); - - S32 value = mCrashSettings.getS32(CRASH_BEHAVIOR_SETTING); - - if (value < CRASH_BEHAVIOR_ASK || CRASH_BEHAVIOR_NEVER_SEND < value) return CRASH_BEHAVIOR_ASK; + // If we didn't load any files above, this will return the default + S32 value = mCrashSettings.getS32("CrashSubmitBehavior"); - return value; + // Whatever value we got, make sure it's valid + switch (value) + { + case CRASH_BEHAVIOR_NEVER_SEND: + return CRASH_BEHAVIOR_NEVER_SEND; + case CRASH_BEHAVIOR_ALWAYS_SEND: + return CRASH_BEHAVIOR_ALWAYS_SEND; + } + + return CRASH_BEHAVIOR_ASK; } bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior) { - if (crash_behavior != CRASH_BEHAVIOR_ASK && crash_behavior != CRASH_BEHAVIOR_ALWAYS_SEND) return false; + switch (crash_behavior) + { + case CRASH_BEHAVIOR_ASK: + case CRASH_BEHAVIOR_NEVER_SEND: + case CRASH_BEHAVIOR_ALWAYS_SEND: + break; + default: + return false; + } - mCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior); + mCrashSettings.setS32("CrashSubmitBehavior", crash_behavior); std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); - mCrashSettings.saveToFile(filename, FALSE); return true; @@ -309,14 +320,13 @@ bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior) bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout) { gBreak = false; - std::string status_message; for(int i = 0; i < retries; ++i) { - status_message = llformat("%s, try %d...", msg.c_str(), i+1); + updateApplication(llformat("%s, try %d...", msg.c_str(), i+1)); LLHTTPClient::post(host, data, new LLCrashLoggerResponder(), timeout); while(!gBreak) { - updateApplication(status_message); + updateApplication(); // No new message, just pump the IO } if(gSent) { @@ -336,7 +346,7 @@ bool LLCrashLogger::sendCrashLogs() updateApplication("Sending reports..."); std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, - "SecondLifeCrashReport"); + "SecondLifeCrashReport"); std::string report_file = dump_path + ".log"; std::ofstream out_file(report_file.c_str()); @@ -365,6 +375,7 @@ void LLCrashLogger::updateApplication(const std::string& message) { gServicePump->pump(); gServicePump->callback(); + if (!message.empty()) llinfos << message << llendl; } bool LLCrashLogger::init() @@ -374,14 +385,27 @@ bool LLCrashLogger::init() // We assume that all the logs we're looking for reside on the current drive gDirUtilp->initAppDirs("SecondLife"); + LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "")); + // Default to the product name "Second Life" (this is overridden by the -name argument) mProductName = "Second Life"; + + // Rename current log file to ".old" + std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log.old"); + std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log"); + LLFile::rename(log_file.c_str(), old_log_file.c_str()); + + // Set the log file to crashreport.log + LLError::logToFile(log_file); - mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " - "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)"); + mCrashSettings.declareS32("CrashSubmitBehavior", CRASH_BEHAVIOR_ALWAYS_SEND, + "Controls behavior when viewer crashes " + "(0 = ask before sending crash report, " + "1 = always send crash report, " + "2 = never send crash report)"); - llinfos << "Loading crash behavior setting" << llendl; - mCrashBehavior = loadCrashBehaviorSetting(); + // llinfos << "Loading crash behavior setting" << llendl; + // mCrashBehavior = loadCrashBehaviorSetting(); // If user doesn't want to send, bail out if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND) @@ -394,10 +418,11 @@ bool LLCrashLogger::init() gServicePump->prime(gAPRPoolp); LLHTTPClient::setPump(*gServicePump); - //If we've opened the crash logger, assume we can delete the marker file if it exists + //If we've opened the crash logger, assume we can delete the marker file if it exists if( gDirUtilp ) { - std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker"); + std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, + "SecondLife.exec_marker"); LLAPRFile::remove( marker_file ); } diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index a5daa74247..5d0cb5931c 100644 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -66,15 +66,4 @@ protected: bool mSentCrashLogs; }; -class LLCrashLoggerText : public LLCrashLogger -{ -public: - LLCrashLoggerText(void) {} - ~LLCrashLoggerText(void) {} - - virtual bool mainLoop(); - virtual void updateApplication(const std::string& message = LLStringUtil::null); -}; - - #endif //LLCRASHLOGGER_H diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt index 9dadad7dd3..cd100cdf9f 100644 --- a/indra/llmath/CMakeLists.txt +++ b/indra/llmath/CMakeLists.txt @@ -12,6 +12,8 @@ include_directories( set(llmath_SOURCE_FILES llbbox.cpp llbboxlocal.cpp + llcalc.cpp + llcalcparser.cpp llcamera.cpp llcoordframe.cpp llline.cpp @@ -46,6 +48,8 @@ set(llmath_HEADER_FILES coordframe.h llbbox.h llbboxlocal.h + llcalc.h + llcalcparser.h llcamera.h llcoord.h llcoordframe.h diff --git a/indra/llmath/llcalc.cpp b/indra/llmath/llcalc.cpp new file mode 100644 index 0000000000..597d0815fb --- /dev/null +++ b/indra/llmath/llcalc.cpp @@ -0,0 +1,145 @@ +/* + * LLCalc.cpp + * SecondLife + * + * Created by Aimee Walton on 28/09/2008. + * Copyright 2008 Aimee Walton. + * + */ + +#include "linden_common.h" + +#include "llcalc.h" + +#include "llcalcparser.h" +#include "llmath.h" + + +// Variable names for use in the build floater +const char* LLCalc::X_POS = "PX"; +const char* LLCalc::Y_POS = "PY"; +const char* LLCalc::Z_POS = "PZ"; +const char* LLCalc::X_SCALE = "SX"; +const char* LLCalc::Y_SCALE = "SY"; +const char* LLCalc::Z_SCALE = "SZ"; +const char* LLCalc::X_ROT = "RX"; +const char* LLCalc::Y_ROT = "RY"; +const char* LLCalc::Z_ROT = "RZ"; +const char* LLCalc::HOLLOW = "HLW"; +const char* LLCalc::CUT_BEGIN = "CB"; +const char* LLCalc::CUT_END = "CE"; +const char* LLCalc::PATH_BEGIN = "PB"; +const char* LLCalc::PATH_END = "PE"; +const char* LLCalc::TWIST_BEGIN = "TB"; +const char* LLCalc::TWIST_END = "TE"; +const char* LLCalc::X_SHEAR = "SHX"; +const char* LLCalc::Y_SHEAR = "SHY"; +const char* LLCalc::X_TAPER = "TPX"; +const char* LLCalc::Y_TAPER = "TPY"; +const char* LLCalc::RADIUS_OFFSET = "ROF"; +const char* LLCalc::REVOLUTIONS = "REV"; +const char* LLCalc::SKEW = "SKW"; +const char* LLCalc::X_HOLE = "HLX"; +const char* LLCalc::Y_HOLE = "HLY"; +const char* LLCalc::TEX_U_SCALE = "TSU"; +const char* LLCalc::TEX_V_SCALE = "TSV"; +const char* LLCalc::TEX_U_OFFSET = "TOU"; +const char* LLCalc::TEX_V_OFFSET = "TOV"; +const char* LLCalc::TEX_ROTATION = "TROT"; +const char* LLCalc::TEX_TRANSPARENCY = "TRNS"; +const char* LLCalc::TEX_GLOW = "GLOW"; + + +LLCalc* LLCalc::sInstance = NULL; + +LLCalc::LLCalc() : mLastErrorPos(0) +{ + // Init table of constants + mConstants["PI"] = F_PI; + mConstants["TWO_PI"] = F_TWO_PI; + mConstants["PI_BY_TWO"] = F_PI_BY_TWO; + mConstants["SQRT_TWO_PI"] = F_SQRT_TWO_PI; + mConstants["SQRT2"] = F_SQRT2; + mConstants["SQRT3"] = F_SQRT3; + mConstants["DEG_TO_RAD"] = DEG_TO_RAD; + mConstants["RAD_TO_DEG"] = RAD_TO_DEG; + mConstants["GRAVITY"] = GRAVITY; +} + +LLCalc::~LLCalc() +{ +} + +//static +void LLCalc::cleanUp() +{ + delete sInstance; + sInstance = NULL; +} + +//static +LLCalc* LLCalc::getInstance() +{ + if (!sInstance) sInstance = new LLCalc(); + return sInstance; +} + +void LLCalc::setVar(const std::string& name, const F32& value) +{ + mVariables[name] = value; +} + +void LLCalc::clearVar(const std::string& name) +{ + mVariables.erase(name); +} + +void LLCalc::clearAllVariables() +{ + mVariables.clear(); +} + +/* +void LLCalc::updateVariables(LLSD& vars) +{ + LLSD::map_iterator cIt = vars.beginMap(); + for(; cIt != vars.endMap(); cIt++) + { + setVar(cIt->first, (F32)(LLSD::Real)cIt->second); + } +} +*/ + +bool LLCalc::evalString(const std::string& expression, F32& result) +{ + std::string expr_upper = expression; + LLStringUtil::toUpper(expr_upper); + + LLCalcParser calc(result, &mConstants, &mVariables); + + mLastErrorPos = 0; + std::string::iterator start = expr_upper.begin(); + parse_info<std::string::iterator> info; + + try + { + info = parse(start, expr_upper.end(), calc, space_p); + lldebugs << "Math expression: " << expression << " = " << result << llendl; + } + catch(parser_error<std::string, std::string::iterator> &e) + { + mLastErrorPos = e.where - expr_upper.begin(); + + llinfos << "Calc parser exception: " << e.descriptor << " at " << mLastErrorPos << " in expression: " << expression << llendl; + return false; + } + + if (!info.full) + { + mLastErrorPos = info.stop - expr_upper.begin(); + llinfos << "Unhandled syntax error at " << mLastErrorPos << " in expression: " << expression << llendl; + return false; + } + + return true; +} diff --git a/indra/llmath/llcalc.h b/indra/llmath/llcalc.h new file mode 100644 index 0000000000..cc31950cb6 --- /dev/null +++ b/indra/llmath/llcalc.h @@ -0,0 +1,83 @@ +/* + * LLCalc.h + * SecondLife + * + * Created by Aimee Walton on 28/09/2008. + * Copyright 2008 Aimee Walton. + * + */ + +#ifndef LL_CALC_H +#define LL_CALC_H + +#include <map> +#include <string> + +class LLCalc +{ +public: + LLCalc(); + ~LLCalc(); + + // Variable name constants + static const char* X_POS; + static const char* Y_POS; + static const char* Z_POS; + static const char* X_SCALE; + static const char* Y_SCALE; + static const char* Z_SCALE; + static const char* X_ROT; + static const char* Y_ROT; + static const char* Z_ROT; + static const char* HOLLOW; + static const char* CUT_BEGIN; + static const char* CUT_END; + static const char* PATH_BEGIN; + static const char* PATH_END; + static const char* TWIST_BEGIN; + static const char* TWIST_END; + static const char* X_SHEAR; + static const char* Y_SHEAR; + static const char* X_TAPER; + static const char* Y_TAPER; + static const char* RADIUS_OFFSET; + static const char* REVOLUTIONS; + static const char* SKEW; + static const char* X_HOLE; + static const char* Y_HOLE; + static const char* TEX_U_SCALE; + static const char* TEX_V_SCALE; + static const char* TEX_U_OFFSET; + static const char* TEX_V_OFFSET; + static const char* TEX_ROTATION; + static const char* TEX_TRANSPARENCY; + static const char* TEX_GLOW; + + void setVar(const std::string& name, const F32& value); + void clearVar(const std::string& name); + void clearAllVariables(); +// void updateVariables(LLSD& vars); + + bool evalString(const std::string& expression, F32& result); + std::string::size_type getLastErrorPos() { return mLastErrorPos; } + + static LLCalc* getInstance(); + static void cleanUp(); + + typedef std::map<std::string, F32> calc_map_t; + +private: + std::string::size_type mLastErrorPos; + + calc_map_t mConstants; + calc_map_t mVariables; + + // *TODO: Add support for storing user defined variables, and stored functions. + // Will need UI work, and a means to save them between sessions. +// calc_map_t mUserVariables; + + // "There shall be only one" + static LLCalc* sInstance; +}; + +#endif // LL_CALC_H diff --git a/indra/llmath/llcalcparser.cpp b/indra/llmath/llcalcparser.cpp new file mode 100644 index 0000000000..fd55376fa9 --- /dev/null +++ b/indra/llmath/llcalcparser.cpp @@ -0,0 +1,46 @@ +/* + * LLCalcParser.cpp + * SecondLife + * + * Created by Aimee Walton on 28/09/2008. + * Copyright 2008 Aimee Walton. + * + */ + +#include "linden_common.h" + +#include "llcalcparser.h" +using namespace boost::spirit::classic; + +F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::iterator& end) const +{ + LLCalc::calc_map_t::iterator iter; + + std::string name(start, end); + + if (mConstants) + { + iter = mConstants->find(name); + if (iter != mConstants->end()) + { + return (*iter).second; + } + } + else + { + // This should never happen! + throw_(end, std::string("Missing constants table")); + } + + if (mVariables) + { + iter = mVariables->find(name); + if (iter != mVariables->end()) + { + return (*iter).second; + } + } + + throw_(end, std::string("Unknown symbol " + name)); + return 0.f; +} diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h new file mode 100644 index 0000000000..600e173661 --- /dev/null +++ b/indra/llmath/llcalcparser.h @@ -0,0 +1,174 @@ +/* + * LLCalcParser.h + * SecondLife + * + * Created by Aimee Walton on 28/09/2008. + * Copyright 2008 Aimee Walton. + * + */ + +#ifndef LL_CALCPARSER_H +#define LL_CALCPARSER_H + +#include <boost/spirit/include/classic_attribute.hpp> +#include <boost/spirit/include/classic_core.hpp> +#include <boost/spirit/include/classic_error_handling.hpp> +#include <boost/spirit/include/classic_position_iterator.hpp> +#include <boost/spirit/include/phoenix1_binders.hpp> +#include <boost/spirit/include/classic_symbols.hpp> +using namespace boost::spirit::classic; + +#include "llcalc.h" +#include "llmath.h" + +struct LLCalcParser : grammar<LLCalcParser> +{ + LLCalcParser(F32& result, LLCalc::calc_map_t* constants, LLCalc::calc_map_t* vars) : + mResult(result), mConstants(constants), mVariables(vars) {}; + + struct value_closure : closure<value_closure, F32> + { + member1 value; + }; + + template <typename ScannerT> + struct definition + { + // Rule declarations + rule<ScannerT> statement, identifier; + rule<ScannerT, value_closure::context_t> expression, term, + power, + unary_expr, + factor, + unary_func, + binary_func, + group; + + // start() should return the starting symbol + rule<ScannerT> const& start() const { return statement; } + + definition(LLCalcParser const& self) + { + using namespace phoenix; + + assertion<std::string> assert_domain("Domain error"); +// assertion<std::string> assert_symbol("Unknown symbol"); + assertion<std::string> assert_syntax("Syntax error"); + + identifier = + lexeme_d[(alpha_p | '_') >> *(alnum_p | '_')] + ; + + group = + '(' >> expression[group.value = arg1] >> assert_syntax(ch_p(')')) + ; + + unary_func = + ((str_p("SIN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sin)(self,arg1)]) | + (str_p("COS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_cos)(self,arg1)]) | + (str_p("TAN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_tan)(self,arg1)]) | + (str_p("ASIN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_asin)(self,arg1)]) | + (str_p("ACOS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_acos)(self,arg1)]) | + (str_p("ATAN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_atan)(self,arg1)]) | + (str_p("SQRT") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sqrt)(self,arg1)]) | + (str_p("LOG") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_log)(self,arg1)]) | + (str_p("EXP") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_exp)(self,arg1)]) | + (str_p("ABS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_fabs)(self,arg1)]) | + (str_p("FLR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_floor)(self,arg1)]) | + (str_p("CEIL") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_ceil)(self,arg1)]) + ) >> assert_syntax(ch_p(')')) + ; + + binary_func = + ((str_p("ATAN2") >> '(' >> expression[binary_func.value = arg1] >> ',' >> + expression[binary_func.value = bind(&LLCalcParser::_atan2)(self, binary_func.value, arg1)]) | + (str_p("MIN") >> '(' >> expression[binary_func.value = arg1] >> ',' >> + expression[binary_func.value = bind(&LLCalcParser::_min)(self, binary_func.value, arg1)]) | + (str_p("MAX") >> '(' >> expression[binary_func.value = arg1] >> ',' >> + expression[binary_func.value = bind(&LLCalcParser::_max)(self, binary_func.value, arg1)]) + ) >> assert_syntax(ch_p(')')) + ; + + // *TODO: Localisation of the decimal point? + // Problem, LLLineEditor::postvalidateFloat accepts a comma when appropriate + // for the current locale. However to do that here could clash with using + // the comma as a separator when passing arguments to functions. + factor = + (ureal_p[factor.value = arg1] | + group[factor.value = arg1] | + unary_func[factor.value = arg1] | + binary_func[factor.value = arg1] | + // Lookup throws an Unknown Symbol error if it is unknown, while this works fine, + // would be "neater" to handle symbol lookup from here with an assertive parser. +// constants_p[factor.value = arg1]| + identifier[factor.value = bind(&LLCalcParser::lookup)(self, arg1, arg2)] + ) >> + // Detect and throw math errors. + assert_domain(eps_p(bind(&LLCalcParser::checkNaN)(self, factor.value))) + ; + + unary_expr = + !ch_p('+') >> factor[unary_expr.value = arg1] | + '-' >> factor[unary_expr.value = -arg1] + ; + + power = + unary_expr[power.value = arg1] >> + *('^' >> assert_syntax(unary_expr[power.value = bind(&powf)(power.value, arg1)])) + ; + + term = + power[term.value = arg1] >> + *(('*' >> assert_syntax(power[term.value *= arg1])) | + ('/' >> assert_syntax(power[term.value /= arg1])) | + ('%' >> assert_syntax(power[term.value = bind(&fmodf)(term.value, arg1)])) + ) + ; + + expression = + assert_syntax(term[expression.value = arg1]) >> + *(('+' >> assert_syntax(term[expression.value += arg1])) | + ('-' >> assert_syntax(term[expression.value -= arg1])) + ) + ; + + statement = + !ch_p('=') >> ( expression )[var(self.mResult) = arg1] >> (end_p) + ; + } + }; + +private: + // Member functions for semantic actions + F32 lookup(const std::string::iterator&, const std::string::iterator&) const; + F32 _min(const F32& a, const F32& b) const { return llmin(a, b); } + F32 _max(const F32& a, const F32& b) const { return llmax(a, b); } + + bool checkNaN(const F32& a) const { return !llisnan(a); } + + //FIX* non ambigious function fix making SIN() work for calc -Cryogenic Blitz + F32 _sin(const F32& a) const { return sin(DEG_TO_RAD * a); } + F32 _cos(const F32& a) const { return cos(DEG_TO_RAD * a); } + F32 _tan(const F32& a) const { return tan(DEG_TO_RAD * a); } + F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); } + F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); } + F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); } + F32 _sqrt(const F32& a) const { return sqrt(a); } + F32 _log(const F32& a) const { return log(a); } + F32 _exp(const F32& a) const { return exp(a); } + F32 _fabs(const F32& a) const { return fabs(a); } + F32 _floor(const F32& a) const { return llfloor(a); } + F32 _ceil(const F32& a) const { return llceil(a); } + + F32 _atan2(const F32& a,const F32& b) const { return atan2(a,b); } + + + + LLCalc::calc_map_t* mConstants; + LLCalc::calc_map_t* mVariables; +// LLCalc::calc_map_t* mUserVariables; + + F32& mResult; +}; + +#endif // LL_CALCPARSER_H diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 123997e5e9..06fbc0f234 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -37,6 +37,7 @@ #include "llgl.h" #include "lltimer.h" +#include "llcalc.h" //#include "llclipboard.h" #include "llcontrol.h" #include "llbutton.h" @@ -133,6 +134,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) mIgnoreTab( p.ignore_tab ), mDrawAsterixes( p.is_password ), mSelectAllonFocusReceived( p.select_on_focus ), + mSelectAllonCommit( TRUE ), mPassDelete(FALSE), mReadOnly(FALSE), mBgImage( p.background_image ), @@ -230,7 +232,10 @@ void LLLineEditor::onCommit() setControlValue(getValue()); LLUICtrl::onCommit(); - selectAll(); + + // Selection on commit needs to be turned off when evaluating maths + // expressions, to allow indication of the error position + if (mSelectAllonCommit) selectAll(); } // Returns TRUE if user changed value at all @@ -2072,6 +2077,32 @@ BOOL LLLineEditor::postvalidateFloat(const std::string &str) return success; } +BOOL LLLineEditor::evaluateFloat() +{ + bool success; + F32 result = 0.f; + std::string expr = getText(); + LLStringUtil::toUpper(expr); + + success = LLCalc::getInstance()->evalString(expr, result); + + if (!success) + { + // Move the cursor to near the error on failure + setCursor(LLCalc::getInstance()->getLastErrorPos()); + // *TODO: Translated error message indicating the type of error? Select error text? + } + else + { + // Replace the expression with the result + std::string result_str = llformat("%f",result); + setText(result_str); + selectAll(); + } + + return success; +} + void LLLineEditor::onMouseCaptureLost() { endSelection(); diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 4b77708590..583bde360a 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -221,6 +221,7 @@ public: void deleteSelection(); void setSelectAllonFocusReceived(BOOL b); + void setSelectAllonCommit(BOOL b) { mSelectAllonCommit = b; } typedef boost::function<void (LLLineEditor* caller, void* user_data)> callback_t; void setKeystrokeCallback(callback_t callback, void* user_data); @@ -241,6 +242,7 @@ public: static BOOL postvalidateFloat(const std::string &str); bool prevalidateInput(const LLWString& wstr); + BOOL evaluateFloat(); // line history support: void setEnableLineHistory( BOOL enabled ) { mHaveHistory = enabled; } // switches line history on or off @@ -340,6 +342,7 @@ protected: BOOL mDrawAsterixes; BOOL mSelectAllonFocusReceived; + BOOL mSelectAllonCommit; BOOL mPassDelete; BOOL mReadOnly; diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 15a7438ec9..934879cdfd 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -44,7 +44,7 @@ #include "llresmgr.h" #include "lluictrlfactory.h" -const U32 MAX_STRING_LENGTH = 32; +const U32 MAX_STRING_LENGTH = 255; static LLDefaultChildRegistry::Register<LLSpinCtrl> r2("spinner"); @@ -124,14 +124,7 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p) params.max_length.bytes(MAX_STRING_LENGTH); params.commit_callback.function((boost::bind(&LLSpinCtrl::onEditorCommit, this, _2))); - if( mPrecision>0 )//should accept float numbers - { - params.prevalidate_callback(&LLTextValidate::validateFloat); - } - else //should accept int numbers - { - params.prevalidate_callback(&LLTextValidate::validateInt); - } + //*NOTE: allow entering of any chars for LLCalc, proper input will be evaluated on commit params.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM); mEditor = LLUICtrlFactory::create<LLLineEditor> (params); @@ -140,6 +133,7 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p) // than when it doesn't. Instead, if you always have to double click to select all the text, // it's easier to understand //mEditor->setSelectAllonFocusReceived(TRUE); + mEditor->setSelectAllonCommit(FALSE); addChild(mEditor); updateEditor(); @@ -304,9 +298,10 @@ void LLSpinCtrl::onEditorCommit( const LLSD& data ) { BOOL success = FALSE; - std::string text = mEditor->getText(); - if( LLLineEditor::postvalidateFloat( text ) ) + if( mEditor->evaluateFloat() ) { + std::string text = mEditor->getText(); + LLLocale locale(LLLocale::USER_LOCALE); F32 val = (F32) atof(text.c_str()); @@ -327,7 +322,11 @@ void LLSpinCtrl::onEditorCommit( const LLSD& data ) } updateEditor(); - if( !success ) + if( success ) + { + updateEditor(); + } + else { reportInvalidData(); } diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index 25550321f0..ff92cbb7fd 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -52,8 +52,20 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) { fs::path dir_path(dirname); - // Check if path exists. - if (!fs::exists(dir_path)) + bool is_dir = false; + + // Check if path is a directory. + try + { + is_dir = fs::is_directory(dir_path); + } + catch (fs::basic_filesystem_error<fs::path>& e) + { + llwarns << e.what() << llendl; + return; + } + + if (!is_dir) { llwarns << "Invalid path: \"" << dir_path.string() << "\"" << llendl; return; @@ -66,7 +78,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) } catch (fs::basic_filesystem_error<fs::path>& e) { - llerrs << e.what() << llendl; + llwarns << e.what() << llendl; return; } @@ -82,7 +94,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) } catch (boost::regex_error& e) { - llerrs << "\"" << exp << "\" is not a valid regular expression: " + llwarns << "\"" << exp << "\" is not a valid regular expression: " << e.what() << llendl; return; } diff --git a/indra/mac_crash_logger/CrashReporter.nib/objects.xib b/indra/mac_crash_logger/CrashReporter.nib/objects.xib index 634d1c5321..32647391b6 100644 --- a/indra/mac_crash_logger/CrashReporter.nib/objects.xib +++ b/indra/mac_crash_logger/CrashReporter.nib/objects.xib @@ -15,7 +15,7 @@ <string name="bounds">414 390 434 487 </string> </object> <object class="IBCarbonStaticText" id="181"> - <string name="title">Second Life appears to have crashed or frozen the last time it ran. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Cancel. </string> + <string name="title">Second Life appears to have crashed or frozen the last time it ran. This crash reporter collects information about your computer's hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only. In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help! This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/ If you don't wish to send Linden Lab a crash report, press Don't Send. </string> <string name="bounds">20 20 231 487 </string> </object> <object class="IBCarbonWindow" id="166"> diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index bec8cce04e..b555e92b96 100644 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -29,9 +29,6 @@ #include <Carbon/Carbon.h> #include <iostream> -#include <sstream> - -#include "boost/tokenizer.hpp" #include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME #include "llerror.h" @@ -247,7 +244,7 @@ bool LLCrashLoggerMac::mainLoop() void LLCrashLoggerMac::updateApplication(const std::string& message) { - LLCrashLogger::updateApplication(); + LLCrashLogger::updateApplication(message); } bool LLCrashLoggerMac::cleanup() diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 20b491c401..6571b35241 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -25,22 +25,23 @@ */ #include "linden_common.h" - #include "llcrashloggermac.h" int main(int argc, char **argv) { - //time(&gLaunchTime); - - llinfos << "Starting Second Life Viewer Crash Reporter" << llendl; + llinfos << "Starting crash reporter." << llendl; LLCrashLoggerMac app; app.parseCommandOptions(argc, argv); - if(!app.init()) + + if (! app.init()) { - return 0; + llwarns << "Unable to initialize application." << llendl; + return 1; } + app.mainLoop(); - + app.cleanup(); + llinfos << "Crash reporter finished normally." << llendl; return 0; } diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 89e5949fbe..15434f2b8f 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -220,8 +220,7 @@ <map> <key>desc</key> <string>Set the detail level. - 0 - low, 1 - medium, 2 - high, 3 - ultra - </string> +0 - low, 1 - medium, 2 - high, 3 - ultra</string> <key>count</key> <integer>1</integer> </map> @@ -229,10 +228,7 @@ <key>setdefault</key> <map> <key>desc</key> - <string> specify the value of a particular - configuration variable which can be - overridden by settings.xml - </string> + <string>specify the value of a particular configuration variable which can be overridden by settings.xml.</string> <key>count</key> <integer>2</integer> <!-- Special case. Mapped to settings procedurally. --> @@ -241,10 +237,7 @@ <key>set</key> <map> <key>desc</key> - <string> specify the value of a particular - configuration variable that - overrides all other settings - </string> + <string>specify the value of a particular configuration variable that overrides all other settings.</string> <key>count</key> <integer>2</integer> <key>compose</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 91cbfde07f..9bb320d882 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3848,7 +3848,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://www.xstreetsl.com/modules.php?name=Marketplace&CategoryID=233</string> + <string>https://marketplace.secondlife.com/products/search?search[category_id]=200&search[maturity][]=General&search[page]=1&search[per_page]=12</string> </map> <key>GridCrossSections</key> <map> @@ -4872,7 +4872,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string /> + <string>http://viewer-login.agni.lindenlab.com/</string> </map> <key>LosslessJ2CUpload</key> <map> @@ -4894,7 +4894,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>20.0</real> + <real>60.0</real> </map> <key>MapOverlayIndex</key> <map> @@ -12578,13 +12578,13 @@ <key>WatchdogEnabled</key> <map> <key>Comment</key> - <string>Controls whether the thread watchdog timer is activated.</string> + <string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string> <key>Persist</key> <integer>0</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <integer>-1</integer> + <integer>1</integer> </map> <key>WaterGLFogDensityScale</key> <map> diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml index 079a54f957..bfc09286e3 100644 --- a/indra/newview/app_settings/settings_files.xml +++ b/indra/newview/app_settings/settings_files.xml @@ -20,7 +20,8 @@ file_name="settings.xml" file_name_setting="ClientSettingsFile"/> <file name="CrashSettings" - file_name="settings_crash_behavior"/> + file_name="settings_crash_behavior.xml" + file_name_setting="CrashSettingsFile"/> <file name="Warnings" file_name="ignorable_dialogs.xml" file_name_setting="WarningSettingsFile"/> @@ -61,4 +62,4 @@ file_name="colors.xml" file_name_setting="SkinningSettingsFile"/> </group> -</settings_files>
\ No newline at end of file +</settings_files> diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 8954937f69..492cfe7c1b 100644..100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -577,7 +577,10 @@ void LLAgent::setFlying(BOOL fly) // static void LLAgent::toggleFlying() { - LLToolPie::instance().stopClickToWalk(); + if ( gAgent.mAutoPilot ) + { + LLToolPie::instance().stopClickToWalk(); + } BOOL fly = !gAgent.getFlying(); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1d9519d675..862fc49c0e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -56,6 +56,7 @@ #include "llallocator.h" #include "llares.h" #include "llcurl.h" +#include "llcalc.h" #include "lltexturestats.h" #include "lltexturestats.h" #include "llviewerwindow.h" @@ -468,18 +469,6 @@ void request_initial_instant_messages() } } -// A settings system callback for CrashSubmitBehavior -bool handleCrashSubmitBehaviorChanged(const LLSD& newvalue) -{ - S32 cb = newvalue.asInteger(); - const S32 NEVER_SUBMIT_REPORT = 2; - if(cb == NEVER_SUBMIT_REPORT) - { - LLAppViewer::instance()->destroyMainloopTimeout(); - } - return true; -} - // Use these strictly for things that are constructed at startup, // or for things that are performance critical. JC static void settings_to_globals() @@ -611,9 +600,6 @@ bool LLAppViewer::sendURLToOtherInstance(const std::string& url) // Static members. // The single viewer app. LLAppViewer* LLAppViewer::sInstance = NULL; - -const std::string LLAppViewer::sGlobalSettingsName = "Global"; - LLTextureCache* LLAppViewer::sTextureCache = NULL; LLImageDecodeThread* LLAppViewer::sImageDecodeThread = NULL; LLTextureFetch* LLAppViewer::sTextureFetch = NULL; @@ -771,16 +757,6 @@ bool LLAppViewer::init() LL_INFOS("InitInfo") << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << LL_ENDL; LL_INFOS("InitInfo") << "libcurl version is: " << LLCurl::getVersionString() << LL_ENDL; - // Get the single value from the crash settings file, if it exists - std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); - gCrashSettings.loadFromFile(crash_settings_filename); - if(gSavedSettings.getBOOL("IgnoreAllNotifications")) - { - gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ALWAYS_SEND); - gCrashSettings.saveToFile(crash_settings_filename, FALSE); - } - LL_INFOS("InitInfo") << "Crash settings done." << LL_ENDL ; - ///////////////////////////////////////////////// // OS-specific login dialogs ///////////////////////////////////////////////// @@ -1055,7 +1031,7 @@ bool LLAppViewer::init() //EXT-7013 - On windows for some locale (Japanese) standard //datetime formatting functions didn't support some parameters such as "weekday". //Names for days and months localized in xml are also useful for Polish locale(STORM-107). - std::string language = LLControlGroup::getInstance(sGlobalSettingsName)->getString("Language"); + std::string language = gSavedSettings.getString("Language"); if(language == "ja" || language == "pl") { LLStringOps::setupWeekDaysNames(LLTrans::getString("dateTimeWeekdaysNames")); @@ -1543,7 +1519,9 @@ bool LLAppViewer::cleanup() // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted. LLWorldMap::getInstance()->reset(); // release any images - + + LLCalc::cleanUp(); + llinfos << "Global stuff deleted" << llendflush; if (gAudiop) @@ -1706,10 +1684,6 @@ bool LLAppViewer::cleanup() llinfos << "Saved settings" << llendflush; } - std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); - // save all settings, even if equals defaults - gCrashSettings.saveToFile(crash_settings_filename, FALSE); - std::string warnings_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Warnings")); gWarningSettings.saveToFile(warnings_settings_filename, TRUE); @@ -1839,7 +1813,6 @@ bool LLAppViewer::cleanup() gSavedSettings.cleanup(); LLUIColorTable::instance().clear(); - gCrashSettings.cleanup(); LLWatchdog::getInstance()->cleanup(); @@ -1982,7 +1955,6 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key, llerrs << "Invalid settings location list" << llendl; } - LLControlGroup* global_settings = LLControlGroup::getInstance(sGlobalSettingsName); for(LLInitParam::ParamIterator<SettingsGroup>::const_iterator it = mSettingsLocationList->groups.begin(), end_it = mSettingsLocationList->groups.end(); it != end_it; ++it) @@ -2015,11 +1987,15 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key, std::string full_settings_path; if (file_it->file_name_setting.isProvided() - && global_settings->controlExists(file_it->file_name_setting)) + && gSavedSettings.controlExists(file_it->file_name_setting)) { // try to find filename stored in file_name_setting control - full_settings_path = global_settings->getString(file_it->file_name_setting); - if (!gDirUtilp->fileExists(full_settings_path)) + full_settings_path = gSavedSettings.getString(file_it->file_name_setting); + if (full_settings_path.empty()) + { + continue; + } + else if (!gDirUtilp->fileExists(full_settings_path)) { // search in default path full_settings_path = gDirUtilp->getExpandedFilename((ELLPath)path_index, full_settings_path); @@ -2165,8 +2141,6 @@ bool LLAppViewer::initConfiguration() gSavedSettings.setS32("WatchdogEnabled", 0); #endif - gCrashSettings.getControl(CRASH_BEHAVIOR_SETTING)->getSignal()->connect(boost::bind(&handleCrashSubmitBehaviorChanged, _2)); - // These are warnings that appear on the first experience of that condition. // They are already set in the settings_default.xml file, but still need to be added to LLFirstUse // for disable/reset ability @@ -2297,15 +2271,33 @@ bool LLAppViewer::initConfiguration() { const std::string& name = *itr; const std::string& value = *(++itr); - LLControlVariable* c = LLControlGroup::getInstance(sGlobalSettingsName)->getControl(name); - if(c) + std::string name_part; + std::string group_part; + LLControlVariable* control = NULL; + + // Name can be further split into ControlGroup.Name, with the default control group being Global + size_t pos = name.find('.'); + if (pos != std::string::npos) + { + group_part = name.substr(0, pos); + name_part = name.substr(pos+1); + llinfos << "Setting " << group_part << "." << name_part << " to " << value << llendl; + LLControlGroup* g = LLControlGroup::getInstance(group_part); + if (g) control = g->getControl(name_part); + } + else + { + llinfos << "Setting Global." << name << " to " << value << llendl; + control = gSavedSettings.getControl(name); + } + + if (control) { - c->setValue(value, false); + control->setValue(value, false); } else { - llwarns << "'--set' specified with unknown setting: '" - << name << "'." << llendl; + llwarns << "Failed --set " << name << ": setting name unknown." << llendl; } } } @@ -2762,7 +2754,8 @@ void LLAppViewer::checkForCrash(void) // Pop up a freeze or crash warning dialog // S32 choice; - if(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) == CRASH_BEHAVIOR_ASK) + const S32 cb = gCrashSettings.getS32("CrashSubmitBehavior"); + if(cb == CRASH_BEHAVIOR_ASK) { std::ostringstream msg; msg << LLTrans::getString("MBFrozenCrashed"); @@ -2771,7 +2764,7 @@ void LLAppViewer::checkForCrash(void) alert, OSMB_YESNO); } - else if(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) == CRASH_BEHAVIOR_NEVER_SEND) + else if(cb == CRASH_BEHAVIOR_NEVER_SEND) { choice = OSBTN_NO; } @@ -2828,10 +2821,9 @@ bool LLAppViewer::initWindow() LL_INFOS("AppInit") << "gViewerwindow created." << LL_ENDL; // Need to load feature table before cheking to start watchdog. - const S32 NEVER_SUBMIT_REPORT = 2; bool use_watchdog = false; int watchdog_enabled_setting = gSavedSettings.getS32("WatchdogEnabled"); - if(watchdog_enabled_setting == -1) + if (watchdog_enabled_setting == -1) { use_watchdog = !LLFeatureManager::getInstance()->isFeatureAvailable("WatchdogDisabled"); } @@ -2841,8 +2833,7 @@ bool LLAppViewer::initWindow() use_watchdog = bool(watchdog_enabled_setting); } - bool send_reports = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT; - if(use_watchdog && send_reports) + if (use_watchdog) { LLWatchdog::getInstance()->init(watchdog_killer_callback); } @@ -4513,7 +4504,7 @@ void LLAppViewer::idleShutdown() void LLAppViewer::sendLogoutRequest() { - if(!mLogoutRequestSent) + if(!mLogoutRequestSent && gMessageSystem) { LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_LogoutRequest); diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 714e0e6163..48d02dfeaa 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -361,46 +361,35 @@ void LLAppViewerLinux::handleCrashReporting(bool reportFreeze) } else { - const S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING); - - // Always generate the report, have the logger do the asking, and - // don't wait for the logger before exiting (-> total cleanup). - if (CRASH_BEHAVIOR_NEVER_SEND != cb) - { - // launch the actual crash logger - const char* ask_dialog = "-dialog"; - if (CRASH_BEHAVIOR_ASK != cb) - ask_dialog = ""; // omit '-dialog' option - const char * cmdargv[] = - {cmd.c_str(), - ask_dialog, - "-user", - (char*)LLGridManager::getInstance()->getGridLabel().c_str(), - "-name", - LLAppViewer::instance()->getSecondLifeTitle().c_str(), - NULL}; - fflush(NULL); - pid_t pid = fork(); - if (pid == 0) - { // child - execv(cmd.c_str(), (char* const*) cmdargv); /* Flawfinder: ignore */ - llwarns << "execv failure when trying to start " << cmd << llendl; - _exit(1); // avoid atexit() + // launch the actual crash logger + const char * cmdargv[] = + {cmd.c_str(), + "-user", + (char*)LLGridManager::getInstance()->getGridLabel().c_str(), + "-name", + LLAppViewer::instance()->getSecondLifeTitle().c_str(), + NULL}; + fflush(NULL); + pid_t pid = fork(); + if (pid == 0) + { // child + execv(cmd.c_str(), (char* const*) cmdargv); /* Flawfinder: ignore */ + llwarns << "execv failure when trying to start " << cmd << llendl; + _exit(1); // avoid atexit() + } + else + { + if (pid > 0) + { + // DO NOT wait for child proc to die; we want + // the logger to outlive us while we quit to + // free up the screen/keyboard/etc. + ////int childExitStatus; + ////waitpid(pid, &childExitStatus, 0); } else { - if (pid > 0) - { - // DO NOT wait for child proc to die; we want - // the logger to outlive us while we quit to - // free up the screen/keyboard/etc. - ////int childExitStatus; - ////waitpid(pid, &childExitStatus, 0); - } - else - { - llwarns << "fork failure." << llendl; - } + llwarns << "fork failure." << llendl; } } // Sometimes signals don't seem to quit the viewer. Also, we may diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 445bd208ef..f94c843ad9 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -518,11 +518,7 @@ void LLAppViewerWin32::handleCrashReporting(bool reportFreeze) } else { - S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING); - if(cb != CRASH_BEHAVIOR_NEVER_SEND) - { - _spawnl(_P_NOWAIT, exe_path.c_str(), arg_str, NULL); - } + _spawnl(_P_NOWAIT, exe_path.c_str(), arg_str, NULL); } } diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index d7ba4ea470..5b9a449be1 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -449,7 +449,7 @@ void LLSendTexLayerResponder::uploadComplete(const LLSD& content) std::string result = content["state"]; LLUUID new_id = content["new_asset"]; - llinfos << "result: " << result << "new_id:" << new_id << llendl; + llinfos << "result: " << result << " new_id: " << new_id << llendl; if (result == "complete" && mBakedUploadData != NULL) { // Invoke diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index 70871b62e2..381b919c4a 100644 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -112,6 +112,7 @@ private: struct LLBakedUploadData; class LLSendTexLayerResponder : public LLAssetUploadResponder { + LOG_CLASS(LLSendTexLayerResponder); public: LLSendTexLayerResponder(const LLSD& post_data, const LLUUID& vfile_id, diff --git a/indra/newview/lldateutil.cpp b/indra/newview/lldateutil.cpp index 18ae6107e7..c7fc45f61e 100644 --- a/indra/newview/lldateutil.cpp +++ b/indra/newview/lldateutil.cpp @@ -27,10 +27,16 @@ #include "lldateutil.h" +#include <boost/date_time/gregorian/gregorian.hpp> +#include <boost/date_time/posix_time/ptime.hpp> + // Linden libraries #include "lltrans.h" #include "llui.h" +using namespace boost::gregorian; +using namespace boost::posix_time; + static S32 DAYS_PER_MONTH_NOLEAP[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; static S32 DAYS_PER_MONTH_LEAP[] = @@ -186,3 +192,24 @@ std::string LLDateUtil::ageFromDate(const std::string& date_string) //{ // return ageFromDateISO(date_string, LLDate::now()); //} + +S32 LLDateUtil::secondsSinceEpochFromString(const std::string& format, const std::string& str) +{ + date_input_facet *facet = new date_input_facet(format); + + std::stringstream ss; + ss << str; + ss.imbue(std::locale(ss.getloc(), facet)); + + date d; + ss >> d; + + ptime time_t_date(d); + ptime time_t_epoch(date(1970,1,1)); + + // We assume that the date defined by str is in UTC, so the difference + // is calculated with no time zone corrections. + time_duration diff = time_t_date - time_t_epoch; + + return diff.total_seconds(); +} diff --git a/indra/newview/lldateutil.h b/indra/newview/lldateutil.h index 2843a357c9..f027d360f7 100644 --- a/indra/newview/lldateutil.h +++ b/indra/newview/lldateutil.h @@ -69,6 +69,20 @@ namespace LLDateUtil //std::string ageFromDateISO(const std::string& date_string); //std::string ageFromDate(S32 born_year, S32 born_month, S32 born_day, const LLDate& now); + + /** + * Convert a string of a specified date format into seconds since the Epoch. + * + * Many of the format flags are those used by strftime(...), but not all. + * For the full list of supported time format specifiers + * see http://www.boost.org/doc/libs/1_47_0/doc/html/date_time/date_time_io.html#date_time.format_flags + * + * @param format Format characters string. Example: "%A %b %d, %Y" + * @param str Date string containing the time in specified format. + * + * @return Number of seconds since 01/01/1970 UTC. + */ + S32 secondsSinceEpochFromString(const std::string& format, const std::string& str); } #endif diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 7848484ac6..5fd262a720 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -751,10 +751,7 @@ void LLFloaterPreference::onBtnOK() closeFloater(false); LLUIColorTable::instance().saveUserSettings(); - gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE ); - std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); - // save all settings, even if equals defaults - gCrashSettings.saveToFile(crash_settings_filename, FALSE); + gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE); } else { diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index eb3c7ee469..d5f0648f3b 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -70,7 +70,7 @@ #include "llappviewer.h" #include "llmapimagetype.h" #include "llweb.h" -#include "llslider.h" +#include "llsliderctrl.h" #include "message.h" #include "llwindow.h" // copyTextToClipboard() #include <algorithm> @@ -1029,7 +1029,7 @@ void LLFloaterWorldMap::adjustZoomSliderBounds() F32 min_power = log(pixels_per_region/256.f)/log(2.f); - getChild<LLSlider>("zoom slider")->setMinValue(min_power); + getChild<LLSliderCtrl>("zoom slider")->setMinValue(min_power); } diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 07c7f35989..a4f6921f98 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -30,6 +30,7 @@ #include "llpanelface.h" // library includes +#include "llcalc.h" #include "llerror.h" #include "llfocusmgr.h" #include "llrect.h" @@ -926,6 +927,16 @@ void LLPanelFace::getState() getChildView("button apply")->setEnabled(enabled); } } + + // Set variable values for numeric expressions + LLCalc* calcp = LLCalc::getInstance(); + calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal()); + calcp->setVar(LLCalc::TEX_V_SCALE, childGetValue("TexScaleV").asReal()); + calcp->setVar(LLCalc::TEX_U_OFFSET, childGetValue("TexOffsetU").asReal()); + calcp->setVar(LLCalc::TEX_V_OFFSET, childGetValue("TexOffsetV").asReal()); + calcp->setVar(LLCalc::TEX_ROTATION, childGetValue("TexRot").asReal()); + calcp->setVar(LLCalc::TEX_TRANSPARENCY, childGetValue("ColorTrans").asReal()); + calcp->setVar(LLCalc::TEX_GLOW, childGetValue("glow").asReal()); } else { @@ -961,6 +972,16 @@ void LLPanelFace::getState() //getChildView("has media")->setEnabled(FALSE); //getChildView("media info set")->setEnabled(FALSE); + + // Set variable values for numeric expressions + LLCalc* calcp = LLCalc::getInstance(); + calcp->clearVar(LLCalc::TEX_U_SCALE); + calcp->clearVar(LLCalc::TEX_V_SCALE); + calcp->clearVar(LLCalc::TEX_U_OFFSET); + calcp->clearVar(LLCalc::TEX_V_OFFSET); + calcp->clearVar(LLCalc::TEX_ROTATION); + calcp->clearVar(LLCalc::TEX_TRANSPARENCY); + calcp->clearVar(LLCalc::TEX_GLOW); } } diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index 8d8d9bc1c4..eddd6e554d 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -35,6 +35,7 @@ #include "llqueryflags.h" #include "llagent.h" +#include "lldateutil.h" #include "lliconctrl.h" #include "llfloaterreg.h" #include "lllineeditor.h" @@ -1056,6 +1057,14 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg, msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_CurrentInterval, current_interval ); msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, start_date); + std::string time_str = LLTrans::getString("GroupMoneyDate"); + LLSD substitution; + + // We don't do time zone corrections of the calculated number of seconds + // because we don't have a full time stamp, only a date. + substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%A %b %d, %Y", start_date); + LLStringUtil::format (time_str, substitution); + if ( interval_days != mImplementationp->mIntervalLength || current_interval != mImplementationp->mCurrentInterval ) { @@ -1064,7 +1073,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg, return; } - std::string text = start_date; + std::string text = time_str; text.append("\n\n"); S32 total_amount = 0; @@ -1203,7 +1212,15 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg, // Start with the date. if (text == mImplementationp->mLoadingText) { - text = start_date + "\n\n"; + std::string time_str = LLTrans::getString("GroupMoneyDate"); + LLSD substitution; + + // We don't do time zone corrections of the calculated number of seconds + // because we don't have a full time stamp, only a date. + substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%A %b %d, %Y", start_date); + LLStringUtil::format (time_str, substitution); + + text = time_str + "\n\n"; } S32 transactions = msg->getNumberOfBlocksFast(_PREHASH_HistoryData); @@ -1408,12 +1425,26 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, } text.append(LLTrans::getString("SummaryForTheWeek")); - text.append(start_date); + + std::string date_format_str = LLTrans::getString("GroupPlanningDate"); + std::string time_str = date_format_str; + LLSD substitution; + // We don't do time zone corrections of the calculated number of seconds + // because we don't have a full time stamp, only a date. + substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%m/%d/%Y", start_date); + LLStringUtil::format (time_str, substitution); + + text.append(time_str); if (current_interval == 0) { text.append(LLTrans::getString("NextStipendDay")); - text.append(next_stipend_date); + + time_str = date_format_str; + substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%m/%d/%Y", next_stipend_date); + LLStringUtil::format (time_str, substitution); + + text.append(time_str); text.append("\n\n"); text.append(llformat("%-24sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); text.append(1, '\n'); diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 52917ff20b..c222bbb191 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -41,6 +41,7 @@ // project includes #include "llagent.h" #include "llbutton.h" +#include "llcalc.h" #include "llcheckboxctrl.h" #include "llcolorswatch.h" #include "llcombobox.h" @@ -318,6 +319,8 @@ void LLPanelObject::getState( ) } } + LLCalc* calcp = LLCalc::getInstance(); + LLVOVolume *volobjp = NULL; if ( objectp && (objectp->getPCode() == LL_PCODE_VOLUME)) { @@ -334,6 +337,7 @@ void LLPanelObject::getState( ) // Disable all text input fields clearCtrls(); + calcp->clearAllVariables(); return; } @@ -360,12 +364,18 @@ void LLPanelObject::getState( ) mCtrlPosX->set( vec.mV[VX] ); mCtrlPosY->set( vec.mV[VY] ); mCtrlPosZ->set( vec.mV[VZ] ); + calcp->setVar(LLCalc::X_POS, vec.mV[VX]); + calcp->setVar(LLCalc::Y_POS, vec.mV[VY]); + calcp->setVar(LLCalc::Z_POS, vec.mV[VZ]); } else { mCtrlPosX->clear(); mCtrlPosY->clear(); mCtrlPosZ->clear(); + calcp->clearVar(LLCalc::X_POS); + calcp->clearVar(LLCalc::Y_POS); + calcp->clearVar(LLCalc::Z_POS); } @@ -380,12 +390,18 @@ void LLPanelObject::getState( ) mCtrlScaleX->set( vec.mV[VX] ); mCtrlScaleY->set( vec.mV[VY] ); mCtrlScaleZ->set( vec.mV[VZ] ); + calcp->setVar(LLCalc::X_SCALE, vec.mV[VX]); + calcp->setVar(LLCalc::Y_SCALE, vec.mV[VY]); + calcp->setVar(LLCalc::Z_SCALE, vec.mV[VZ]); } else { mCtrlScaleX->clear(); mCtrlScaleY->clear(); mCtrlScaleZ->clear(); + calcp->setVar(LLCalc::X_SCALE, 0.f); + calcp->setVar(LLCalc::Y_SCALE, 0.f); + calcp->setVar(LLCalc::Z_SCALE, 0.f); } mLabelSize->setEnabled( enable_scale ); @@ -405,12 +421,18 @@ void LLPanelObject::getState( ) mCtrlRotX->set( mCurEulerDegrees.mV[VX] ); mCtrlRotY->set( mCurEulerDegrees.mV[VY] ); mCtrlRotZ->set( mCurEulerDegrees.mV[VZ] ); + calcp->setVar(LLCalc::X_ROT, mCurEulerDegrees.mV[VX]); + calcp->setVar(LLCalc::Y_ROT, mCurEulerDegrees.mV[VY]); + calcp->setVar(LLCalc::Z_ROT, mCurEulerDegrees.mV[VZ]); } else { mCtrlRotX->clear(); mCtrlRotY->clear(); mCtrlRotZ->clear(); + calcp->clearVar(LLCalc::X_ROT); + calcp->clearVar(LLCalc::Y_ROT); + calcp->clearVar(LLCalc::Z_ROT); } mLabelRotation->setEnabled( enable_rotate ); @@ -625,9 +647,9 @@ void LLPanelObject::getState( ) F32 end_t = volume_params.getEndT(); // Hollowness - F32 hollow = volume_params.getHollow(); - mSpinHollow->set( 100.f * hollow ); - + F32 hollow = 100.f * volume_params.getHollow(); + mSpinHollow->set( hollow ); + calcp->setVar(LLCalc::HOLLOW, hollow); // All hollow objects allow a shape to be selected. if (hollow > 0.f) { @@ -679,6 +701,10 @@ void LLPanelObject::getState( ) mSpinCutEnd ->set( cut_end ); mCtrlPathBegin ->set( adv_cut_begin ); mCtrlPathEnd ->set( adv_cut_end ); + calcp->setVar(LLCalc::CUT_BEGIN, cut_begin); + calcp->setVar(LLCalc::CUT_END, cut_end); + calcp->setVar(LLCalc::PATH_BEGIN, adv_cut_begin); + calcp->setVar(LLCalc::PATH_END, adv_cut_end); // Twist F32 twist = volume_params.getTwist(); @@ -697,18 +723,24 @@ void LLPanelObject::getState( ) mSpinTwist ->set( twist ); mSpinTwistBegin ->set( twist_begin ); + calcp->setVar(LLCalc::TWIST_END, twist); + calcp->setVar(LLCalc::TWIST_BEGIN, twist_begin); // Shear F32 shear_x = volume_params.getShearX(); F32 shear_y = volume_params.getShearY(); mSpinShearX->set( shear_x ); mSpinShearY->set( shear_y ); + calcp->setVar(LLCalc::X_SHEAR, shear_x); + calcp->setVar(LLCalc::Y_SHEAR, shear_y); // Taper F32 taper_x = volume_params.getTaperX(); F32 taper_y = volume_params.getTaperY(); mSpinTaperX->set( taper_x ); mSpinTaperY->set( taper_y ); + calcp->setVar(LLCalc::X_TAPER, taper_x); + calcp->setVar(LLCalc::Y_TAPER, taper_y); // Radius offset. F32 radius_offset = volume_params.getRadiusOffset(); @@ -738,10 +770,12 @@ void LLPanelObject::getState( ) } } mSpinRadiusOffset->set( radius_offset); + calcp->setVar(LLCalc::RADIUS_OFFSET, radius_offset); // Revolutions F32 revolutions = volume_params.getRevolutions(); mSpinRevolutions->set( revolutions ); + calcp->setVar(LLCalc::REVOLUTIONS, revolutions); // Skew F32 skew = volume_params.getSkew(); @@ -766,6 +800,7 @@ void LLPanelObject::getState( ) } } mSpinSkew->set( skew ); + calcp->setVar(LLCalc::SKEW, skew); } // Compute control visibility, label names, and twist range. @@ -869,6 +904,8 @@ void LLPanelObject::getState( ) case MI_RING: mSpinScaleX->set( scale_x ); mSpinScaleY->set( scale_y ); + calcp->setVar(LLCalc::X_HOLE, scale_x); + calcp->setVar(LLCalc::Y_HOLE, scale_y); mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE); mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X); mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE); @@ -883,6 +920,14 @@ void LLPanelObject::getState( ) mSpinScaleX->setMaxValue(1.f); mSpinScaleY->setMinValue(-1.f); mSpinScaleY->setMaxValue(1.f); + + // Torus' Hole Size is Box/Cyl/Prism's Taper + calcp->setVar(LLCalc::X_TAPER, 1.f - scale_x); + calcp->setVar(LLCalc::Y_TAPER, 1.f - scale_y); + + // Box/Cyl/Prism have no hole size + calcp->setVar(LLCalc::X_HOLE, 0.f); + calcp->setVar(LLCalc::Y_HOLE, 0.f); } break; } diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp index 0645fd8a54..f19b54c1d4 100644 --- a/indra/newview/llpanelwearing.cpp +++ b/indra/newview/llpanelwearing.cpp @@ -38,6 +38,8 @@ #include "llsidetray.h" #include "llviewermenu.h" #include "llwearableitemslist.h" +#include "llsdserialize.h" +#include "llclipboard.h" // Context menu and Gear menu helper. static void edit_outfit() @@ -58,6 +60,7 @@ public: registrar.add("Gear.Edit", boost::bind(&edit_outfit)); registrar.add("Gear.TakeOff", boost::bind(&LLWearingGearMenu::onTakeOff, this)); + registrar.add("Gear.Copy", boost::bind(&LLPanelWearing::copyToClipboard, mPanelWearing)); enable_registrar.add("Gear.OnEnable", boost::bind(&LLPanelWearing::isActionEnabled, mPanelWearing, _2)); @@ -280,4 +283,25 @@ void LLPanelWearing::getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const mCOFItemsList->getSelectedUUIDs(selected_uuids); } +void LLPanelWearing::copyToClipboard() +{ + std::string text; + std::vector<LLSD> data; + mCOFItemsList->getValues(data); + + for(std::vector<LLSD>::const_iterator iter = data.begin(); iter != data.end();) + { + LLSD uuid = (*iter); + LLViewerInventoryItem* item = gInventory.getItem(uuid); + + iter++; + if (item != NULL) + { + // Append a newline to all but the last line + text += iter != data.end() ? item->getName() + "\n" : item->getName(); + } + } + + gClipboard.copyFromString(utf8str_to_wstring(text)); +} // EOF diff --git a/indra/newview/llpanelwearing.h b/indra/newview/llpanelwearing.h index 157b2c4c5f..9a212b3cca 100644 --- a/indra/newview/llpanelwearing.h +++ b/indra/newview/llpanelwearing.h @@ -60,6 +60,8 @@ public: /*virtual*/ void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const; + /*virtual*/ void copyToClipboard(); + boost::signals2::connection setSelectionChangeCallback(commit_callback_t cb); bool hasItemSelected(); diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 500c2a7b86..bd41aa64f0 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -51,6 +51,9 @@ using namespace LLVOAvatarDefines; +static const S32 BAKE_UPLOAD_ATTEMPTS = 7; +static const F32 BAKE_UPLOAD_RETRY_DELAY = 2.f; // actual delay grows by power of 2 each attempt + class LLTexLayerInfo { friend class LLTexLayer; @@ -93,11 +96,13 @@ private: //----------------------------------------------------------------------------- LLBakedUploadData::LLBakedUploadData(const LLVOAvatarSelf* avatar, LLTexLayerSet* layerset, - const LLUUID& id) : + const LLUUID& id, + bool highest_res) : mAvatar(avatar), mTexLayerSet(layerset), mID(id), - mStartTime(LLFrameTimer::getTotalTime()) // Record starting time + mStartTime(LLFrameTimer::getTotalTime()), // Record starting time + mIsHighestRes(highest_res) { } @@ -116,6 +121,7 @@ LLTexLayerSetBuffer::LLTexLayerSetBuffer(LLTexLayerSet* const owner, mUploadPending(FALSE), // Not used for any logic here, just to sync sending of updates mNeedsUpload(FALSE), mNumLowresUploads(0), + mUploadFailCount(0), mNeedsUpdate(TRUE), mNumLowresUpdates(0), mTexLayerSet(owner) @@ -204,6 +210,7 @@ void LLTexLayerSetBuffer::cancelUpload() mNeedsUpload = FALSE; mUploadPending = FALSE; mNeedsUploadTimer.pause(); + mUploadRetryTimer.reset(); } void LLTexLayerSetBuffer::pushProjection() const @@ -356,25 +363,38 @@ BOOL LLTexLayerSetBuffer::isReadyToUpload() const if (!gAgentQueryManager.hasNoPendingQueries()) return FALSE; // Can't upload if there are pending queries. if (isAgentAvatarValid() && !gAgentAvatarp->isUsingBakedTextures()) return FALSE; // Don't upload if avatar is using composites. - // If we requested an upload and have the final LOD ready, then upload. - if (mTexLayerSet->isLocalTextureDataFinal()) return TRUE; - - // Upload if we've hit a timeout. Upload is a pretty expensive process so we need to make sure - // we aren't doing uploads too frequently. - const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedTextureUploadTimeout"); - if (texture_timeout != 0) + BOOL ready = FALSE; + if (mTexLayerSet->isLocalTextureDataFinal()) + { + // If we requested an upload and have the final LOD ready, upload (or wait a while if this is a retry) + if (mUploadFailCount == 0) + { + ready = TRUE; + } + else + { + ready = mUploadRetryTimer.getElapsedTimeF32() >= BAKE_UPLOAD_RETRY_DELAY * (1 << (mUploadFailCount - 1)); + } + } + else { - // The timeout period increases exponentially between every lowres upload in order to prevent - // spamming the server with frequent uploads. - const U32 texture_timeout_threshold = texture_timeout*(1 << mNumLowresUploads); + // Upload if we've hit a timeout. Upload is a pretty expensive process so we need to make sure + // we aren't doing uploads too frequently. + const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedTextureUploadTimeout"); + if (texture_timeout != 0) + { + // The timeout period increases exponentially between every lowres upload in order to prevent + // spamming the server with frequent uploads. + const U32 texture_timeout_threshold = texture_timeout*(1 << mNumLowresUploads); - // If we hit our timeout and have textures available at even lower resolution, then upload. - const BOOL is_upload_textures_timeout = mNeedsUploadTimer.getElapsedTimeF32() >= texture_timeout_threshold; - const BOOL has_lower_lod = mTexLayerSet->isLocalTextureDataAvailable(); - if (has_lower_lod && is_upload_textures_timeout) return TRUE; + // If we hit our timeout and have textures available at even lower resolution, then upload. + const BOOL is_upload_textures_timeout = mNeedsUploadTimer.getElapsedTimeF32() >= texture_timeout_threshold; + const BOOL has_lower_lod = mTexLayerSet->isLocalTextureDataAvailable(); + ready = has_lower_lod && is_upload_textures_timeout; + } } - return FALSE; + return ready; } BOOL LLTexLayerSetBuffer::isReadyToUpdate() const @@ -482,17 +502,20 @@ void LLTexLayerSetBuffer::doUpload() if (valid) { + const bool highest_lod = mTexLayerSet->isLocalTextureDataFinal(); // Baked_upload_data is owned by the responder and deleted after the request completes. LLBakedUploadData* baked_upload_data = new LLBakedUploadData(gAgentAvatarp, this->mTexLayerSet, - asset_id); + asset_id, + highest_lod); // upload ID is used to avoid overlaps, e.g. when the user rapidly makes two changes outside of Face Edit. mUploadID = asset_id; // Upload the image const std::string url = gAgent.getRegion()->getCapability("UploadBakedTexture"); if(!url.empty() - && !LLPipeline::sForceOldBakedUpload) // toggle debug setting UploadBakedTexOld to change between the new caps method and old method + && !LLPipeline::sForceOldBakedUpload // toggle debug setting UploadBakedTexOld to change between the new caps method and old method + && (mUploadFailCount < (BAKE_UPLOAD_ATTEMPTS - 1))) // Try last ditch attempt via asset store if cap upload is failing. { LLSD body = LLSD::emptyMap(); // The responder will call LLTexLayerSetBuffer::onTextureUploadComplete() @@ -511,7 +534,6 @@ void LLTexLayerSetBuffer::doUpload() llinfos << "Baked texture upload via Asset Store." << llendl; } - const BOOL highest_lod = mTexLayerSet->isLocalTextureDataFinal(); if (highest_lod) { // Sending the final LOD for the baked texture. All done, pause @@ -603,14 +625,15 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, { LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)userdata; - if ((result == 0) && - isAgentAvatarValid() && + if (isAgentAvatarValid() && !gAgentAvatarp->isDead() && (baked_upload_data->mAvatar == gAgentAvatarp) && // Sanity check: only the user's avatar should be uploading textures. (baked_upload_data->mTexLayerSet->hasComposite())) { LLTexLayerSetBuffer* layerset_buffer = baked_upload_data->mTexLayerSet->getComposite(); - + S32 failures = layerset_buffer->mUploadFailCount; + layerset_buffer->mUploadFailCount = 0; + if (layerset_buffer->mUploadID.isNull()) { // The upload got canceled, we should be in the @@ -626,20 +649,28 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, { // This is the upload we're currently waiting for. layerset_buffer->mUploadID.setNull(); + const std::string name(baked_upload_data->mTexLayerSet->getBodyRegionName()); + const std::string resolution = baked_upload_data->mIsHighestRes ? " full res " : " low res "; if (result >= 0) { - layerset_buffer->mUploadPending = FALSE; + layerset_buffer->mUploadPending = FALSE; // Allows sending of AgentSetAppearance later LLVOAvatarDefines::ETextureIndex baked_te = gAgentAvatarp->getBakedTE(layerset_buffer->mTexLayerSet); // Update baked texture info with the new UUID U64 now = LLFrameTimer::getTotalTime(); // Record starting time - llinfos << "Baked texture upload took " << (S32)((now - baked_upload_data->mStartTime) / 1000) << " ms" << llendl; + llinfos << "Baked" << resolution << "texture upload for " << name << " took " << (S32)((now - baked_upload_data->mStartTime) / 1000) << " ms" << llendl; gAgentAvatarp->setNewBakedTexture(baked_te, uuid); } else { - // Avatar appearance is changing, ignore the upload results - llinfos << "Baked upload failed. Reason: " << result << llendl; - // *FIX: retry upload after n seconds, asset server could be busy + ++failures; + S32 max_attempts = baked_upload_data->mIsHighestRes ? BAKE_UPLOAD_ATTEMPTS : 1; // only retry final bakes + llwarns << "Baked" << resolution << "texture upload for " << name << " failed (attempt " << failures << "/" << max_attempts << ")" << llendl; + if (failures < max_attempts) + { + layerset_buffer->mUploadFailCount = failures; + layerset_buffer->mUploadRetryTimer.start(); + layerset_buffer->requestUpload(); + } } } else diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index 2d710d2dce..85dadb213c 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -312,6 +312,8 @@ private: BOOL mUploadPending; // Whether we have received back the new baked textures LLUUID mUploadID; // The current upload process (null if none). LLFrameTimer mNeedsUploadTimer; // Tracks time since upload was requested and performed. + S32 mUploadFailCount; // Number of consecutive upload failures + LLFrameTimer mUploadRetryTimer; // Tracks time since last upload failure. //-------------------------------------------------------------------- // Updates @@ -363,12 +365,14 @@ struct LLBakedUploadData { LLBakedUploadData(const LLVOAvatarSelf* avatar, LLTexLayerSet* layerset, - const LLUUID& id); + const LLUUID& id, + bool highest_res); ~LLBakedUploadData() {} const LLUUID mID; const LLVOAvatarSelf* mAvatar; // note: backlink only; don't LLPointer LLTexLayerSet* mTexLayerSet; const U64 mStartTime; // for measuring baked texture upload time + const bool mIsHighestRes; // whether this is a "final" bake, or intermediate low res }; #endif // LL_LLTEXLAYER_H diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 87ca80260f..b87ca1eaec 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -566,7 +566,7 @@ bool toggle_show_object_render_cost(const LLSD& newvalue) return true; } -void toggle_updater_service_active(LLControlVariable* control, const LLSD& new_value) +void toggle_updater_service_active(const LLSD& new_value) { if(new_value.asInteger()) { @@ -735,7 +735,7 @@ void settings_setup_listeners() gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2)); gSavedSettings.getControl("ShowMiniLocationPanel")->getSignal()->connect(boost::bind(&toggle_show_mini_location_panel, _2)); gSavedSettings.getControl("ShowObjectRenderingCost")->getSignal()->connect(boost::bind(&toggle_show_object_render_cost, _2)); - gSavedSettings.getControl("UpdaterServiceSetting")->getSignal()->connect(&toggle_updater_service_active); + gSavedSettings.getControl("UpdaterServiceSetting")->getSignal()->connect(boost::bind(&toggle_updater_service_active, _2)); gSavedSettings.getControl("ForceShowGrid")->getSignal()->connect(boost::bind(&handleForceShowGrid, _2)); gSavedSettings.getControl("RenderTransparentWater")->getSignal()->connect(boost::bind(&handleRenderTransparentWaterChanged, _2)); } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index a37f8ad0d8..f74bcafc5c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -44,6 +44,7 @@ #include "llbottomtray.h" #include "llcompilequeue.h" #include "llconsole.h" +#include "lldaycyclemanager.h" #include "lldebugview.h" #include "llenvmanager.h" #include "llfilepicker.h" @@ -100,6 +101,7 @@ #include "llworldmap.h" #include "pipeline.h" #include "llviewerjoystick.h" +#include "llwaterparammanager.h" #include "llwlanimator.h" #include "llwlparammanager.h" #include "llfloatercamera.h" @@ -7667,6 +7669,40 @@ class LLWorldEnvPreset : public view_listener_t } }; +class LLWorldEnableEnvPreset : public view_listener_t +{ + bool handleEvent(const LLSD& userdata) + { + std::string item = userdata.asString(); + + if (item == "delete_water") + { + LLWaterParamManager::preset_name_list_t user_waters; + LLWaterParamManager::instance().getUserPresetNames(user_waters); + return !user_waters.empty(); + } + else if (item == "delete_sky") + { + LLWLParamManager::preset_name_list_t user_skies; + LLWLParamManager::instance().getUserPresetNames(user_skies); + return !user_skies.empty(); + } + else if (item == "delete_day_cycle") + { + LLDayCycleManager::preset_name_list_t user_days; + LLDayCycleManager::instance().getUserPresetNames(user_days); + return !user_days.empty(); + } + else + { + llwarns << "Unknown item" << llendl; + } + + return false; + } +}; + + /// Post-Process callbacks class LLWorldPostProcess : public view_listener_t { @@ -7906,6 +7942,7 @@ void initialize_menus() view_listener_t::addMenu(new LLWorldEnvSettings(), "World.EnvSettings"); view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset"); + view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset"); view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess"); view_listener_t::addMenu(new LLWorldToggleMovementControls(), "World.Toggle.MovementControls"); diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index a59afdc28a..ef5c65eb87 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -35,7 +35,7 @@ #include "llweb.h" -const char* DEFAULT_LOGIN_PAGE = "http://secondlife.com/app/login/"; +const char* DEFAULT_LOGIN_PAGE = "http://viewer-login.agni.lindenlab.com/"; const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/"; const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/"; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index cff166b825..c31e1c3ba9 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1578,6 +1578,25 @@ LLViewerWindow::LLViewerWindow( ignore_pixel_depth, gSavedSettings.getBOOL("RenderDeferred") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled + if (NULL == mWindow) + { + LLSplashScreen::update(LLTrans::getString("StartupRequireDriverUpdate")); + + LL_WARNS("Window") << "Failed to create window, to be shutting Down, be sure your graphics driver is updated." << llendl ; + + ms_sleep(5000) ; //wait for 5 seconds. + + LLSplashScreen::update(LLTrans::getString("ShuttingDown")); +#if LL_LINUX || LL_SOLARIS + llwarns << "Unable to create window, be sure screen is set at 32-bit color and your graphics driver is configured correctly. See README-linux.txt or README-solaris.txt for further information." + << llendl; +#else + LL_WARNS("Window") << "Unable to create window, be sure screen is set at 32-bit color in Control Panels->Display->Settings" + << LL_ENDL; +#endif + LLAppViewer::instance()->fastQuit(1); + } + if (!LLAppViewer::instance()->restoreErrorTrap()) { LL_WARNS("Window") << " Someone took over my signal/exception handler (post createWindow)!" << LL_ENDL; @@ -1593,19 +1612,6 @@ LLViewerWindow::LLViewerWindow( gSavedSettings.setS32("FullScreenHeight",scr.mY); } - if (NULL == mWindow) - { - LLSplashScreen::update(LLTrans::getString("ShuttingDown")); -#if LL_LINUX || LL_SOLARIS - llwarns << "Unable to create window, be sure screen is set at 32-bit color and your graphics driver is configured correctly. See README-linux.txt or README-solaris.txt for further information." - << llendl; -#else - LL_WARNS("Window") << "Unable to create window, be sure screen is set at 32-bit color in Control Panels->Display->Settings" - << LL_ENDL; -#endif - LLAppViewer::instance()->fastQuit(1); - } - // Get the real window rect the window was created with (since there are various OS-dependent reasons why // the size of a window or fullscreen context may have been adjusted slightly...) F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor"); diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 38d04b4b5c..a53dece422 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -62,12 +62,12 @@ IDI_LCD_LL_ICON ICON "icon1.ico" // Dialog // -SPLASHSCREEN DIALOG 32, 32, 144, 34 +SPLASHSCREEN DIALOG 32, 32, 264, 34 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 - LTEXT "Loading Second Life...",666,36,13,91,8 + LTEXT "Loading Second Life...",666,36,13,211,8 END @@ -82,7 +82,7 @@ BEGIN "SPLASHSCREEN", DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 137 + RIGHTMARGIN, 257 VERTGUIDE, 36 TOPMARGIN, 7 BOTTOMMARGIN, 27 diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml index f0fa4386d2..c65dc5f41d 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -133,12 +133,12 @@ 0 </text> <button label="Land kaufen" label_selected="Land kaufen..." name="Buy Land..."/> + <button label="Linden-Verkauf" label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/> <button label="Skriptinfo" name="Scripts..."/> <button label="Für Gruppe kaufen" label_selected="Für Gruppe kaufen..." name="Buy For Group..."/> <button label="Pass kaufen" label_selected="Pass kaufen..." name="Buy Pass..." tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land."/> <button label="Land aufgeben" label_selected="Land aufgeben..." name="Abandon Land..."/> <button label="Land in Besitz nehmen" label_selected="Land in Besitz nehmen..." name="Reclaim Land..."/> - <button label="Linden-Verkauf" label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/> </panel> <panel label="VERTRAG" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -309,6 +309,9 @@ Nur große Parzellen können in der Suche aufgeführt werden. <panel.string name="push_restrict_region_text"> Kein Stoßen (regional) </panel.string> + <panel.string name="see_avs_text"> + Auf dieser Parzelle Einwohner sehen und mit ihnen chatten + </panel.string> <text name="allow_label"> Anderen Einwohnern gestatten: </text> @@ -371,6 +374,10 @@ Nur große Parzellen können in der Suche aufgeführt werden. Foto: </text> <texture_picker label="" name="snapshot_ctrl" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/> + <text name="allow_label5"> + Einwohnern auf anderen Parzellen Folgendes gestatten: + </text> + <check_box label="Avatare sehen" name="SeeAvatarsCheck" tool_tip="Gestattet sowohl Einwohnern auf anderen Parzellen, Einwohner auf dieser Parzelle zu sehen und mit ihnen zu chatten, als auch Ihnen, diese Einwohner auf anderen Parzellen zu sehen und mit ihnen zu chatten."/> <text name="landing_point"> Landepunkt: [LANDING] </text> @@ -427,6 +434,11 @@ Nur große Parzellen können in der Suche aufgeführt werden. Sound: </text> <check_box label="Gesten- und Objektgeräusche auf diese Parzelle beschränken" name="check sound local"/> + <text name="Avatar Sounds:"> + Avatarsounds: + </text> + <check_box label="Jeder" name="all av sound check"/> + <check_box label="Gruppe" name="group av sound check"/> <text name="Voice settings:"> Voice: </text> diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml new file mode 100644 index 0000000000..c924716523 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Env Preset" title="UMGEB.VOREINST. LÖSCHEN"> + <string name="title_water"> + Wasser-Voreinstellung löschen + </string> + <string name="title_sky"> + Hilmmel-Voreinstellung löschen + </string> + <string name="title_day_cycle"> + Tageszyklus löschen + </string> + <string name="label_water"> + Voreinstellung: + </string> + <string name="label_sky"> + Voreinstellung: + </string> + <string name="label_day_cycle"> + Tageszyklus: + </string> + <string name="msg_confirm_deletion"> + Möchten Sie die ausgewählte Voreinstellung wirklich löschen? + </string> + <string name="msg_sky_is_referenced"> + Eine Voreinstellung, auf die sich ein Tageszyklus bezieht, kann nicht gelöscht werden. + </string> + <string name="combo_label"> + -Voreinstellung auswählen- + </string> + <text name="label"> + Voreinstellung: + </text> + <button label="Löschen" name="delete"/> + <button label="Abbrechen" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..8b29428c24 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Day cycle" title="Tageszyklus bearbeiten"> + <string name="title_new"> + Neuen Tageszyklus erstellen + </string> + <string name="title_edit"> + Tageszyklus bearbeiten + </string> + <string name="hint_new"> + Geben Sie einen Namen für den Tageszyklus ein, passen Sie die Steuerungen an, um den Tageszyklus zu erstellen, und klicken Sie auf „Speichern“. + </string> + <string name="hint_edit"> + Um den Tageszyklus zu bearbeiten, passen Sie die Steuerungen unten an und klicken Sie auf „Speichern“. + </string> + <string name="combo_label"> + -Voreinstellung auswählen- + </string> + <text name="label"> + Name der Voreinstellung: + </text> + <text name="note"> + Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert. + </text> + <text name="hint_item1"> + - Klicken Sie auf eine Registerkarte, um die Himmeleinstellungen und die Uhrzeit zu bearbeiten. + </text> + <text name="hint_item2"> + - Klicken und ziehen Sie die Registerkarten, um die Übergangszeiten einzustellen. + </text> + <text name="hint_item3"> + - Anhand des Scrubbers können Sie eine Vorschau Ihres Tageszyklus anzeigen. + </text> + <panel name="day_cycle_slider_panel"> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleKeys"/> + <button label="Schlüssel hinzufügen" label_selected="Schlüssel hinzufügen" name="WLAddKey"/> + <button label="Schlüssel löschen" label_selected="Schlüssel löschen" name="WLDeleteKey"/> + <text name="WL12am"> + 0:00 + </text> + <text name="WL3am"> + 3:00 + </text> + <text name="WL6am"> + 6:00 + </text> + <text name="WL9amHash"> + 9:00 + </text> + <text name="WL12pmHash"> + 12:00 + </text> + <text name="WL3pm"> + 15:00 + </text> + <text name="WL6pm"> + 18:00 + </text> + <text name="WL9pm"> + 21:00 + </text> + <text name="WL12am2"> + 0:00 + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + </panel> + <text name="WLCurKeyPresetText"> + Himmeleinstellung: + </text> + <combo_box label="Voreinstellung" name="WLSkyPresets"/> + <text name="WLCurKeyTimeText"> + Uhrzeit: + </text> + <time name="time" value="6:00"/> + <check_box label="Zu meinem neuen Tageszyklus machen" name="make_default_cb"/> + <button label="Speichern" name="save"/> + <button label="Abbrechen" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..ea4c5f7ebc --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Sky Preset" title="Himmel-Voreinstellung bearbeiten"> + <string name="title_new"> + Neue Himmel-Voreinstellung erstellen + </string> + <string name="title_edit"> + Himmel-Voreinstellung bearbeiten + </string> + <string name="hint_new"> + Geben Sie einen Namen für die Voreinstellung ein, passen Sie die Steuerungen an, um die Voreinstellung zu erstellen, und klicken Sie dann auf „Speichern“. + </string> + <string name="hint_edit"> + Um Ihre Himmel-Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“. + </string> + <string name="combo_label"> + -Voreinstellung auswählen- + </string> + <text name="hint"> + Um Ihre Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“. + </text> + <text name="label"> + Name der Voreinstellung: + </text> + <text name="note"> + Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert. + </text> + <tab_container name="WindLight Tabs"> + <panel label="ATMOSPHÄRE" name="Atmosphere"> + <text name="BHText"> + Blauer Horizont + </text> + <text name="BDensText"> + Horizonttrübung + </text> + <text name="BDensText2"> + Farbintensität + </text> + <text name="HDText"> + Trübungsintensität + </text> + <text name="DensMultText"> + Dichtemultiplikator + </text> + <text name="WLDistanceMultText"> + Entfernungsmultiplikator + </text> + <text name="MaxAltText"> + Max. Höhe + </text> + </panel> + <panel label="BELEUCHTUNG" name="Lighting"> + <text name="SLCText"> + Sonne/Mond-Farbe + </text> + <text name="WLAmbientText"> + Umgebung + </text> + <text name="SunGlowText"> + Sonnenleuchtkraft + </text> + <slider label="Fokus" name="WLGlowB"/> + <slider label="Größe" name="WLGlowR"/> + <text name="WLStarText"> + Sternenleuchtkraft + </text> + <text name="SceneGammaText"> + Gamma in Szene + </text> + <text name="TODText"> + Sonne/Mond-Stand + </text> + <multi_slider initial_value="0" name="WLSunPos"/> + <text name="WL12amHash"> + | + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL12amHash2"> + | + </text> + <text name="WL12am"> + 0:00 + </text> + <text name="WL6am"> + 3:00 + </text> + <text name="WL12pmHash"> + 12:00 + </text> + <text name="WL6pm"> + 18:00 + </text> + <text name="WL12am2"> + 0:00 + </text> + <time name="WLDayTime" value="6:00"/> + <text name="WLEastAngleText"> + Ostausrichtung + </text> + </panel> + <panel label="WOLKEN" name="Clouds"> + <text name="WLCloudColorText"> + Wolkenfarbe + </text> + <text name="WLCloudColorText2"> + Wolken-XY/Dichte + </text> + <slider label="X" name="WLCloudX"/> + <slider label="Y" name="WLCloudY"/> + <slider label="D" name="WLCloudDensity"/> + <text name="WLCloudCoverageText"> + Wolkendichte + </text> + <text name="WLCloudScaleText"> + Wolkenskalierung + </text> + <text name="WLCloudDetailText"> + Wolkendetails (XY/Dichte) + </text> + <slider label="X" name="WLCloudDetailX"/> + <slider label="Y" name="WLCloudDetailY"/> + <slider label="D" name="WLCloudDetailDensity"/> + <text name="WLCloudScrollXText"> + Wolkenbewegung X + </text> + <check_box label="Sperren" name="WLCloudLockX"/> + <text name="WLCloudScrollYText"> + Wolkenbewegung Y + </text> + <check_box label="Sperren" name="WLCloudLockY"/> + </panel> + </tab_container> + <check_box label="Diese Voreinstellung zu meiner neuen Himmeleinstellung machen" name="make_default_cb"/> + <button label="Speichern" name="save"/> + <button label="Abbrechen" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml new file mode 100644 index 0000000000..9b9d5e7d77 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Water Preset" title="Wasser-Voreinstellung bearbeiten"> + <string name="title_new"> + Neue Wasser-Voreinstellung erstellen + </string> + <string name="title_edit"> + Wasser-Voreinstellung bearbeiten + </string> + <string name="hint_new"> + Geben Sie einen Namen für die Voreinstellung ein, passen Sie die Steuerungen an, um die Voreinstellung zu erstellen, und klicken Sie dann auf „Speichern“. + </string> + <string name="hint_edit"> + Um Ihre Wasser-Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“. + </string> + <string name="combo_label"> + -Voreinstellung auswählen- + </string> + <text name="hint"> + Um Ihre Voreinstellung zu bearbeiten, passen Sie die Steuerungen an und klicken Sie auf „Speichern“. + </text> + <text name="label"> + Name der Voreinstellung: + </text> + <text name="note"> + Hinweis: Wenn Sie den Namen Ihrer Voreinstellung ändern, entsteht eine neue Voreinstellung; die vorhandene Voreinstellung wird nicht geändert. + </text> + <panel name="panel_water_preset"> + <text name="water_color_label"> + Trübungsfarbe + </text> + <text name="water_fog_density_label"> + Exponent für Trübungsdichte + </text> + <text name="underwater_fog_modifier_label"> + Modifikator für Wassertrübung + </text> + <text name="BHText"> + Richtung für große Wellen + </text> + <slider label="X" name="WaterWave1DirX"/> + <slider label="Y" name="WaterWave1DirY"/> + <text name="BDensText"> + Reflexionswellengröße + </text> + <text name="HDText"> + Fresnel-Skalierung + </text> + <text name="FresnelOffsetText"> + Fresnel-Versatz + </text> + <text name="BHText2"> + Richtung für kleine Wellen + </text> + <slider label="X" name="WaterWave2DirX"/> + <slider label="Y" name="WaterWave2DirY"/> + <text name="DensMultText"> + Brechungsstärke oben + </text> + <text name="WaterScaleBelowText"> + Brechungsstärke unten + </text> + <text name="MaxAltText"> + Mischungsmultiplikator + </text> + <text name="BHText3"> + Normal-Map + </text> + </panel> + <check_box label="Diese Voreinstellung zu meiner neuen Wassereinstellung machen" name="make_default_cb"/> + <button label="Speichern" name="save"/> + <button label="Abbrechen" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml new file mode 100644 index 0000000000..946416980a --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_environment_settings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Environment Editor Floater" title="UMGEBUNGSEINSTELLUNGEN"> + <text name="note"> + Anhand der Optionen unten können Sie die Umgebungseinstellungen für Ihren Viewer anpassen. + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Regionseinstellungen verwenden" name="use_region_settings"/> + <radio_item label="Meine Umgebung anpassen" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="note"> + Hinweis: Ihre benutzerdefinierten Einstellungen sind für andere Benutzer nicht sichtbar. + </text> + <text name="water_settings_title"> + Wassereinstellung + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Himmel / Tageszyklus + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Fester Himmel" name="my_sky_settings"/> + <radio_item label="Tageszyklus" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> + </combo_box> + </panel> + <button label="OK" name="ok_btn"/> + <button label="Abbrechen" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml index 83c51132ee..24e2788e0b 100644 --- a/indra/newview/skins/default/xui/de/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml @@ -3,6 +3,9 @@ <string name="status_idle"> Inaktiv </string> + <string name="status_parse_error"> + DAE-Parsing-Fehler. Details siehe Protokoll. + </string> <string name="status_reading_file"> Laden... </string> @@ -12,6 +15,9 @@ <string name="status_vertex_number_overflow"> Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen. </string> + <string name="bad_element"> + Fehler: ungültiges Element. + </string> <string name="high"> Hoch </string> diff --git a/indra/newview/skins/default/xui/de/floater_model_wizard.xml b/indra/newview/skins/default/xui/de/floater_model_wizard.xml index 2c7b45906e..618b60e0ec 100644 --- a/indra/newview/skins/default/xui/de/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/de/floater_model_wizard.xml @@ -193,6 +193,9 @@ <string name="status_idle"> Inaktiv </string> + <string name="status_parse_error"> + DAE-Parsing-Fehler. Details siehe Protokoll. + </string> <string name="status_reading_file"> Laden... </string> @@ -202,6 +205,9 @@ <string name="status_vertex_number_overflow"> Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen. </string> + <string name="bad_element"> + Fehler: ungültiges Element. + </string> <string name="high"> Hoch </string> diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml index 338b609343..00f983b77c 100644 --- a/indra/newview/skins/default/xui/de/floater_tools.xml +++ b/indra/newview/skins/default/xui/de/floater_tools.xml @@ -66,7 +66,7 @@ <check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/> <button label="Link" name="link_btn" width="30"/> <button label="Verknüpfung auflösen" name="unlink_btn" width="126"/> - <text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt" left_pad="0"> + <text left_pad="0" name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt"> þ: [COUNT] </text> <check_box label="" name="checkbox uniform"/> @@ -408,7 +408,7 @@ </combo_box> <spinner label="Schwerkraft" name="Physics Gravity"/> <spinner label="Reibung" name="Physics Friction"/> - <spinner label="Dichte" name="Physics Density"/> + <spinner label="Dichte in 100 kg/m^3" name="Physics Density"/> <spinner label="Restitution" name="Physics Restitution"/> </panel> <panel label="Textur" name="Texture"> diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml index a373e15338..d932234cd1 100644 --- a/indra/newview/skins/default/xui/de/menu_login.xml +++ b/indra/newview/skins/default/xui/de/menu_login.xml @@ -18,7 +18,7 @@ <menu_item_call label="Servicebedingungen anzeigen" name="TOS"/> <menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/> <menu_item_call label="Test Medienbrowser" name="Web Browser Test"/> - <menu_item_call label="Test Webinhalt-Floater" name="Web Content Floater Test"/> + <menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"/> <menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/> <menu_item_call label="Benachrichtigungs-Konsole anzeigen" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml index 0f252ab46d..a001544f3e 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_group_plus"> +<toggleable_menu name="menu_group_plus"> <menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/> <menu_item_check label="Nach Name sortieren" name="sort_name"/> <menu_item_check label="Nach Entfernung sortieren" name="sort_distance"/> <menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/> + <menu_item_check label="Karte anzeigen" name="view_map"/> <menu_item_call label="Ignorierte Einwohner & Objekte anzeigen" name="show_blocked_list"/> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 05f9f94c8a..de4c269be6 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -31,6 +31,7 @@ <menu_item_call label="Meine Gruppen" name="My Groups"/> <menu_item_check label="Chat in der Nähe" name="Nearby Chat"/> <menu_item_call label="Leute in der Nähe" name="Active Speakers"/> + <menu_item_check label="Stimme in der Nähe" name="Nearby Voice"/> </menu> <menu label="Welt" name="World"> <menu_item_check label="Minikarte" name="Mini-Map"/> @@ -63,8 +64,24 @@ <menu_item_call label="Mittag" name="Noon"/> <menu_item_call label="Sonnenuntergang" name="Sunset"/> <menu_item_call label="Mitternacht" name="Midnight"/> - <menu_item_call label="Grundbesitzzeit" name="Revert to Region Default"/> - <menu_item_call label="Umwelt-Editor" name="Environment Editor"/> + </menu> + <menu label="Umgebungs-Editor" name="Enviroment Editor"> + <menu_item_call label="Umgebungseinstellungen..." name="Enviroment Settings"/> + <menu label="Wasser-Voreinstellungen" name="Water Presets"> + <menu_item_call label="Neue Voreinstellung..." name="new_water_preset"/> + <menu_item_call label="Voreinstellung bearbeiten..." name="edit_water_preset"/> + <menu_item_call label="Voreinstellung löschen..." name="delete_water_preset"/> + </menu> + <menu label="Himmel-Voreinstellungen" name="Sky Presets"> + <menu_item_call label="Neue Voreinstellung..." name="new_sky_preset"/> + <menu_item_call label="Voreinstellung bearbeiten..." name="edit_sky_preset"/> + <menu_item_call label="Voreinstellung löschen..." name="delete_sky_preset"/> + </menu> + <menu label="Tag-Voreinstellungen" name="Day Presets"> + <menu_item_call label="Neue Voreinstellung..." name="new_day_preset"/> + <menu_item_call label="Voreinstellung bearbeiten..." name="edit_day_preset"/> + <menu_item_call label="Voreinstellung löschen..." name="delete_day_preset"/> + </menu> </menu> </menu> <menu label="Bauen" name="BuildTools"> diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml index 80d4ff4d9f..dacf898b6a 100644 --- a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> +<toggleable_menu name="Gear Wearing"> <menu_item_call label="Outfit bearbeiten" name="edit"/> <menu_item_call label="Ausziehen" name="takeoff"/> -</menu> + <menu_item_call label="Outfitliste in Zwischenablage kopieren" name="copy"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 75f26c6990..05e47cd31a 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -1565,6 +1565,11 @@ Versuchen Sie es später erneut. <button name="Cancel" text="Abbrechen"/> </form> </notification> + <notification name="TooManyTeleportOffers"> + Sie haben versucht, [OFFERS] Teleport-Angebote zu machen, +womit Sie die Höchstgrenze von [LIMIT] überschreiten. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="OfferTeleportFromGod"> Einwohner zu Ihrem Standort einladen? <form name="form"> @@ -1986,6 +1991,10 @@ Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschl Sind Sie sicher, dass Sie Ihren Reise-, Internet- und Suchverlauf löschen möchten? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> </notification> + <notification name="ConfirmClearCache"> + Möchten Sie Ihren Viewer-Cache wirklich leeren? + <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/> + </notification> <notification name="ConfirmClearCookies"> Sind Sie sicher, dass Sie Ihre Cookies löschen möchten? <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/> @@ -2011,48 +2020,30 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies Die gespeicherte Voreinstellung überschreiben? <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> </notification> - <notification name="WLDeletePresetAlert"> - [SKY] löschen? - <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> - </notification> <notification name="WLNoEditDefault"> Standardvoreinstellungen können nicht bearbeitet oder gelöscht werden. </notification> <notification name="WLMissingSky"> Diese Tageszyklusdatei verweist auf eine fehlende Himmel-Datei: [SKY]. </notification> - <notification name="PPSaveEffectAlert"> - Post-Processing-Effekt bereits vorhanden. Möchten Sie ihn überschreiben? - <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> - </notification> - <notification name="NewSkyPreset"> - Wählen Sie einen Namen für den neuen Himmel. - <form name="form"> - <input name="message"> - Neue Voreinstellung - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Abbrechen"/> - </form> + <notification name="WLRegionApplyFail"> + Die Einstellungen konnten nicht auf die Region angewendet werden. Verlassen Sie die Region und kehren Sie zurück, um das Problem zu beheben. Angegebener Grund: [FAIL_REASON] </notification> - <notification name="ExistsSkyPresetAlert"> - Voreinstellung bereits vorhanden! + <notification name="EnvCannotDeleteLastDayCycleKey"> + Der letzte Schlüssel in diesem Tageszyklus kann nicht gelöscht werden, da ein Tageszyklus nicht leer sein kann. Statt den letzten verbleibenden Schlüssel zu löschen, versuchen Sie stattdessen, ihn zu modifizieren und dann einen neuen zu erstellen. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="NewWaterPreset"> - Wählen Sie einen Namen für die neue Wasservoreinstellung. - <form name="form"> - <input name="message"> - Neue Voreinstellung - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Abbrechen"/> - </form> + <notification name="DayCycleTooManyKeyframes"> + Sie können diesem Tageszyklus keine Keyframes mehr hinzufügen. Die Höchstzahl an Keyframes für Tageszyklen mit Umfang [SCOPE] beträgt [MAX]. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="ExistsWaterPresetAlert"> - Voreinstellung bereits vorhanden! + <notification name="EnvUpdateRate"> + Sie können die Umgebungseinstellungen der Region nur alle [WAIT] Sekunden aktualisieren. Warten Sie mindestens so lange und versuchen Sie es dann erneut. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="WaterNoEditDefault"> - Standardvoreinstellungen können nicht bearbeitet oder gelöscht werden. + <notification name="PPSaveEffectAlert"> + Post-Processing-Effekt bereits vorhanden. Möchten Sie ihn überschreiben? + <usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/> </notification> <notification name="ChatterBoxSessionStartError"> Neue Chat-Sitzung mit [RECIPIENT] konnte nicht gestartet werden. @@ -2343,6 +2334,9 @@ Fliegen ist hier nicht möglich. <notification name="NoBuild"> In diesem Bereich ist das Bauen deaktiviert. Sie können keine Objekte bauen oder rezzen. </notification> + <notification name="SeeAvatars"> + Diese Parzelle verbirgt Avatare und Text-Chat vor einer anderen Parzelle. Sie können Einwohner außerhalb dieser Parzelle weder sehen noch von ihnen gesehen werden. Regulärer Text-Chat auf Kanal 0 ist ebenfalls blockiert. + </notification> <notification name="ScriptsStopped"> Ein Administrator hat die Skriptausführung in dieser Region vorübergehend deaktiviert. </notification> @@ -2771,7 +2765,9 @@ Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist. Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten. </notification> <notification name="MeshUploadError"> - [LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + [LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER] + +Details finden Sie in der Protokolldatei. </notification> <notification name="ShareItemsConfirmation"> Möchten Sie wirklich die folgenden Objekte: diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml index 65a38ea342..ea3a938be9 100644 --- a/indra/newview/skins/default/xui/de/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/de/panel_outfits_list.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Outfits"> + <accordion name="outfits_accordion"> + <no_matched_tabs_text name="no_matched_outfits_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/all/[SEARCH_TERM] Suche]."/> + <no_visible_tabs_text name="no_outfits_msg" value="Sie haben noch keine Outfits. Versuchen Sie es mit der [secondlife:///app/search/all/ ] Suche]."/> + </accordion> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> + <menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/> <button name="trash_btn" tool_tip="Ausgewähltes Outfit löschen"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml index 63a832a165..4e76147746 100644 --- a/indra/newview/skins/default/xui/de/panel_people.xml +++ b/indra/newview/skins/default/xui/de/panel_people.xml @@ -67,13 +67,13 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte]. <button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/> </layout_panel> <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/> + <button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/> </layout_panel> <layout_panel name="call_btn_lp"> <button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/> + <button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/> </layout_panel> <layout_panel name="teleport_btn_lp"> <button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/> diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml index 555fa56d57..4077fdab36 100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml @@ -68,6 +68,8 @@ <text name="scripts_value" value="Ein"/> <text name="damage_label" value="Schaden:"/> <text name="damage_value" value="Aus"/> + <text name="see_avatars_label" value="Avatare sehen:"/> + <text name="see_avatars_value" value="Aus"/> <button label="Über Land" name="about_land_btn"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index 0a596f2b25..8a5c175f2f 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml @@ -3,6 +3,19 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <text name="Cache:"> + Cache: + </text> + <spinner label="Cache-Größe (64 – 9.984 MB)" name="cachesizespinner"/> + <text name="text_box5"> + MB + </text> + <button label="Cache leeren" label_selected="Cache leeren" name="clear_cache"/> + <text name="Cache location"> + Cache-Ordner: + </text> + <button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/> + <button label="Vorgabestandort" label_selected="Vorgabestandort" name="default_cache_location"/> <text name="UI Size:"> UI-Größe: </text> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml index c118e4e4dd..1e6a03c99f 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -19,6 +19,7 @@ <check_box label="Aktiviert" name="enable_voice_check"/> <check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="true"/> <check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="true"/> + <check_box label="Sounds von Gesten abspielen" name="gesture_audio_play_btn" tool_tip="Markieren, um Sounds von Gesten zu hören" value="true"/> <text name="voice_chat_settings"> Voice-Chat-Einstellungen </text> @@ -35,28 +36,5 @@ <button label="Taste festlegen" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="Auf mittlere Maustaste zurücksetzen"/> <button label="Eingabe-/Ausgabegeräte" name="device_settings_btn"/> - <panel label="Geräte-Einstellungen" name="device_settings_panel"> - <panel.string name="default_text"> - Standard - </panel.string> - <panel.string name="default system device"> - Standardgerät - </panel.string> - <panel.string name="no device"> - Kein Gerät - </panel.string> - <text name="Input"> - Eingabe - </text> - <text name="My volume label"> - Meine Lautstärke: - </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler"/> - <text name="wait_text"> - Bitte warten - </text> - <text name="Output"> - Ausgabe - </text> - </panel> + <panel label="Geräte-Einstellungen" name="device_settings_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml new file mode 100644 index 0000000000..daadd30f62 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Umgebung" name="panel_env_info"> + <text name="water_settings_title"> + Wählen Sie die Wasser- und Himmel-/Tageszykluseinstellungen aus, die alle Besucher Ihrer Region sehen sollen. Mehr Infos + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Second Life-Standard verwenden" name="use_sl_default_settings"/> + <radio_item label="Folgende Einstellungen verwenden" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="water_settings_title"> + Wassereinstellung + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Himmel / Tageszyklus + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Fester Himmel" name="my_sky_settings"/> + <radio_item label="Tageszyklus" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Voreinstellung auswählen-" name="item0"/> + </combo_box> + </panel> + <button label="Anwenden" name="apply_btn"/> + <button label="Abbrechen" name="cancel_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml index 01721791a7..7801be30e4 100644 --- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Terrain" name="Terrain"> <text name="region_text_lbl"> Region: @@ -6,25 +6,55 @@ <text name="region_text"> unbekannt </text> - <spinner label="Wasserhöhe" name="water_height_spin" /> - <button label="?" name="water_height_help" /> - <spinner label="Obere Terraingrenze" name="terrain_raise_spin" /> - <button label="?" name="terrain_raise_help" /> - <spinner label="Untere Terraingrenze" name="terrain_lower_spin" /> - <button label="?" name="terrain_lower_help" /> - <check_box label="Grundbesitzsonne verwenden" name="use_estate_sun_check" /> - <button label="?" name="use_estate_sun_help" /> - <check_box label="Sonne fest" name="fixed_sun_check" /> - <button label="?" name="fixed_sun_help" /> - <slider label="Phase" name="sun_hour_slider" /> - <button label="Übernehmen" name="apply_btn" /> - <button label="RAW-Terrain herunterladen..." name="download_raw_btn" - tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter" /> - <button label="?" name="download_raw_help" /> - <button label="RAW-Terrain hochladen..." name="upload_raw_btn" - tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter" /> - <button label="?" name="upload_raw_help" /> - <button label="Terrain formen" name="bake_terrain_btn" - tool_tip="Das aktuelle Terrain zum Mittelpunkt für die oberen/unteren Terraingrenzen machen" /> - <button label="?" name="bake_terrain_help" /> + <spinner label="Wasserhöhe" name="water_height_spin"/> + <spinner label="Obere Terraingrenze" name="terrain_raise_spin"/> + <spinner label="Untere Terraingrenze" name="terrain_lower_spin"/> + <text name="detail_texture_text"> + Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 512x512) + </text> + <text name="height_text_lbl"> + 1 (niedrig) + </text> + <text name="height_text_lbl2"> + 2 + </text> + <text name="height_text_lbl3"> + 3 + </text> + <text name="height_text_lbl4"> + 4 (Hoch) + </text> + <text name="height_text_lbl5"> + Texturhöhenbereich + </text> + <text name="height_text_lbl10"> + Diese Werte geben den Mischungsgrad für die obigen Texturen an. + </text> + <text name="height_text_lbl11"> + In Metern gemessen. Der Wert „Niedrig“ ist die maximale Höhe von Textur 1, der Wert „Hoch“ die Mindesthöhe von Textur 4. + </text> + <text name="height_text_lbl6"> + Nordwest + </text> + <text name="height_text_lbl7"> + Nordost + </text> + <spinner label="Niedrig" name="height_start_spin_1"/> + <spinner label="Niedrig" name="height_start_spin_3"/> + <spinner label="Hoch" name="height_range_spin_1"/> + <spinner label="Hoch" name="height_range_spin_3"/> + <text name="height_text_lbl8"> + Südwest + </text> + <text name="height_text_lbl9"> + Südost + </text> + <spinner label="Niedrig" name="height_start_spin_0"/> + <spinner label="Niedrig" name="height_start_spin_2"/> + <spinner label="Hoch" name="height_range_spin_0"/> + <spinner label="Hoch" name="height_range_spin_2"/> + <button label="RAW-Terrain herunterladen..." name="download_raw_btn" tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter"/> + <button label="RAW-Terrain hochladen..." name="upload_raw_btn" tool_tip="Nur für Grundbesitzeigentümer verfügbar, nicht für Verwalter"/> + <button label="Terrain formen" name="bake_terrain_btn" tool_tip="Das aktuelle Terrain zum Mittelpunkt für die oberen/unteren Terraingrenzen machen"/> + <button label="Übernehmen" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml index d817d1df90..3dd1bfb357 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml @@ -1,6 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sonstiges" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + Erhaltene Objekte ([NUM]) + </string> + <string name="InboxLabelNoArg"> + Erhaltene Objekte + </string> + <button label="Erhaltene Objekte" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] neu + </text> + <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <text name="inbox_inventory_placeholder"> + Einkäufe auf dem Marktplatz werden hierher geliefert. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel name="outbox_layout_panel"> + <panel label="" name="marketplace_outbox"> + <button label="Händler-Outbox" name="outbox_btn"/> + <button label="" name="outbox_sync_btn" tool_tip="Zu meiner Marktplatz-Storefront verschieben"/> + <panel tool_tip="Drag and drop items here to prepare them for sale on your storefront"> + <text name="outbox_inventory_placeholder"> + Richtigen Sie ein Händlerkonto ein, um diese Funktion zu verwenden. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index ed38267466..e1c9ad0e5c 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -1192,6 +1192,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="InventoryNoTexture"> Sie haben keine Kopie dieser Textur in Ihrem Inventar. </string> + <string name="InventoryInboxNoItems"> + Objekte, die auf dem Marktplatz gekauft wurden, werden hierher geliefert. + </string> + <string name="InventoryOutboxNoItems"> + Objekte hierher ziehen, um Sie in Ihrer Marktplatz-Storefront zum Verkauf anzubieten. + </string> <string name="no_transfer" value=" (kein Transferieren)"/> <string name="no_modify" value=" (kein Bearbeiten)"/> <string name="no_copy" value=" (kein Kopieren)"/> @@ -1322,6 +1328,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="InvFolder All"> Alle </string> + <string name="no_attachments"> + Keine Anhänge getragen + </string> <string name="Buy"> Kaufen </string> @@ -1657,6 +1666,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="IMTeen"> Teen </string> + <string name="Anyone"> + jeder + </string> <string name="RegionInfoError"> Fehler </string> @@ -1879,6 +1891,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. <string name="Public"> Öffentlich </string> + <string name="LocalSettings"> + Lokale Einstellungen + </string> + <string name="RegionSettings"> + Regionseinstellungen + </string> <string name="ClassifiedClicksTxt"> Klicks: [TELEPORT] teleportieren, [MAP] Karte, [PROFILE] Profil </string> @@ -3724,6 +3742,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_ <string name="LocationCtrlGeneralIconTooltip"> Generelle Region </string> + <string name="LocationCtrlSeeAVsTooltip"> + Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet + </string> <string name="UpdaterWindowTitle"> [APP_NAME] Aktualisierung </string> diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 8770ede7e9..c7b26c59c7 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -38,6 +38,7 @@ user_resize="false" width="630"> <web_browser + tab_stop="true" trusted_content="true" follows="left|right|top|bottom" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index e00586811b..ab5c543376 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -557,6 +557,9 @@ <menu_item_call.on_click function="World.EnvPreset" parameter="delete_water"/> + <menu_item_call.on_enable + function="World.EnableEnvPreset" + parameter="delete_water"/> </menu_item_call> </menu> @@ -583,6 +586,9 @@ <menu_item_call.on_click function="World.EnvPreset" parameter="delete_sky"/> + <menu_item_call.on_enable + function="World.EnableEnvPreset" + parameter="delete_sky"/> </menu_item_call> </menu> @@ -609,6 +615,9 @@ <menu_item_call.on_click function="World.EnvPreset" parameter="delete_day_cycle"/> + <menu_item_call.on_enable + function="World.EnableEnvPreset" + parameter="delete_day_cycle"/> </menu_item_call> </menu> </menu> @@ -2931,18 +2940,6 @@ function="Floater.Toggle" parameter="region_debug_console" /> </menu_item_check> - <menu_item_check - label="Region Debug Console" - name="Region Debug Console" - shortcut="control|shift|`" - use_mac_ctrl="true"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="region_debug_console" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="region_debug_console" /> - </menu_item_check> <menu_item_separator /> <menu_item_check diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml index 0ac2c14253..0e858ccf10 100644 --- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml @@ -20,4 +20,11 @@ function="Gear.OnEnable" parameter="take_off" /> </menu_item_call> + <menu_item_call + label="Copy outfit list to clipboard" + layout="topleft" + name="copy"> + <on_click + function="Gear.Copy" /> + </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 1c22a5c02e..e639f0dc9d 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -268,7 +268,7 @@ height="23" layout="topleft" left_delta="50" - top_pad="5" + top_pad="5" name="updater_service_combobox" width="300"> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 022c97f341..ee6317f367 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -18,6 +18,7 @@ <string name="StartupClearingCache">Clearing cache...</string> <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> <string name="StartupInitializingVFS">Initializing VFS...</string> + <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string> <!-- progress --> <string name="ProgressRestoring">Restoring...</string> @@ -2237,6 +2238,7 @@ Returns a string with the requested data about the region <string name="Unknown">(Unknown)</string> <string name="SummaryForTheWeek" value="Summary for this week, beginning on " /> <string name="NextStipendDay" value="The next stipend day is " /> + <string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string> <string name="GroupIndividualShare" value=" Group Individual Share" /> <string name="GroupColumn" value=" Group" /> <string name="Balance">Balance</string> @@ -2393,6 +2395,7 @@ Returns a string with the requested data about the region <string name="GroupMoneyBalance">Balance</string> <string name="GroupMoneyCredits">Credits</string> <string name="GroupMoneyDebits">Debits</string> + <string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string> <!-- viewer object --> <string name="ViewerObjectContents">Contents</string> diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index 1c4b965f46..83749fc535 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -133,12 +133,12 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s 0 </text> <button label="Comprar terreno" left="130" name="Buy Land..." width="125"/> + <button label="Venta Linden" name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/> <button label="Información de scripts" name="Scripts..."/> <button label="Comprar para el grupo" name="Buy For Group..."/> <button label="Comprar un pase" left="130" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno." width="125"/> <button label="Abandonar el terreno" name="Abandon Land..."/> <button label="Reclamar el terreno" name="Reclaim Land..."/> - <button label="Venta Linden" name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/> </panel> <panel label="CONTRATO" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -308,6 +308,9 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. <panel.string name="push_restrict_region_text"> Sin 'empujones' (prevalece lo marcado en la región) </panel.string> + <panel.string name="see_avs_text"> + Ver a los residentes de esta parcela y chatear con ellos + </panel.string> <text name="allow_label"> Permitir a otros Residentes: </text> @@ -370,6 +373,10 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. Foto: </text> <texture_picker label="" name="snapshot_ctrl" tool_tip="Pulse para elegir una imagen"/> + <text name="allow_label5"> + Permitir a los residentes de otras parcelas: + </text> + <check_box label="Ver los avatares" name="SeeAvatarsCheck" tool_tip="Permite que los residentes de otras parcelas vean a los residentes de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos."/> <text name="landing_point"> Punto de llegada: [LANDING] </text> @@ -429,6 +436,11 @@ los media: Sonido: </text> <check_box label="Restringir sonidos de objetos y gestos a esta parcela" name="check sound local"/> + <text name="Avatar Sounds:"> + Sonidos de avatar: + </text> + <check_box label="Todos" name="all av sound check"/> + <check_box label="Grupo" name="group av sound check"/> <text name="Voice settings:"> Voz: </text> diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml new file mode 100644 index 0000000000..5e7df8530e --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Env Preset" title="ELIMINAR EL ENV PREDEFINIDO"> + <string name="title_water"> + Eliminar el agua predefinida + </string> + <string name="title_sky"> + Eliminar cielo predefinido + </string> + <string name="title_day_cycle"> + Eliminar ciclo del día + </string> + <string name="label_water"> + Predefinido: + </string> + <string name="label_sky"> + Predefinido: + </string> + <string name="label_day_cycle"> + Ciclo del día: + </string> + <string name="msg_confirm_deletion"> + ¿Estás seguro de que quieres eliminar el valor predefinido seleccionado? + </string> + <string name="msg_sky_is_referenced"> + No se puede quitar un valor predefinido al que se hace referencia en otro u otros ciclos del día. + </string> + <string name="combo_label"> + -Selecciona un valor predefinido- + </string> + <text name="label"> + Predefinido: + </text> + <button label="Borrar" name="delete"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..6ac46351db --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Day cycle" title="Editar ciclo del día"> + <string name="title_new"> + Crear un ciclo del día nuevo + </string> + <string name="title_edit"> + Editar ciclo del día + </string> + <string name="hint_new"> + Asigna un nombre al ciclo del día, ajusta los controles para crearlo y selecciona "Guardar". + </string> + <string name="hint_edit"> + Para editar el ciclo del día, ajusta los controles siguientes y selecciona "Guardar". + </string> + <string name="combo_label"> + -Selecciona un valor predefinido- + </string> + <text name="label"> + Nombre predefinido: + </text> + <text name="note"> + Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará. + </text> + <text name="hint_item1"> + - Pulsa en una pestaña para editar la configuración y el tiempo de un cielo determinado. + </text> + <text name="hint_item2"> + - Pulsa y arrastra las pestañas para ajustar los tiempos de transición. + </text> + <text name="hint_item3"> + - Usa el depurador para obtener una vista previa del ciclo del día. + </text> + <panel name="day_cycle_slider_panel"> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleKeys"/> + <button label="Añadir clave" label_selected="Añadir clave" name="WLAddKey"/> + <button label="Eliminar clave" label_selected="Eliminar clave" name="WLDeleteKey"/> + <text name="WL12am"> + 12 AM + </text> + <text name="WL3am"> + 3 AM + </text> + <text name="WL6am"> + 6 AM + </text> + <text name="WL9amHash"> + 9 AM + </text> + <text name="WL12pmHash"> + 12 PM + </text> + <text name="WL3pm"> + 3 PM + </text> + <text name="WL6pm"> + 6 PM + </text> + <text name="WL9pm"> + 9 PM + </text> + <text name="WL12am2"> + 12 AM + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + </panel> + <text name="WLCurKeyPresetText"> + Configuración del cielo: + </text> + <combo_box label="Predefinido" name="WLSkyPresets"/> + <text name="WLCurKeyTimeText"> + Hora: + </text> + <time name="time" value="6 AM"/> + <check_box label="Convertir en mi nuevo ciclo del día" name="make_default_cb"/> + <button label="Guardar" name="save"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..d2197b80fa --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Sky Preset" title="Editar cielo predefinido"> + <string name="title_new"> + Crear un nuevo cielo predefinido + </string> + <string name="title_edit"> + Editar cielo predefinido + </string> + <string name="hint_new"> + Asigna un nombre al valor predefinido, ajusta los controles para crearlo y selecciona "Guardar". + </string> + <string name="hint_edit"> + Para editar el cielo predefinido, ajusta los controles y selecciona "Guardar". + </string> + <string name="combo_label"> + -Selecciona un valor predefinido- + </string> + <text name="hint"> + Para editar el valor predefinido, ajusta los controles y selecciona "Guardar". + </text> + <text name="label"> + Nombre predefinido: + </text> + <text name="note"> + Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará. + </text> + <tab_container name="WindLight Tabs"> + <panel label="ATMÓSFERA" name="Atmosphere"> + <text name="BHText"> + Horizonte azul + </text> + <text name="BDensText"> + Cantidad de bruma + </text> + <text name="BDensText2"> + Saturación + </text> + <text name="HDText"> + Densidad de la bruma + </text> + <text name="DensMultText"> + Densidad + </text> + <text name="WLDistanceMultText"> + Distancia + </text> + <text name="MaxAltText"> + Altitud máx. + </text> + </panel> + <panel label="LUZ" name="Lighting"> + <text name="SLCText"> + Color del sol y de la luna + </text> + <text name="WLAmbientText"> + Ambiental + </text> + <text name="SunGlowText"> + Resplandor del sol + </text> + <slider label="Visión" name="WLGlowB"/> + <slider label="Tamaño" name="WLGlowR"/> + <text name="WLStarText"> + Brillo de las estrellas + </text> + <text name="SceneGammaText"> + Gamma de la escena + </text> + <text name="TODText"> + Posición del sol y la luna + </text> + <multi_slider initial_value="0" name="WLSunPos"/> + <text name="WL12amHash"> + | + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL12amHash2"> + | + </text> + <text name="WL12am"> + 12 AM + </text> + <text name="WL6am"> + 6 AM + </text> + <text name="WL12pmHash"> + 12 PM + </text> + <text name="WL6pm"> + 6 PM + </text> + <text name="WL12am2"> + 12 AM + </text> + <time name="WLDayTime" value="6:00 AM"/> + <text name="WLEastAngleText"> + Ángulo de elevación + </text> + </panel> + <panel label="NUBES" name="Clouds"> + <text name="WLCloudColorText"> + Color de las nubes + </text> + <text name="WLCloudColorText2"> + Posición/Densidad de las nubes + </text> + <slider label="X" name="WLCloudX"/> + <slider label="Y" name="WLCloudY"/> + <slider label="D" name="WLCloudDensity"/> + <text name="WLCloudCoverageText"> + Nubosidad + </text> + <text name="WLCloudScaleText"> + Altitud de las nubes + </text> + <text name="WLCloudDetailText"> + Detalle de las nubes (Posición/Densidad) + </text> + <slider label="X" name="WLCloudDetailX"/> + <slider label="Y" name="WLCloudDetailY"/> + <slider label="D" name="WLCloudDetailDensity"/> + <text name="WLCloudScrollXText"> + Velocidad de las nubes: X + </text> + <check_box label="Lock" name="WLCloudLockX"/> + <text name="WLCloudScrollYText"> + Velocidad de las nubes: Y + </text> + <check_box label="Lock" name="WLCloudLockY"/> + </panel> + </tab_container> + <check_box label="Convertir este valor predefinido en mi nueva configuración de cielo" name="make_default_cb"/> + <button label="Guardar" name="save"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml new file mode 100644 index 0000000000..f90ad59f78 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Water Preset" title="Editar el agua predefinida"> + <string name="title_new"> + Crear una nueva agua predefinida + </string> + <string name="title_edit"> + Editar el agua predefinida + </string> + <string name="hint_new"> + Asigna un nombre al valor predefinido, ajusta los controles para crearlo y selecciona "Guardar". + </string> + <string name="hint_edit"> + Para editar el agua predefinida, ajusta los controles y selecciona "Guardar". + </string> + <string name="combo_label"> + -Selecciona un valor predefinido- + </string> + <text name="hint"> + Para editar el valor predefinido, ajusta los controles y selecciona "Guardar". + </text> + <text name="label"> + Nombre predefinido: + </text> + <text name="note"> + Nota: Si cambias el nombre del valor predefinido, crearás un predefinido nuevo y el actual no se modificará. + </text> + <panel name="panel_water_preset"> + <text name="water_color_label"> + Color del agua + </text> + <text name="water_fog_density_label"> + Transparencia + </text> + <text name="underwater_fog_modifier_label"> + Modificar la claridad del agua + </text> + <text name="BHText"> + Sentido de las olas grandes + </text> + <slider label="X" name="WaterWave1DirX"/> + <slider label="Y" name="WaterWave1DirY"/> + <text name="BDensText"> + Tamaño de las ondulaciones + </text> + <text name="HDText"> + Escala de Fresnel + </text> + <text name="FresnelOffsetText"> + Coeficiente de reflexión + </text> + <text name="BHText2"> + Sentido de las olas pequeñas + </text> + <slider label="X" name="WaterWave2DirX"/> + <slider label="Y" name="WaterWave2DirY"/> + <text name="DensMultText"> + Refracción de la superficie + </text> + <text name="WaterScaleBelowText"> + Refracción bajo la superficie + </text> + <text name="MaxAltText"> + Desenfoque + </text> + <text name="BHText3"> + Vista Normal + </text> + </panel> + <check_box label="Convertir este valor predefinido en mi nueva configuración de agua" name="make_default_cb"/> + <button label="Guardar" name="save"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml new file mode 100644 index 0000000000..a9c5705d52 --- /dev/null +++ b/indra/newview/skins/default/xui/es/floater_environment_settings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Environment Editor Floater" title="CONFIGURACIÓN DE ENTORNO"> + <text name="note"> + Puedes personalizar la configuración del entorno de tu visor con las opciones siguientes. + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Usar configuración de región" name="use_region_settings"/> + <radio_item label="Personalizar mi entorno" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="note"> + Nota: La configuración personalizada no estará visible para otros usuarios. + </text> + <text name="water_settings_title"> + Configuración de agua + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Cielo/Ciclo del día + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Cielo invariable" name="my_sky_settings"/> + <radio_item label="Ciclo del día" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> + </combo_box> + </panel> + <button label="OK" name="ok_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml index 6208db75f9..0af44e1d91 100644 --- a/indra/newview/skins/default/xui/es/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml @@ -3,6 +3,9 @@ <string name="status_idle"> Inactivo </string> + <string name="status_parse_error"> + Problema de análisis de DAE - consulta los datos en el registro. + </string> <string name="status_reading_file"> Cargando... </string> @@ -12,6 +15,9 @@ <string name="status_vertex_number_overflow"> Error: El número de intersección es superior a 65534. Cancelado. </string> + <string name="bad_element"> + Error: el elemento no es válido + </string> <string name="high"> Alto </string> diff --git a/indra/newview/skins/default/xui/es/floater_model_wizard.xml b/indra/newview/skins/default/xui/es/floater_model_wizard.xml index 019c2d3829..a2c6c456eb 100644 --- a/indra/newview/skins/default/xui/es/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/es/floater_model_wizard.xml @@ -193,6 +193,9 @@ <string name="status_idle"> Inactivo </string> + <string name="status_parse_error"> + Problema de análisis de DAE - consulta los datos en el registro. + </string> <string name="status_reading_file"> Cargando... </string> @@ -202,6 +205,9 @@ <string name="status_vertex_number_overflow"> Error: El número de intersección es superior a 65534. Cancelado. </string> + <string name="bad_element"> + Error: el elemento no es válido + </string> <string name="high"> Alto </string> diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index 78f18b745c..70eac1e2c5 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -405,7 +405,7 @@ </combo_box> <spinner label="Gravedad" name="Physics Gravity"/> <spinner label="Fricción" name="Physics Friction"/> - <spinner label="Densidad" name="Physics Density"/> + <spinner label="Densidad en 100 kg/m^3" name="Physics Density"/> <spinner label="Reemplazo" name="Physics Restitution"/> </panel> <panel label="Textura" name="Texture"> diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml index c27d624732..cabcacaed5 100644 --- a/indra/newview/skins/default/xui/es/menu_login.xml +++ b/indra/newview/skins/default/xui/es/menu_login.xml @@ -17,7 +17,7 @@ <menu_item_call label="Mostrar los 'TOS'" name="TOS"/> <menu_item_call label="Mostrar mensaje crítico" name="Critical"/> <menu_item_call label="Prueba de navegadores de medios" name="Web Browser Test"/> - <menu_item_call label="Prueba de ventanas de contenidos web" name="Web Content Floater Test"/> + <menu_item_call label="Prueba de depuración de ventanas de contenido web" name="Web Content Floater Debug Test"/> <menu_item_check label="Mostrar el selector de Grid" name="Show Grid Picker"/> <menu_item_call label="Mostrar la consola de notificaciones" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml index f0fe383c0c..1403e4db01 100644 --- a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_group_plus"> +<toggleable_menu name="menu_group_plus"> <menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/> <menu_item_check label="Ordenar alfabéticamente" name="sort_name"/> <menu_item_check label="Ordenar según distancia" name="sort_distance"/> <menu_item_check label="Ver los iconos de la gente" name="view_icons"/> + <menu_item_check label="Ver mapa" name="view_map"/> <menu_item_call label="Ver la lista de Residentes y Objetos ignorados" name="show_blocked_list"/> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 0824e386d5..049a89aa06 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -31,6 +31,7 @@ <menu_item_call label="Mis grupos" name="My Groups"/> <menu_item_check label="Chat" name="Nearby Chat"/> <menu_item_call label="Gente cerca" name="Active Speakers"/> + <menu_item_check label="Chat de voz" name="Nearby Voice"/> </menu> <menu label="Mundo" name="World"> <menu_item_check label="Minimapa" name="Mini-Map"/> @@ -63,8 +64,24 @@ <menu_item_call label="Mediodía" name="Noon"/> <menu_item_call label="Atardecer" name="Sunset"/> <menu_item_call label="Medianoche" name="Midnight"/> - <menu_item_call label="Hora del Estado" name="Revert to Region Default"/> - <menu_item_call label="Editor del entorno" name="Environment Editor"/> + </menu> + <menu label="Editor de entorno" name="Enviroment Editor"> + <menu_item_call label="Configuración de entorno..." name="Enviroment Settings"/> + <menu label="Agua predefinida" name="Water Presets"> + <menu_item_call label="Nuevo predefinido..." name="new_water_preset"/> + <menu_item_call label="Editar predefinido..." name="edit_water_preset"/> + <menu_item_call label="Eliminar predefinido..." name="delete_water_preset"/> + </menu> + <menu label="Cielos predefinidos" name="Sky Presets"> + <menu_item_call label="Nuevo predefinido..." name="new_sky_preset"/> + <menu_item_call label="Editar predefinido..." name="edit_sky_preset"/> + <menu_item_call label="Eliminar predefinido..." name="delete_sky_preset"/> + </menu> + <menu label="Días predefinidos" name="Day Presets"> + <menu_item_call label="Nuevo predefinido..." name="new_day_preset"/> + <menu_item_call label="Editar predefinido..." name="edit_day_preset"/> + <menu_item_call label="Eliminar predefinido..." name="delete_day_preset"/> + </menu> </menu> </menu> <menu label="Construir" name="BuildTools"> diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml index 9d9ce75e53..ec13f99a01 100644 --- a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> +<toggleable_menu name="Gear Wearing"> <menu_item_call label="Editar el vestuario" name="edit"/> <menu_item_call label="Quitarme" name="takeoff"/> -</menu> + <menu_item_call label="Copiar la lista del vestuario al portapapeles" name="copy"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index b2131fc038..a1cd676142 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1560,6 +1560,11 @@ Vuelve a intentarlo más tarde. <button name="Cancel" text="Cancelar"/> </form> </notification> + <notification name="TooManyTeleportOffers"> + Has intentado hacer [OFFERS] ofertas de teleporte, +excediendo el límite de [LIMIT]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="OfferTeleportFromGod"> ¿Obligar a este Residente a ir a tu localización? <form name="form"> @@ -1980,6 +1985,10 @@ Linden Lab ¿Estás seguro de que quieres borrar tu historial web, de viajes y de búsquedas? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> + <notification name="ConfirmClearCache"> + ¿Estás seguro de que quieres vaciar la caché del visor? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> <notification name="ConfirmClearCookies"> ¿Estás seguro de que quieres limpiar tus cookies? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/> @@ -2005,48 +2014,30 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p ¿Quieres sobrescribir la preselección guardada? <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> - <notification name="WLDeletePresetAlert"> - ¿Quieres borrar [SKY]? - <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> - </notification> <notification name="WLNoEditDefault"> No puedes editar ni borrar una preselección por defecto. </notification> <notification name="WLMissingSky"> Este archivo del ciclo de un día se refiere a un archivo perdido de cielo: [SKY]. </notification> - <notification name="PPSaveEffectAlert"> - Ya existe un efecto de procesamiento. ¿Quieres sobreescribirlo? - <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> - </notification> - <notification name="NewSkyPreset"> - Dame un nombre para el cielo nuevo. - <form name="form"> - <input name="message"> - Preselección nueva - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Cancelar"/> - </form> + <notification name="WLRegionApplyFail"> + No se pudo aplicar la configuración a la región. El problema podría solucionarse saliendo de la región y regresando a ella. La razón especificada fue: [FAIL_REASON] </notification> - <notification name="ExistsSkyPresetAlert"> - ¡Esa preselección ya existe! + <notification name="EnvCannotDeleteLastDayCycleKey"> + No se puede eliminar la última clave de este ciclo del día, ya que no puedes vaciar la caché del día. En lugar de intentar eliminar la última clave restante y después intentar crear una nueva, debes modificarla. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="NewWaterPreset"> - Dame un nombre para la nueva preselección de agua. - <form name="form"> - <input name="message"> - Preselección nueva - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Cancelar"/> - </form> + <notification name="DayCycleTooManyKeyframes"> + No se pueden añadir más fotogramas clave a este ciclo del día. El número máximo de fotogramas clave para ciclos del día de alcance [SCOPE] es [MAX]. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="ExistsWaterPresetAlert"> - ¡Esa preselección ya existe! + <notification name="EnvUpdateRate"> + La configuración de entorno de la región sólo puede actualizarse cada [WAIT] segundos. Espera por lo menos este tiempo y vuelve intentarlo. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="WaterNoEditDefault"> - No puedes editar o borrar una preselección por defecto. + <notification name="PPSaveEffectAlert"> + Ya existe un efecto de procesamiento. ¿Quieres sobreescribirlo? + <usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/> </notification> <notification name="ChatterBoxSessionStartError"> No se puede empezar una nueva sesión de chat con [RECIPIENT]. @@ -2337,6 +2328,9 @@ Aquí no puedes volar. <notification name="NoBuild"> Este terreno tiene desactivado el poder construir. Aquí no puedes ni construir ni crear objetos. </notification> + <notification name="SeeAvatars"> + Esta parcela oculta los avatares y el chat de texto de otras parcelas. No podrás ver a los residentes que estén fuera la parcela ni ellos podrán verte a ti. El chat de texto regular del canal 0 también está bloqueado. + </notification> <notification name="ScriptsStopped"> Un administrador ha detenido temporalmente los scripts en esta región. </notification> @@ -2763,7 +2757,9 @@ Se mostrará cuando haya suficiente espacio. Selecciona los residentes con quienes deseas compartir. </notification> <notification name="MeshUploadError"> - No se ha cargado [ETIQUETA]: [MENSAJE] [IDENTIFICADOR] [IDENTIFICADOR_FALTA_VALIDEZ] + [LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER] + +Consulta los detalles en el archivo de registro. </notification> <notification name="ShareItemsConfirmation"> ¿Estás seguro de que quieres compartir los elementos siguientes? diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml index 661b44e419..3f8057f242 100644 --- a/indra/newview/skins/default/xui/es/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/es/panel_outfits_list.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Outfits"> + <accordion name="outfits_accordion"> + <no_matched_tabs_text name="no_matched_outfits_msg" value="¿No encuentras lo que buscas? Inténtalo con [secondlife:///app/search/all/[SEARCH_TERM] Buscar]."/> + <no_visible_tabs_text name="no_outfits_msg" value="Todavía no tienes vestuario. Inténtalo con [secondlife:///app/search/all/ Buscar]"/> + </accordion> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Ver más opciones"/> + <menu_button name="options_gear_btn" tool_tip="Ver más opciones"/> <button name="trash_btn" tool_tip="Eliminar el vestuario seleccionado"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml index a9d38dca25..2fcbb00aed 100644 --- a/indra/newview/skins/default/xui/es/panel_people.xml +++ b/indra/newview/skins/default/xui/es/panel_people.xml @@ -76,7 +76,7 @@ <button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/> </layout_panel> <layout_panel name="teleport_btn_lp"> - <button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/> + <button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte"/> </layout_panel> </layout_stack> <layout_stack name="bottom_bar_ls1"> diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml index 3c363859a4..e1cf1332e2 100644 --- a/indra/newview/skins/default/xui/es/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml @@ -64,6 +64,8 @@ <text name="scripts_value" value="Sí"/> <text name="damage_label" value="Daño:"/> <text name="damage_value" value="No"/> + <text name="see_avatars_label" value="Ver los avatares:"/> + <text name="see_avatars_value" value="No"/> <button label="Acerca del terreno" name="about_land_btn"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml index 96e63e6fa0..620a95de4d 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml @@ -3,6 +3,19 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <text name="Cache:"> + Caché: + </text> + <spinner label="Tamaño de la caché (64 - 9984 MB)" name="cachesizespinner"/> + <text name="text_box5"> + MB + </text> + <button label="Vaciar la caché" label_selected="Vaciar la caché" name="clear_cache"/> + <text name="Cache location"> + Localización de la caché: + </text> + <button label="Elegir" label_selected="Elegir" name="set_cache"/> + <button label="Ubicación predeterminada" label_selected="Ubicación predeterminada" name="default_cache_location"/> <text name="UI Size:"> Tamaño de la UI: </text> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml index 75d175b262..5cb1654c70 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml @@ -19,6 +19,7 @@ <check_box label="Activado" name="enable_voice_check"/> <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="true"/> <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="true"/> + <check_box label="Reproducir sonidos de los gestos" name="gesture_audio_play_btn" tool_tip="Selecciona esta opción para escuchar los sonidos de los gestos" value="verdadero"/> <text name="voice_chat_settings"> Configuración del chat de voz </text> @@ -35,28 +36,5 @@ <button label="Elegir la tecla" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="Reconfigurarlo al botón medio del ratón"/> <button label="Dispositivos de entrada y salida" name="device_settings_btn" width="210"/> - <panel label="Configuración de dispositivos" name="device_settings_panel"> - <panel.string name="default_text"> - Por defecto - </panel.string> - <panel.string name="default system device"> - Dispositivo del sistema por defecto - </panel.string> - <panel.string name="no device"> - Ningún dispositivo - </panel.string> - <text name="Input"> - Entrada - </text> - <text name="My volume label"> - Mi volumen: - </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia el volumen usando este deslizable"/> - <text name="wait_text"> - Por favor, espera - </text> - <text name="Output"> - Salida - </text> - </panel> + <panel label="Configuración de dispositivos" name="device_settings_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml new file mode 100644 index 0000000000..a73f1deed4 --- /dev/null +++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Entorno" name="panel_env_info"> + <text name="water_settings_title"> + Selecciona la configuración de agua y cielo/ciclo del día que deseas que vean todos los visitantes de tu región. Más información + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Usar los valores predeterminados de Second Life" name="use_sl_default_settings"/> + <radio_item label="Usar la configuración siguiente" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="water_settings_title"> + Configuración de agua + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Cielo/Ciclo del día + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Cielo invariable" name="my_sky_settings"/> + <radio_item label="Ciclo del día" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Selecciona un valor predefinido-" name="item0"/> + </combo_box> + </panel> + <button label="Aplicar" name="apply_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml index 98b10e4895..cb6c03dbb5 100644 --- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml @@ -7,21 +7,56 @@ desconocida </text> <spinner label="Nivel del agua" name="water_height_spin"/> - <button label="?" name="water_height_help"/> - <spinner label="Límite de elevación del terreno" name="terrain_raise_spin"/> - <button label="?" name="terrain_raise_help"/> - <spinner label="Límite de bajada del terreno" name="terrain_lower_spin" bottom_delta="-34"/> - <button label="?" name="terrain_lower_help"/> - <check_box label="Usar el Sol del estado" name="use_estate_sun_check"/> - <button label="?" name="use_estate_sun_help"/> - <check_box label="Fijar el Sol" name="fixed_sun_check"/> - <button label="?" name="fixed_sun_help"/> - <slider label="Fase" name="sun_hour_slider"/> + <spinner label="Límite de elevación +del terreno" name="terrain_raise_spin"/> + <spinner bottom_delta="-34" label="Límite de bajada del +terreno" name="terrain_lower_spin"/> + <text name="detail_texture_text"> + Texturas del terreno (requiere archivos .tga de 512x512, 24 bits) + </text> + <text name="height_text_lbl"> + 1 (bajo) + </text> + <text name="height_text_lbl2"> + 2 + </text> + <text name="height_text_lbl3"> + 3 + </text> + <text name="height_text_lbl4"> + 4 (alto) + </text> + <text name="height_text_lbl5"> + Intervalos de elevación de textura + </text> + <text name="height_text_lbl10"> + Estos valores representan la gama de mezclas para las texturas anteriores. + </text> + <text name="height_text_lbl11"> + El valor BAJA mide en metros la altura MÁXIMA de la textura n.º 1, y el valor ALTA es la altura MÍNIMA de la textura n.º 4. + </text> + <text name="height_text_lbl6"> + Noroeste + </text> + <text name="height_text_lbl7"> + Noreste + </text> + <spinner label="Bajo" name="height_start_spin_1"/> + <spinner label="Bajo" name="height_start_spin_3"/> + <spinner label="Alto" name="height_range_spin_1"/> + <spinner label="Alto" name="height_range_spin_3"/> + <text name="height_text_lbl8"> + Suroeste + </text> + <text name="height_text_lbl9"> + Sureste + </text> + <spinner label="Bajo" name="height_start_spin_0"/> + <spinner label="Bajo" name="height_start_spin_2"/> + <spinner label="Alto" name="height_range_spin_0"/> + <spinner label="Alto" name="height_range_spin_2"/> + <button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="230"/> + <button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores" width="230"/> + <button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada" width="230"/> <button label="Aplicar" name="apply_btn"/> - <button width="230" label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/> - <button left="246" label="?" name="download_raw_help"/> - <button width="230" label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/> - <button left="246" label="?" name="upload_raw_help"/> - <button width="230" label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/> - <button left="246" label="?" name="bake_terrain_help"/> </panel> diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml index b233fdd734..84d19c703b 100644 --- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml @@ -1,6 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Cosas" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + Objetos recibidos ([NUM]) + </string> + <string name="InboxLabelNoArg"> + Objetos recibidos + </string> + <button label="Objetos recibidos" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] Nuevos + </text> + <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <text name="inbox_inventory_placeholder"> + Aquí se entregarán las compras realizadas en el mercado. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel name="outbox_layout_panel"> + <panel label="" name="marketplace_outbox"> + <button label="Buzón de salida de comerciante" name="outbox_btn"/> + <button label="" name="outbox_sync_btn" tool_tip="Poner en el escaparate de Mi Mercado"/> + <panel tool_tip="Drag and drop items here to prepare them for sale on your storefront"> + <text name="outbox_inventory_placeholder"> + Configura tu cuenta de comerciante para utilizar esta función. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 72d7493a02..51ac3849ed 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1171,6 +1171,12 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="InventoryNoTexture"> No tienes en tu inventario una copia de esta textura </string> + <string name="InventoryInboxNoItems"> + Aquí se entregarán los objetos comprados en el mercado. + </string> + <string name="InventoryOutboxNoItems"> + Arrastra objetos aquí para preparar una lista del escaparate de tu mercado. + </string> <string name="no_transfer" value="(no transferible)"/> <string name="no_modify" value="(no modificable)"/> <string name="no_copy" value="(no copiable)"/> @@ -1295,6 +1301,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="InvFolder All"> Todas </string> + <string name="no_attachments"> + No tienes puestos anexos + </string> <string name="Buy"> Comprar </string> @@ -1630,6 +1639,9 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="IMTeen"> teen </string> + <string name="Anyone"> + cualquiera + </string> <string name="RegionInfoError"> error </string> @@ -1846,6 +1858,12 @@ Intenta iniciar sesión de nuevo en unos instantes. <string name="Public"> Público </string> + <string name="LocalSettings"> + Configuración local + </string> + <string name="RegionSettings"> + Configuración de la región + </string> <string name="ClassifiedClicksTxt"> Clics: [TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil </string> @@ -3637,6 +3655,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE]. <string name="LocationCtrlGeneralIconTooltip"> Región General </string> + <string name="LocationCtrlSeeAVsTooltip"> + Los avatares están visibles y está permitido el chat fuera de esta parcela + </string> <string name="UpdaterWindowTitle"> Actualizar [APP_NAME] </string> diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index bef41bb1ba..55dd913a22 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -135,12 +135,12 @@ 0 </text> <button label="Acheter du terrain" label_selected="Acheter le terrain..." left_delta="60" name="Buy Land..." width="125"/> + <button label="Vente Linden" label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d'un résident, avoir un contenu défini et ne pas être aux enchères."/> <button label="Infos sur les scripts" name="Scripts..." width="110"/> <button label="Acheter pour le groupe" label_selected="Acheter pour le groupe..." name="Buy For Group..."/> <button label="Acheter un pass" label_selected="Acheter un pass..." left_delta="-127" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/> <button label="Abandonner le terrain" label_selected="Abandonner le terrain..." name="Abandon Land..."/> <button label="Récupérer le terrain" label_selected="Redemander le terrain…" name="Reclaim Land..."/> - <button label="Vente Linden" label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d'un résident, avoir un contenu défini et ne pas être aux enchères."/> </panel> <panel label="RÈGLEMENT" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -312,6 +312,9 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. <panel.string name="push_restrict_region_text"> Pas de bousculades (les règles de la région priment) </panel.string> + <panel.string name="see_avs_text"> + Voir et chatter avec les résidents sur cette parcelle + </panel.string> <text name="allow_label"> Autoriser les autres résidents à : </text> @@ -374,6 +377,10 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. Photo : </text> <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/> + <text name="allow_label5"> + Autoriser les résidents sur les autres parcelles à : + </text> + <check_box label="Voir les avatars" name="SeeAvatarsCheck" tool_tip="Permettre aux résidents présents sur d'autres parcelles de voir et chatter avec les résidents présents sur cette parcelle et vous permettre de les voir et de chatter avec eux."/> <text name="landing_point"> Lieu d'arrivée : [LANDING] </text> @@ -434,6 +441,11 @@ musique : Son : </text> <check_box label="Limiter les gestes et sons d'objet à cette parcelle" name="check sound local"/> + <text name="Avatar Sounds:"> + Sons d'avatar : + </text> + <check_box label="Tout le monde" name="all av sound check"/> + <check_box label="Groupe" name="group av sound check"/> <text name="Voice settings:"> Voix : </text> diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml new file mode 100644 index 0000000000..035bdbe5f3 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Env Preset" title="SUPPRIMER PRÉRÉGLAGE ENV."> + <string name="title_water"> + Supprimer un préréglage de l'eau + </string> + <string name="title_sky"> + Supprimer un préréglage du ciel + </string> + <string name="title_day_cycle"> + Supprimer un cycle du jour + </string> + <string name="label_water"> + Préréglage : + </string> + <string name="label_sky"> + Préréglage : + </string> + <string name="label_day_cycle"> + Cycle du jour : + </string> + <string name="msg_confirm_deletion"> + Voulez-vous vraiment supprimer le préréglage sélectionné ? + </string> + <string name="msg_sky_is_referenced"> + Impossible de supprimer un préréglage référencé dans un ou plusieurs cycles du jour. + </string> + <string name="combo_label"> + -Effectuer une sélection- + </string> + <text name="label"> + Préréglage : + </text> + <button label="Supprimer" name="delete"/> + <button label="Annuler" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..0100419bc5 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Day cycle" title="Modifier un cycle du jour"> + <string name="title_new"> + Créer un nouveau cycle du jour + </string> + <string name="title_edit"> + Modifier un cycle du jour + </string> + <string name="hint_new"> + Donnez un nom au cycle du jour, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer. + </string> + <string name="hint_edit"> + Pour modifier le cycle du jour, ajustez les contrôles ci-dessous, puis cliquez sur Enregistrer. + </string> + <string name="combo_label"> + -Effectuer une sélection- + </string> + <text name="label"> + Nom du préréglage : + </text> + <text name="note"> + Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel. + </text> + <text name="hint_item1"> + - Cliquez sur un repère pour modifier le réglage du ciel et l'heure associés. + </text> + <text name="hint_item2"> + - Cliquez sur les repères et faites-les glisser afin de définir les heures de transition. + </text> + <text name="hint_item3"> + - Déplacez le marqueur en forme de triangle pour afficher un aperçu du cycle du jour. + </text> + <panel name="day_cycle_slider_panel"> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleKeys"/> + <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/> + <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/> + <text name="WL12am"> + Min. + </text> + <text name="WL3am"> + 3h + </text> + <text name="WL6am"> + 6h + </text> + <text name="WL9amHash"> + 9h + </text> + <text name="WL12pmHash"> + Midi + </text> + <text name="WL3pm"> + 15h + </text> + <text name="WL6pm"> + 18h + </text> + <text name="WL9pm"> + 21h + </text> + <text name="WL12am2"> + Min. + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + </panel> + <text name="WLCurKeyPresetText"> + Réglage du ciel : + </text> + <combo_box label="Préréglage" name="WLSkyPresets"/> + <text name="WLCurKeyTimeText"> + Heure : + </text> + <time name="time" value="6h"/> + <check_box label="Appliquer ce nouveau cycle du jour" name="make_default_cb"/> + <button label="Enregistrer" name="save"/> + <button label="Annuler" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..4ec9bbb3dd --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Sky Preset" title="Modifier un préréglage du ciel"> + <string name="title_new"> + Créer un nouveau préréglage du ciel + </string> + <string name="title_edit"> + Modifier un préréglage du ciel + </string> + <string name="hint_new"> + Donnez un nom à votre préréglage, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer. + </string> + <string name="hint_edit"> + Pour modifier le préréglage du ciel, ajustez les contrôles, puis cliquez sur Enregistrer. + </string> + <string name="combo_label"> + -Effectuer une sélection- + </string> + <text name="hint"> + Pour modifier le préréglage, ajustez les contrôles, puis cliquez sur Enregistrer. + </text> + <text name="label"> + Nom du préréglage : + </text> + <text name="note"> + Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel. + </text> + <tab_container name="WindLight Tabs"> + <panel label="ATMOSPHÈRE" name="Atmosphere"> + <text name="BHText"> + Bleu de l'horizon + </text> + <text name="BDensText"> + Quantité de brume + </text> + <text name="BDensText2"> + Densité du bleu + </text> + <text name="HDText"> + Densité de la brume + </text> + <text name="DensMultText"> + Multiplicateur de densité + </text> + <text name="WLDistanceMultText"> + Multiplicateur de distance + </text> + <text name="MaxAltText"> + Altitude maximum + </text> + </panel> + <panel label="LUMIÈRE" name="Lighting"> + <text name="SLCText"> + Couleur soleil/lune + </text> + <text name="WLAmbientText"> + Éclairage ambiant + </text> + <text name="SunGlowText"> + Rayonnement du soleil + </text> + <slider label="Netteté" name="WLGlowB"/> + <slider label="Taille" name="WLGlowR"/> + <text name="WLStarText"> + Éclat des étoiles + </text> + <text name="SceneGammaText"> + Gamma de la scène + </text> + <text name="TODText"> + Position soleil/lune + </text> + <multi_slider initial_value="0" name="WLSunPos"/> + <text name="WL12amHash"> + | + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL12amHash2"> + | + </text> + <text name="WL12am"> + Min. + </text> + <text name="WL6am"> + 6h + </text> + <text name="WL12pmHash"> + Midi + </text> + <text name="WL6pm"> + 18h + </text> + <text name="WL12am2"> + Min. + </text> + <time name="WLDayTime" value="6h"/> + <text name="WLEastAngleText"> + Angle du levant + </text> + </panel> + <panel label="NUAGES" name="Clouds"> + <text name="WLCloudColorText"> + Couleur des nuages + </text> + <text name="WLCloudColorText2"> + Nuages - XY/Densité + </text> + <slider label="X" name="WLCloudX"/> + <slider label="Y" name="WLCloudY"/> + <slider label="D" name="WLCloudDensity"/> + <text name="WLCloudCoverageText"> + Couverture nuageuse + </text> + <text name="WLCloudScaleText"> + Altitude des nuages + </text> + <text name="WLCloudDetailText"> + Détails des nuages - XY/Densité + </text> + <slider label="X" name="WLCloudDetailX"/> + <slider label="Y" name="WLCloudDetailY"/> + <slider label="D" name="WLCloudDetailDensity"/> + <text name="WLCloudScrollXText"> + Direction et vitesse X + </text> + <check_box label="Verrouiller" name="WLCloudLockX"/> + <text name="WLCloudScrollYText"> + Direction et vitesse Y + </text> + <check_box label="Verrouiller" name="WLCloudLockY"/> + </panel> + </tab_container> + <check_box label="Appliquer ce nouveau préréglage pour le ciel" name="make_default_cb"/> + <button label="Enregistrer" name="save"/> + <button label="Annuler" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml new file mode 100644 index 0000000000..81d9d34cfb --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Water Preset" title="Modifier un préréglage de l'eau"> + <string name="title_new"> + Créer un nouveau préréglage de l'eau + </string> + <string name="title_edit"> + Modifier un préréglage de l'eau + </string> + <string name="hint_new"> + Donnez un nom à votre préréglage, ajustez les contrôles afin de le créer, puis cliquez sur Enregistrer. + </string> + <string name="hint_edit"> + Pour modifier le préréglage de l'eau, ajustez les contrôles, puis cliquez sur Enregistrer. + </string> + <string name="combo_label"> + -Effectuer une sélection- + </string> + <text name="hint"> + Pour modifier le préréglage, ajustez les contrôles, puis cliquez sur Enregistrer. + </text> + <text name="label"> + Nom du préréglage : + </text> + <text name="note"> + Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel. + </text> + <panel name="panel_water_preset"> + <text name="water_color_label"> + Couleur du brouillard dans l'eau + </text> + <text name="water_fog_density_label"> + Densité du brouillard + </text> + <text name="underwater_fog_modifier_label"> + Brouillard sous-marin + </text> + <text name="BHText"> + Direction grande vague + </text> + <slider label="X" name="WaterWave1DirX"/> + <slider label="Y" name="WaterWave1DirY"/> + <text name="BDensText"> + Échelle des vaguelettes + </text> + <text name="HDText"> + Échelle Fresnel + </text> + <text name="FresnelOffsetText"> + Décalage Fresnel + </text> + <text name="BHText2"> + Direction petite vague + </text> + <slider label="X" name="WaterWave2DirX"/> + <slider label="Y" name="WaterWave2DirY"/> + <text name="DensMultText"> + Réfraction au-dessus + </text> + <text name="WaterScaleBelowText"> + Réfraction en dessous + </text> + <text name="MaxAltText"> + Multiplicateur de flou + </text> + <text name="BHText3"> + Normal Map + </text> + </panel> + <check_box label="Appliquer ce nouveau préréglage pour l'eau" name="make_default_cb"/> + <button label="Enregistrer" name="save"/> + <button label="Annuler" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml new file mode 100644 index 0000000000..9ea47a3dd7 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Environment Editor Floater" title="PARAMÈTRES D'ENVIRONNEMENT"> + <text name="note"> + Utilisez les options ci-dessous pour personnaliser l'environnement de votre client. + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Utiliser les réglages de la région" name="use_region_settings"/> + <radio_item label="Personnaliser mon environnement" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="note"> + Remarque : les autres utilisateurs ne pourront pas voir votre configuration personnalisée. + </text> + <text name="water_settings_title"> + Réglage de l'eau + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Effectuer une sélection-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Ciel / Cycle du jour + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Ciel fixe" name="my_sky_settings"/> + <radio_item label="Cycle du jour" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Effectuer une sélection-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Effectuer une sélection-" name="item0"/> + </combo_box> + </panel> + <button label="OK" name="ok_btn"/> + <button label="Annuler" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml index 213847bbd0..4788f674c8 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml @@ -3,6 +3,9 @@ <string name="status_idle"> Inactif </string> + <string name="status_parse_error"> + Problème d'analyse de fichier .dae ; reportez-vous au journal pour plus de détails. + </string> <string name="status_reading_file"> Chargement... </string> @@ -12,6 +15,9 @@ <string name="status_vertex_number_overflow"> Erreur : valeur de sommet supérieure à 65534. Opération abandonnée. </string> + <string name="bad_element"> + Erreur : élément non valide + </string> <string name="high"> Élevé </string> diff --git a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml index bb64361959..ebb87f3ba4 100644 --- a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml @@ -193,6 +193,9 @@ <string name="status_idle"> Inactif </string> + <string name="status_parse_error"> + Problème d'analyse de fichier .dae ; reportez-vous au journal pour plus de détails. + </string> <string name="status_reading_file"> Chargement... </string> @@ -202,6 +205,9 @@ <string name="status_vertex_number_overflow"> Erreur : valeur de sommet supérieure à 65534. Opération abandonnée. </string> + <string name="bad_element"> + Erreur : élément non valide + </string> <string name="high"> Élevé </string> diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 09d77a8d34..908048192e 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -405,7 +405,7 @@ </combo_box> <spinner label="Gravité" name="Physics Gravity"/> <spinner label="Friction" name="Physics Friction"/> - <spinner label="Densité" name="Physics Density"/> + <spinner label="Densité en 100 kg/m^3" name="Physics Density"/> <spinner label="Restitution" name="Physics Restitution"/> </panel> <panel label="Texture" name="Texture"> diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml index 400c77e51a..6b96a16e75 100644 --- a/indra/newview/skins/default/xui/fr/menu_login.xml +++ b/indra/newview/skins/default/xui/fr/menu_login.xml @@ -18,7 +18,7 @@ <menu_item_call label="Afficher les conditions d'utilisation" name="TOS"/> <menu_item_call label="Afficher le message critique" name="Critical"/> <menu_item_call label="Test du navigateur de médias" name="Web Browser Test"/> - <menu_item_call label="Test de la fenêtre flottante du contenu Web" name="Web Content Floater Test"/> + <menu_item_call label="Test de débogage de la fenêtre flottante du contenu Web" name="Web Content Floater Debug Test"/> <menu_item_check label="Afficher le sélecteur de grille" name="Show Grid Picker"/> <menu_item_call label="Afficher la console des notifications" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml index 45f97e062e..0aad174fbd 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_group_plus"> +<toggleable_menu name="menu_group_plus"> <menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/> <menu_item_check label="Trier par nom" name="sort_name"/> <menu_item_check label="Trier par distance" name="sort_distance"/> <menu_item_check label="Afficher les icônes des résidents" name="view_icons"/> + <menu_item_check label="Afficher la carte" name="view_map"/> <menu_item_call label="Afficher les résidents et les objets interdits" name="show_blocked_list"/> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index d614cfe00c..ccea1e4570 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -31,6 +31,7 @@ <menu_item_call label="Mes groupes" name="My Groups"/> <menu_item_check label="Chat près de moi" name="Nearby Chat"/> <menu_item_call label="Personnes près de moi" name="Active Speakers"/> + <menu_item_check label="Chat vocal près de vous" name="Nearby Voice"/> </menu> <menu label="Monde" name="World"> <menu_item_check label="Mini-carte" name="Mini-Map"/> @@ -63,8 +64,24 @@ <menu_item_call label="Milieu de journée" name="Noon"/> <menu_item_call label="Coucher de soleil" name="Sunset"/> <menu_item_call label="Minuit" name="Midnight"/> - <menu_item_call label="Heure du domaine" name="Revert to Region Default"/> - <menu_item_call label="Éditeur d'environnement" name="Environment Editor"/> + </menu> + <menu label="Éditeur d'environnement" name="Enviroment Editor"> + <menu_item_call label="Paramètres d'environnement..." name="Enviroment Settings"/> + <menu label="Préréglages de l'eau" name="Water Presets"> + <menu_item_call label="Nouveau préréglage..." name="new_water_preset"/> + <menu_item_call label="Modifier un préréglage..." name="edit_water_preset"/> + <menu_item_call label="Supprimer un préréglage..." name="delete_water_preset"/> + </menu> + <menu label="Préréglages du ciel" name="Sky Presets"> + <menu_item_call label="Nouveau préréglage..." name="new_sky_preset"/> + <menu_item_call label="Modifier un préréglage..." name="edit_sky_preset"/> + <menu_item_call label="Supprimer un préréglage..." name="delete_sky_preset"/> + </menu> + <menu label="Préréglages du jour" name="Day Presets"> + <menu_item_call label="Nouveau préréglage..." name="new_day_preset"/> + <menu_item_call label="Modifier un préréglage..." name="edit_day_preset"/> + <menu_item_call label="Supprimer un préréglage..." name="delete_day_preset"/> + </menu> </menu> </menu> <menu label="Construire" name="BuildTools"> diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml index 0ca9fe1879..c3d9d908b0 100644 --- a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> +<toggleable_menu name="Gear Wearing"> <menu_item_call label="Modifier la tenue" name="edit"/> <menu_item_call label="Enlever" name="takeoff"/> -</menu> + <menu_item_call label="Copier la liste de la tenue dans le presse-papiers" name="copy"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 6bfab25087..52b8e8569a 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1550,6 +1550,11 @@ Veuillez réessayer ultérieurement. <button name="Cancel" text="Annuler"/> </form> </notification> + <notification name="TooManyTeleportOffers"> + Vous avez essayé d'effectuer [OFFERS] offres de téléportation, +or ce nombre dépasse la limite autorisée fixée à [LIMIT]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="OfferTeleportFromGod"> Exiger du résident qu'il vienne vous rejoindre ? <form name="form"> @@ -1971,6 +1976,10 @@ Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ? Êtes-vous certain de vouloir supprimer l'historique de vos visites et recherches ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> </notification> + <notification name="ConfirmClearCache"> + Voulez-vous vraiment vider le cache de votre client ? + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/> + </notification> <notification name="ConfirmClearCookies"> Êtes-vous certain de vouloir supprimer vos cookies ? <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/> @@ -1996,48 +2005,30 @@ Liez-la à partir d'une page web pour permettre aux autres résidents d&apo Voulez-vous écraser l'option précédemment enregistrée ? <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> </notification> - <notification name="WLDeletePresetAlert"> - Voulez-vous supprimer [SKY] ? - <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> - </notification> <notification name="WLNoEditDefault"> Vous ne pouvez pas modifier ou supprimer un préréglage par défaut. </notification> <notification name="WLMissingSky"> Une dossier semble manquer au Cycle du jour : [SKY]. </notification> - <notification name="PPSaveEffectAlert"> - Certains effets post-traitement existent. Voulez-vous quand même écraser ce fichier ? - <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> - </notification> - <notification name="NewSkyPreset"> - Nommez le nouveau ciel. - <form name="form"> - <input name="message"> - Nouveau préréglage - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Annuler"/> - </form> + <notification name="WLRegionApplyFail"> + Impossible d'appliquer les réglages à la région. Le problème est parfois résolu en quittant la région puis en y revenant. Motif fourni : [FAIL_REASON] </notification> - <notification name="ExistsSkyPresetAlert"> - Ce préréglage existe déjà ! + <notification name="EnvCannotDeleteLastDayCycleKey"> + Impossible de supprimer la dernière clé de ce cycle du jour car ce dernier ne peut pas être vide. Modifiez la dernière clé restante au lieu d'essayer de la supprimer puis d'en créer une nouvelle. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="NewWaterPreset"> - Nommez ce nouveau préréglage d'eau. - <form name="form"> - <input name="message"> - Nouveau préréglage - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Annuler"/> - </form> + <notification name="DayCycleTooManyKeyframes"> + Impossible d'ajouter plus d'images-clés à ce cycle du jour. Un maximum de [MAX] images-clés peut être associé aux cycles du jour de type [SCOPE]. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="ExistsWaterPresetAlert"> - Ce préréglage existe déjà ! + <notification name="EnvUpdateRate"> + Vous ne pouvez mettre à jour les paramètres d'environnement d'une région que toutes les [WAIT] secondes. Veuillez patienter pendant au moins ce délai avant de réessayer. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="WaterNoEditDefault"> - Vous ne pouvez pas modifier ou supprimer un préréglage par défaut. + <notification name="PPSaveEffectAlert"> + Certains effets post-traitement existent. Voulez-vous quand même écraser ce fichier ? + <usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/> </notification> <notification name="ChatterBoxSessionStartError"> Impossible de démarrer une nouvelle session de chat avec [RECIPIENT]. @@ -2329,6 +2320,9 @@ Vous ne pouvez pas voler ici. <notification name="NoBuild"> La construction est interdite dans cette zone. Vous ne pouvez pas construite ou rezzer d'objets ici. </notification> + <notification name="SeeAvatars"> + Cette parcelle masque les avatars et le chat écrit des autres parcelles. Vous ne pouvez pas voir les résidents qui se trouvent en dehors, et ceux qui se trouvent en dehors ne peuvent pas vous voir. Le chat écrit habituel sur le canal 0 est également bloqué. + </notification> <notification name="ScriptsStopped"> Un administrateur a temporairement stoppé les scripts dans cette région. </notification> @@ -2756,7 +2750,9 @@ Le bouton sera affiché quand il y aura suffisamment de place. Sélectionnez les résidents avec lesquels partager l'élément. </notification> <notification name="MeshUploadError"> - Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER] + +Voir le fichier journal pour plus de détails. </notification> <notification name="ShareItemsConfirmation"> Voulez-vous vraiment partager les articles suivants : diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml index ab352deec4..416353e1d4 100644 --- a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Outfits"> + <accordion name="outfits_accordion"> + <no_matched_tabs_text name="no_matched_outfits_msg" value="Vous n'avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/all/[SEARCH_TERM] Rechercher]."/> + <no_visible_tabs_text name="no_outfits_msg" value="Aucune tenue n'est actuellement en votre possession. Essayez [secondlife:///app/search/all Rechercher]."/> + </accordion> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> + <menu_button name="options_gear_btn" tool_tip="Afficher d'autres options"/> <button name="trash_btn" tool_tip="Supprimer la tenue sélectionnée"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml index b24c340708..f035853efc 100644 --- a/indra/newview/skins/default/xui/fr/panel_people.xml +++ b/indra/newview/skins/default/xui/fr/panel_people.xml @@ -67,16 +67,16 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife:// <button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/> </layout_panel> <layout_panel name="im_btn_lp"> - <button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/> + <button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/> </layout_panel> <layout_panel name="call_btn_lp"> - <button label="Appel" name="call_btn" tool_tip="Appeler ce résident"/> + <button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/> </layout_panel> <layout_panel name="share_btn_lp"> - <button label="Partager" name="share_btn" tool_tip="Partager un article de l'inventaire"/> + <button label="Partager" name="share_btn" tool_tip="Partager un article de l'inventaire."/> </layout_panel> <layout_panel name="teleport_btn_lp"> - <button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation"/> + <button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/> </layout_panel> </layout_stack> <layout_stack name="bottom_bar_ls1"> diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml index 3c2c1b9d37..30be838896 100644 --- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml @@ -68,6 +68,8 @@ <text name="scripts_value" value="Activé"/> <text name="damage_label" value="Dégâts :"/> <text name="damage_value" value="Désactivé"/> + <text name="see_avatars_label" value="Voir les avatars :"/> + <text name="see_avatars_value" value="Désactivé"/> <button label="À propos du terrain" name="about_land_btn"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index 3468afbafe..3f3d0f51f4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -3,6 +3,19 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <text name="Cache:"> + Cache : + </text> + <spinner label="Taille du cache (64 - 9984 Mo)" name="cachesizespinner"/> + <text name="text_box5"> + Mo + </text> + <button label="Vider le cache" label_selected="Vider le cache" name="clear_cache"/> + <text name="Cache location"> + Emplacement du cache : + </text> + <button label="Parcourir" label_selected="Parcourir" name="set_cache"/> + <button label="Par défaut" label_selected="Par défaut" name="default_cache_location"/> <text name="UI Size:"> Taille d'interface : </text> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml index a404aae483..deaec2e14f 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -19,6 +19,7 @@ <check_box label="Activé" name="enable_voice_check"/> <check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="true"/> <check_box label="Lecture du média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="true"/> + <check_box label="Lire les sons des gestes" name="gesture_audio_play_btn" tool_tip="Cochez cette case pour entendre les sons associés aux gestes." value="true"/> <text name="voice_chat_settings"> Paramètres du chat vocal </text> @@ -35,28 +36,5 @@ <button label="Définir la touche" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="Réinitialiser sur le bouton central de la souris"/> <button label="Périphériques d'entrée/de sortie" name="device_settings_btn"/> - <panel label="Paramètres du matériel" name="device_settings_panel"> - <panel.string name="default_text"> - Défaut - </panel.string> - <panel.string name="default system device"> - Périphérique système par défaut - </panel.string> - <panel.string name="no device"> - Aucun périphérique - </panel.string> - <text name="Input"> - Entrée - </text> - <text name="My volume label"> - Mon volume : - </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Régler le volume avec le curseur"/> - <text name="wait_text"> - Veuillez patienter - </text> - <text name="Output"> - Sortie - </text> - </panel> + <panel label="Paramètres du matériel" name="device_settings_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml new file mode 100644 index 0000000000..d18503db86 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Environnement" name="panel_env_info"> + <text name="water_settings_title"> + Sélectionnez les réglages d'eau et de ciel/cycle du jour que vous souhaitez afficher pour tous les résidents visitant votre région. En savoir plus + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Utiliser les réglages par défaut de Second Life" name="use_sl_default_settings"/> + <radio_item label="Utiliser les réglages suivants" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="water_settings_title"> + Réglage de l'eau + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Effectuer une sélection-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Ciel / Cycle du jour + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Ciel fixe" name="my_sky_settings"/> + <radio_item label="Cycle du jour" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Effectuer une sélection-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Effectuer une sélection-" name="item0"/> + </combo_box> + </panel> + <button label="Appliquer" name="apply_btn"/> + <button label="Annuler" name="cancel_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml index 4d7652eb6f..d7e321d06d 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml @@ -7,21 +7,56 @@ (inconnue) </text> <spinner label="Niveau de l'eau" name="water_height_spin"/> - <button label="?" name="water_height_help"/> - <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" bottom_delta="-34"/> - <button label="?" name="terrain_lower_help"/> - <check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/> - <button label="?" name="use_estate_sun_help"/> - <check_box label="Soleil fixe" name="fixed_sun_check"/> - <button label="?" name="fixed_sun_help"/> - <slider label="Phase" name="sun_hour_slider"/> - <button label="Appliquer" name="apply_btn"/> + <spinner label="Limite d'élévation du +terrain" name="terrain_raise_spin"/> + <spinner bottom_delta="-34" label="Limite d'abaissement +du terrain" name="terrain_lower_spin"/> + <text name="detail_texture_text"> + Textures du terrain (fichiers .tga 512 x 512, 24 bit requis) + </text> + <text name="height_text_lbl"> + 1 (Bas) + </text> + <text name="height_text_lbl2"> + 2 + </text> + <text name="height_text_lbl3"> + 3 + </text> + <text name="height_text_lbl4"> + 4 (Haut) + </text> + <text name="height_text_lbl5"> + Limites d'élévation de texture + </text> + <text name="height_text_lbl10"> + Ces valeurs représentent les limites de mélange pour les textures ci-dessus. + </text> + <text name="height_text_lbl11"> + En mètres, la valeur BAS correspond à la hauteur MAXIMUM de la texture n°1 et la valeur HAUT à la hauteur MINIMUM de la texture n°4. + </text> + <text name="height_text_lbl6"> + Nord-ouest + </text> + <text name="height_text_lbl7"> + Nord-est + </text> + <spinner label="Bas" name="height_start_spin_1"/> + <spinner label="Bas" name="height_start_spin_3"/> + <spinner label="Haut" name="height_range_spin_1"/> + <spinner label="Haut" name="height_range_spin_3"/> + <text name="height_text_lbl8"> + Sud-ouest + </text> + <text name="height_text_lbl9"> + Sud-est + </text> + <spinner label="Bas" name="height_start_spin_0"/> + <spinner label="Bas" name="height_start_spin_2"/> + <spinner label="Haut" name="height_range_spin_0"/> + <spinner label="Haut" name="height_range_spin_2"/> <button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/> - <button label="?" name="download_raw_help" left="246" /> <button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/> - <button label="?" name="upload_raw_help" left="246" /> <button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'élévation/abaissement"/> - <button label="?" name="bake_terrain_help"/> + <button label="Appliquer" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml index 3c4d2626c1..83543e3d0b 100644 --- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml @@ -1,6 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Choses" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + Articles reçus ([NUM]) + </string> + <string name="InboxLabelNoArg"> + Articles reçus + </string> + <button label="Articles reçus" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] nouv. + </text> + <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <text name="inbox_inventory_placeholder"> + Ici seront livrés les achats effectués sur la Place du marché. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel name="outbox_layout_panel"> + <panel label="" name="marketplace_outbox"> + <button label="Boîte d'envoi vendeur" name="outbox_btn"/> + <button label="" name="outbox_sync_btn" tool_tip="Vers ma vitrine de la Place du marché"/> + <panel tool_tip="Drag and drop items here to prepare them for sale on your storefront"> + <text name="outbox_inventory_placeholder"> + Configurez votre compte de vendeur de façon à pouvoir utiliser cette fonctionnalité. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 077e545851..134ea0c6bb 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1192,6 +1192,12 @@ Veuillez réessayer de vous connecter dans une minute. <string name="InventoryNoTexture"> Vous n'avez pas de copie de cette texture dans votre inventaire </string> + <string name="InventoryInboxNoItems"> + Ici seront livrés les articles achetés sur la Place du marché. + </string> + <string name="InventoryOutboxNoItems"> + Faites glisser des articles ici en vue de les publier sur votre vitrine de la Place du marché. + </string> <string name="no_transfer" value=" (pas de transfert)"/> <string name="no_modify" value=" (pas de modification)"/> <string name="no_copy" value=" (pas de copie)"/> @@ -1322,6 +1328,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="InvFolder All"> Tout </string> + <string name="no_attachments"> + Aucun élément attaché porté + </string> <string name="Buy"> Acheter </string> @@ -1657,6 +1666,9 @@ Veuillez réessayer de vous connecter dans une minute. <string name="IMTeen"> teen </string> + <string name="Anyone"> + n'importe qui + </string> <string name="RegionInfoError"> erreur </string> @@ -1879,6 +1891,12 @@ Veuillez réessayer de vous connecter dans une minute. <string name="Public"> Public </string> + <string name="LocalSettings"> + Réglages locaux + </string> + <string name="RegionSettings"> + Réglages de la région + </string> <string name="ClassifiedClicksTxt"> Clics : [TELEPORT] téléportation, [MAP] carte, [PROFILE] profil </string> @@ -3724,6 +3742,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. <string name="LocationCtrlGeneralIconTooltip"> Région de type Général </string> + <string name="LocationCtrlSeeAVsTooltip"> + Avatars visibles et chat autorisé en dehors de cette parcelle + </string> <string name="UpdaterWindowTitle"> [APP_NAME] - Mise à jour </string> diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index a96433d7aa..cf0f8f2f6f 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -136,12 +136,12 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezz 0 </text> <button label="Acquista il terreno..." label_selected="Acquista il terreno..." left="130" name="Buy Land..." width="125"/> + <button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere di proprietà, con contenuto impostato, e non già messa all'asta."/> <button label="Informazioni script" name="Scripts..."/> <button label="Acquista per il gruppo" name="Buy For Group..."/> <button label="Compra Pass..." label_selected="Compra Pass..." left="130" name="Buy Pass..." tool_tip="Un pass ti da un accesso temporaneo in questo territorio." width="125"/> <button label="Abbandona la terra" name="Abandon Land..."/> <button label="Reclama la terra" name="Reclaim Land..."/> - <button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere di proprietà, con contenuto impostato, e non già messa all'asta."/> </panel> <panel label="REGOLAMENTO" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -313,6 +313,9 @@ Solamente terreni più grandi possono essere abilitati nella ricerca. <panel.string name="push_restrict_region_text"> Nessuna spinta (Impostazione regionale) </panel.string> + <panel.string name="see_avs_text"> + Vedi i residenti in questo lotto e chatta con loro + </panel.string> <text name="allow_label"> Permetti ad altri residenti di: </text> @@ -375,6 +378,10 @@ Solamente terreni più grandi possono essere abilitati nella ricerca. Fotografia: </text> <texture_picker label="" name="snapshot_ctrl" tool_tip="Clicca per scegliere una immagine"/> + <text name="allow_label5"> + Permetti ai residenti in altri lotti di: + </text> + <check_box label="Vedi avatar" name="SeeAvatarsCheck" tool_tip="Consente ai residenti in altri lotti di vedere i residenti in questo lotto e chattare con loro, e ti consente di vederli e chattare con loro."/> <text name="landing_point"> Punto di atterraggio: [LANDING] </text> @@ -434,6 +441,11 @@ Media: Audio: </text> <check_box label="Limita l'audio per oggetti e gesture a questo lotto" name="check sound local"/> + <text name="Avatar Sounds:"> + Suoni avatar: + </text> + <check_box label="Tutti" name="all av sound check"/> + <check_box label="Gruppo" name="group av sound check"/> <text name="Voice settings:"> Voce: </text> diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml new file mode 100644 index 0000000000..71071825af --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Env Preset" title="CANCELLA PREDEFINITO AMB"> + <string name="title_water"> + Cancella valore predefinito acqua + </string> + <string name="title_sky"> + Cancella valore predefinito cielo + </string> + <string name="title_day_cycle"> + Cancella ciclo giornata + </string> + <string name="label_water"> + Valori predefiniti: + </string> + <string name="label_sky"> + Valori predefiniti: + </string> + <string name="label_day_cycle"> + Ciclo giornata: + </string> + <string name="msg_confirm_deletion"> + Sei sicuro di volere eliminare il valore predefinito selezionato? + </string> + <string name="msg_sky_is_referenced"> + Impossibile rimuovere un valore predefinito che viene utilizzato in uno o più cicli di giornata. + </string> + <string name="combo_label"> + -Seleziona un valore predefinito- + </string> + <text name="label"> + Valori predefiniti: + </text> + <button label="Elimina" name="delete"/> + <button label="Annulla" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..c922b2e4f7 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Day cycle" title="Modifica ciclo giornata"> + <string name="title_new"> + Crea un nuovo ciclo giornata + </string> + <string name="title_edit"> + Modifica ciclo giornata + </string> + <string name="hint_new"> + Dai un nome al ciclo della giornata, modifica i controlli per crearlo e fai clic su "Salva". + </string> + <string name="hint_edit"> + Per modificare il ciclo della giornata, modifica i controlli seguenti e fai clic su "Salva". + </string> + <string name="combo_label"> + -Seleziona un valore predefinito- + </string> + <text name="label"> + Nome predefinito: + </text> + <text name="note"> + Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato. + </text> + <text name="hint_item1"> + - Fai clic su una scheda per modificare gli orari e le impostazioni cielo specifiche. + </text> + <text name="hint_item2"> + - Fai clic e trascina le schede per impostare i tempi di transizione. + </text> + <text name="hint_item3"> + - Usa lo scrubber per visualizzare in anteprima il ciclo giornata. + </text> + <panel name="day_cycle_slider_panel"> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleKeys"/> + <button label="Aggiungi chiave" label_selected="Aggiungi chiave" name="WLAddKey"/> + <button label="Tasto cancella" label_selected="Tasto cancella" name="WLDeleteKey"/> + <text name="WL12am"> + 00:00 + </text> + <text name="WL3am"> + 03:00:00 + </text> + <text name="WL6am"> + 06:00:00 + </text> + <text name="WL9amHash"> + 09:00:00 + </text> + <text name="WL12pmHash"> + 12:00:00 + </text> + <text name="WL3pm"> + 15:00:00 + </text> + <text name="WL6pm"> + 18:00:00 + </text> + <text name="WL9pm"> + 21:00:00 + </text> + <text name="WL12am2"> + 00:00 + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + </panel> + <text name="WLCurKeyPresetText"> + Impostazioni cielo: + </text> + <combo_box label="Valori predefiniti" name="WLSkyPresets"/> + <text name="WLCurKeyTimeText"> + Giorno/ora: + </text> + <time name="time" value="06:00:00"/> + <check_box label="Usa come nuovo ciclo giornata" name="make_default_cb"/> + <button label="Salva" name="save"/> + <button label="Annulla" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..571027fd29 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Sky Preset" title="Modifica predefiniti cielo"> + <string name="title_new"> + Crea un nuovo valore predefinito per il cielo + </string> + <string name="title_edit"> + Modifica predefiniti cielo + </string> + <string name="hint_new"> + Dai un nome al valore predefinito, modifica i controlli per crearlo e fai clic su "Salva". + </string> + <string name="hint_edit"> + Per modificare il valore predefinito per il cielo, modifica i controlli e fai clic su "Salva". + </string> + <string name="combo_label"> + -Seleziona un valore predefinito- + </string> + <text name="hint"> + Per modificare i valori predefiniti, modifica i controlli e quindi fai clic su "Salva" + </text> + <text name="label"> + Nome predefinito: + </text> + <text name="note"> + Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato. + </text> + <tab_container name="WindLight Tabs"> + <panel label="ATMOSFERA" name="Atmosphere"> + <text name="BHText"> + Orizzonte blu + </text> + <text name="BDensText"> + Orizzonte foschia + </text> + <text name="BDensText2"> + Densità blu + </text> + <text name="HDText"> + Densità foschia + </text> + <text name="DensMultText"> + Fattore moltiplicativo densità + </text> + <text name="WLDistanceMultText"> + Fattore moltiplicativo distanza + </text> + <text name="MaxAltText"> + Altitudine massima + </text> + </panel> + <panel label="ILLUMINAZIONE" name="Lighting"> + <text name="SLCText"> + Colore sole/luna + </text> + <text name="WLAmbientText"> + Ambiente + </text> + <text name="SunGlowText"> + Bagliore sole + </text> + <slider label="Centro focale" name="WLGlowB"/> + <slider label="Dimensioni" name="WLGlowR"/> + <text name="WLStarText"> + Luminosità cielo + </text> + <text name="SceneGammaText"> + Gamma scena + </text> + <text name="TODText"> + Posizione sole/luna + </text> + <multi_slider initial_value="0" name="WLSunPos"/> + <text name="WL12amHash"> + | + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL12amHash2"> + | + </text> + <text name="WL12am"> + 00:00 + </text> + <text name="WL6am"> + 06:00:00 + </text> + <text name="WL12pmHash"> + 12:00:00 + </text> + <text name="WL6pm"> + 18:00:00 + </text> + <text name="WL12am2"> + 00:00 + </text> + <time name="WLDayTime" value="06:00:00"/> + <text name="WLEastAngleText"> + Angolo est + </text> + </panel> + <panel label="NUVOLE" name="Clouds"> + <text name="WLCloudColorText"> + Colore nuvole + </text> + <text name="WLCloudColorText2"> + XY/Densità nuvole + </text> + <slider label="X" name="WLCloudX"/> + <slider label="Y" name="WLCloudY"/> + <slider label="D" name="WLCloudDensity"/> + <text name="WLCloudCoverageText"> + Copertura nuvole + </text> + <text name="WLCloudScaleText"> + Scala nuvole + </text> + <text name="WLCloudDetailText"> + Dettaglio nuvole (XY/Densità) + </text> + <slider label="X" name="WLCloudDetailX"/> + <slider label="Y" name="WLCloudDetailY"/> + <slider label="D" name="WLCloudDetailDensity"/> + <text name="WLCloudScrollXText"> + Scorrimento nuvole X + </text> + <check_box label="Blocca" name="WLCloudLockX"/> + <text name="WLCloudScrollYText"> + Scorrimento nuvole Y + </text> + <check_box label="Blocca" name="WLCloudLockY"/> + </panel> + </tab_container> + <check_box label="Usa questo valore predefinito come nuova impostazione per il cielo" name="make_default_cb"/> + <button label="Salva" name="save"/> + <button label="Annulla" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml new file mode 100644 index 0000000000..7bffc60ba2 --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Water Preset" title="Modifica un valore predefinito acqua"> + <string name="title_new"> + Crea un nuovo valore predefinito per l'acqua + </string> + <string name="title_edit"> + Modifica un valore predefinito per l'acqua + </string> + <string name="hint_new"> + Dai un nome al valore predefinito, modifica i controlli per crearlo e fai clic su "Salva". + </string> + <string name="hint_edit"> + Per modificare il valore predefinito per l'acqua, modifica i controlli e fai clic su "Salva". + </string> + <string name="combo_label"> + -Seleziona un valore predefinito- + </string> + <text name="hint"> + Per modificare i valori predefiniti, modifica i controlli e quindi fai clic su "Salva" + </text> + <text name="label"> + Nome predefinito: + </text> + <text name="note"> + Nota: se cambi il nome del valore predefinito, in realtà ne crei uno nuovo e quello esistente non viene cambiato. + </text> + <panel name="panel_water_preset"> + <text name="water_color_label"> + Colore nebbia acqua + </text> + <text name="water_fog_density_label"> + Esponente densità nebbia + </text> + <text name="underwater_fog_modifier_label"> + Modificatore nebbia sott'acqua + </text> + <text name="BHText"> + Direzione onda grande + </text> + <slider label="X" name="WaterWave1DirX"/> + <slider label="Y" name="WaterWave1DirY"/> + <text name="BDensText"> + Scala wavelet riflesso + </text> + <text name="HDText"> + Scala Fresnel + </text> + <text name="FresnelOffsetText"> + Spostamento Fresnel + </text> + <text name="BHText2"> + Direzione onda piccola + </text> + <slider label="X" name="WaterWave2DirX"/> + <slider label="Y" name="WaterWave2DirY"/> + <text name="DensMultText"> + Scala wavelet sopra + </text> + <text name="WaterScaleBelowText"> + Scala wavelet sotto + </text> + <text name="MaxAltText"> + Fattore moltiplicativo blu + </text> + <text name="BHText3"> + Mappa normale + </text> + </panel> + <check_box label="Usa questo valore predefinito come nuova impostazione per l'acqua" name="make_default_cb"/> + <button label="Salva" name="save"/> + <button label="Annulla" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml new file mode 100644 index 0000000000..f191078fad --- /dev/null +++ b/indra/newview/skins/default/xui/it/floater_environment_settings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Environment Editor Floater" title="IMPOSTAZIONI AMBIENTE"> + <text name="note"> + Usa le opzioni seguenti per personalizzare le impostazioni dell'ambiente per il tuo viewer. + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Usa impostazioni regione" name="use_region_settings"/> + <radio_item label="Personalizza il mio ambiente" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="note"> + Nota: gli altri utenti non vedranno le tue impostazioni personalizzate. + </text> + <text name="water_settings_title"> + Impostazione Acqua + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Ciclo giornata / cielo + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Cielo fisso" name="my_sky_settings"/> + <radio_item label="Ciclo giornata" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> + </combo_box> + </panel> + <button label="OK" name="ok_btn"/> + <button label="Annulla" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml index a17b8b36c2..69245f0755 100644 --- a/indra/newview/skins/default/xui/it/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml @@ -3,6 +3,9 @@ <string name="status_idle"> Pausa </string> + <string name="status_parse_error"> + Problema nell'elaborazione DAE - vedi il registro per informazioni al riguardo. + </string> <string name="status_reading_file"> Caricamento in corso... </string> @@ -12,6 +15,9 @@ <string name="status_vertex_number_overflow"> Errore: numero di vertici maggiore di 65534, annullato. </string> + <string name="bad_element"> + Errore: elemento non valido + </string> <string name="high"> Alto </string> diff --git a/indra/newview/skins/default/xui/it/floater_model_wizard.xml b/indra/newview/skins/default/xui/it/floater_model_wizard.xml index b17f731089..67ba452ce5 100644 --- a/indra/newview/skins/default/xui/it/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/it/floater_model_wizard.xml @@ -193,6 +193,9 @@ <string name="status_idle"> Pausa </string> + <string name="status_parse_error"> + Problema nell'elaborazione DAE - vedi il registro per informazioni al riguardo. + </string> <string name="status_reading_file"> Caricamento in corso... </string> @@ -202,6 +205,9 @@ <string name="status_vertex_number_overflow"> Errore: numero di vertici maggiore di 65534, annullato. </string> + <string name="bad_element"> + Errore: elemento non valido + </string> <string name="high"> Alto </string> diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index 23e01a3943..f7c83c9e0f 100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml @@ -412,7 +412,7 @@ </combo_box> <spinner label="Gravità" name="Physics Gravity"/> <spinner label="Frizione" name="Physics Friction"/> - <spinner label="Densità" name="Physics Density"/> + <spinner label="Densità in 100 kg/m^3" name="Physics Density"/> <spinner label="Restituzione" name="Physics Restitution"/> </panel> <panel label="Texture" name="Texture"> diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml index bdf7d2094f..fe8bf703aa 100644 --- a/indra/newview/skins/default/xui/it/menu_login.xml +++ b/indra/newview/skins/default/xui/it/menu_login.xml @@ -17,7 +17,7 @@ <menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/> <menu_item_call label="Mostra messaggio critico" name="Critical"/> <menu_item_call label="Test browser multimedia" name="Web Browser Test"/> - <menu_item_call label="Test finestra contenuti Web" name="Web Content Floater Test"/> + <menu_item_call label="Test debug finestra contenuti Web" name="Web Content Floater Debug Test"/> <menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/> <menu_item_call label="Mostra Console notifiche" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml index aae2313702..2b5c235706 100644 --- a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_group_plus"> +<toggleable_menu name="menu_group_plus"> <menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/> <menu_item_check label="Ordina in base al nome" name="sort_name"/> <menu_item_check label="Ordina in base alla distanza" name="sort_distance"/> <menu_item_check label="Icone persone" name="view_icons"/> + <menu_item_check label="Visualizza mappa" name="view_map"/> <menu_item_call label="Mostra oggetti e residenti bloccati" name="show_blocked_list"/> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index e4df0630d9..daeda576cc 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -31,6 +31,7 @@ <menu_item_call label="I miei gruppi" name="My Groups"/> <menu_item_check label="Chat nei dintorni" name="Nearby Chat"/> <menu_item_call label="Persone vicine" name="Active Speakers"/> + <menu_item_check label="Voce nei dintorni" name="Nearby Voice"/> </menu> <menu label="Mondo" name="World"> <menu_item_check label="Mini mappa" name="Mini-Map"/> @@ -63,8 +64,24 @@ <menu_item_call label="Mezzogiorno" name="Noon"/> <menu_item_call label="Tramonto" name="Sunset"/> <menu_item_call label="Mezzanotte" name="Midnight"/> - <menu_item_call label="Orario della proprietà" name="Revert to Region Default"/> - <menu_item_call label="Editor dell'ambiente" name="Environment Editor"/> + </menu> + <menu label="Editor ambiente" name="Enviroment Editor"> + <menu_item_call label="Impostazioni ambiente..." name="Enviroment Settings"/> + <menu label="Valori predefiniti acqua" name="Water Presets"> + <menu_item_call label="Nuovo valore predefinito..." name="new_water_preset"/> + <menu_item_call label="Modifica valori predefiniti..." name="edit_water_preset"/> + <menu_item_call label="Cancella valore predefinito..." name="delete_water_preset"/> + </menu> + <menu label="Valori predefiniti cielo" name="Sky Presets"> + <menu_item_call label="Nuovo valore predefinito..." name="new_sky_preset"/> + <menu_item_call label="Modifica valori predefiniti..." name="edit_sky_preset"/> + <menu_item_call label="Cancella valore predefinito..." name="delete_sky_preset"/> + </menu> + <menu label="Valori predefiniti giornata" name="Day Presets"> + <menu_item_call label="Nuovo valore predefinito..." name="new_day_preset"/> + <menu_item_call label="Modifica valori predefiniti..." name="edit_day_preset"/> + <menu_item_call label="Cancella valore predefinito..." name="delete_day_preset"/> + </menu> </menu> </menu> <menu label="Costruisci" name="BuildTools"> diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml index 7c8eef64e5..de25f88aca 100644 --- a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> +<toggleable_menu name="Gear Wearing"> <menu_item_call label="Modifica vestiario" name="edit"/> <menu_item_call label="Togli" name="takeoff"/> -</menu> + <menu_item_call label="Copia gruppo vestiti negli Appunti" name="copy"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index f50051c004..2d5c8e3522 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -1555,6 +1555,11 @@ Riprova più tardi. <button name="Cancel" text="Annulla"/> </form> </notification> + <notification name="TooManyTeleportOffers"> + Hai cercato di fare [OFFERS] offerte di teleport, +più del limite [LIMIT]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="OfferTeleportFromGod"> Chiedere, in qualità di Admin, al residente di raggiungerti? <form name="form"> @@ -1977,6 +1982,10 @@ Desideri abbandonare la modalità 'Occupato' prima di completare quest Vuoi veramente eliminare la cronologia viaggi, web e ricerche fatte? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> + <notification name="ConfirmClearCache"> + Sei sicuro di volere cancellare la cache del viewer? + <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> + </notification> <notification name="ConfirmClearCookies"> Confermi di volere cancellare i tuoi cookie? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="Si"/> @@ -2002,48 +2011,30 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica Vuoi sovrascrivere le preimpostazioni salvate? <usetemplate name="okcancelbuttons" notext="No" yestext="Si"/> </notification> - <notification name="WLDeletePresetAlert"> - Vuoi cancellare [SKY]? - <usetemplate name="okcancelbuttons" notext="No" yestext="Si"/> - </notification> <notification name="WLNoEditDefault"> Non puoi modificare o cancellare una preimpostazione di fabbrica. </notification> <notification name="WLMissingSky"> Questo file di ciclo giornaliero fa riferimento ad un file di cielo mancante: [SKY]. </notification> - <notification name="PPSaveEffectAlert"> - Effetto di post elaborazione già presente. Vuoi sovrascrivere? - <usetemplate name="okcancelbuttons" notext="No" yestext="Si"/> - </notification> - <notification name="NewSkyPreset"> - Fornisci il nome per il nuovo cielo. - <form name="form"> - <input name="message"> - Nuova preimpostazione - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Annulla"/> - </form> + <notification name="WLRegionApplyFail"> + Queste impostazioni non possono essere applicare alla regione. Uscendo dalla regione e ritornandoci potrebbe risolvere il problema. Il motivo fornito: [FAIL_REASON] </notification> - <notification name="ExistsSkyPresetAlert"> - La preimpostazione esiste già! + <notification name="EnvCannotDeleteLastDayCycleKey"> + Impossibile cancellare l'ultima chiave in questo ciclo giornata. Il ciclo giornata non può essere vuoto. Invece di cancellare la chiave restante, modificala e quindi creane una nuova. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="NewWaterPreset"> - Fornisci il nome per la nuova preregolazione del livello dell'acqua. - <form name="form"> - <input name="message"> - Nuova preimpostazione - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Annulla"/> - </form> + <notification name="DayCycleTooManyKeyframes"> + Non puoi aggiungere altri frame chiave a questo ciclo giornata. Il numero massimo di frame chiave per i cicli giornata nell'ambito [SCOPE] è [MAX]. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="ExistsWaterPresetAlert"> - La preimpostazione esiste già! + <notification name="EnvUpdateRate"> + Puoi aggiornare le impostazioni dell'ambiente della regione ogni [WAIT] secondi. Attendi e riprova. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="WaterNoEditDefault"> - Non puoi modificare o cancellare una preimpostazione. + <notification name="PPSaveEffectAlert"> + Effetto di post elaborazione già presente. Vuoi sovrascrivere? + <usetemplate name="okcancelbuttons" notext="No" yestext="Si"/> </notification> <notification name="ChatterBoxSessionStartError"> Impossibile iniziare una nuova sessione di chat con [RECIPIENT]. @@ -2334,6 +2325,9 @@ Qui non puoi volare. <notification name="NoBuild"> In questa zona è proibita la costruzione. Qui non puoi costruire né rezzare oggetti. </notification> + <notification name="SeeAvatars"> + In questo lotto non si possono vedere avatar e chat di testo presenti in altri lotti. Non puoi vedere altri residenti fuori dal lotto e loro non possono vederti. Viene bloccata anche la normale chat di testo sul canale 0. + </notification> <notification name="ScriptsStopped"> Un amministratore ha temporaneamente disabilitato gli script in questa regione. </notification> @@ -2758,7 +2752,9 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente. Scegli i residenti con i quali condividere. </notification> <notification name="MeshUploadError"> - [LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + [LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER] + +Per informazioni dettagliate, vedi il file del registro. </notification> <notification name="ShareItemsConfirmation"> Sei sicuro di volere condividere gli oggetti diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml index e5194e95d7..d0c275e29f 100644 --- a/indra/newview/skins/default/xui/it/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/it/panel_outfits_list.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Outfits"> + <accordion name="outfits_accordion"> + <no_matched_tabs_text name="no_matched_outfits_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/all/[SEARCH_TERM] Cerca]."/> + <no_visible_tabs_text name="no_outfits_msg" value="Non hai ancora vestiario da indossare. Prova [secondlife:///app/search/all Cerca]."/> + </accordion> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/> + <menu_button name="options_gear_btn" tool_tip="Mostra ulteriori opzioni"/> <button name="trash_btn" tool_tip="Elimina il vestiario selezionato"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml index c4ffe6af85..890dfc2458 100644 --- a/indra/newview/skins/default/xui/it/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml @@ -64,6 +64,8 @@ <text name="scripts_value" value="Attivo"/> <text name="damage_label" value="Danni:"/> <text name="damage_value" value="Disattivato"/> + <text name="see_avatars_label" value="Vedi avatar:"/> + <text name="see_avatars_value" value="Disattiva"/> <button label="Informazioni sui terreni" name="about_land_btn"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml index b628a29206..224780f234 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml @@ -3,6 +3,19 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <text name="Cache:"> + Cache: + </text> + <spinner label="Dimensione cache (64 - 9984 MB)" name="cachesizespinner"/> + <text name="text_box5"> + MB + </text> + <button label="Pulizia della cache" label_selected="Pulizia della cache" name="clear_cache"/> + <text name="Cache location"> + Ubicazione della cache: + </text> + <button label="Sfoglia" label_selected="Sfoglia" name="set_cache"/> + <button label="Posizione predefinita" label_selected="Posizione predefinita" name="default_cache_location"/> <text name="UI Size:"> Dimensioni UI: </text> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index bbfae5e9e8..d00512aaf7 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml @@ -19,6 +19,7 @@ <check_box label="Abilitato" name="enable_voice_check"/> <check_box label="Consenti riproduzione multimediale automatica" name="media_auto_play_btn" tool_tip="Seleziona qui per consentire la riproduzione multimediale automatica" value="true"/> <check_box label="Riproduci media in uso da altri avatar" name="media_show_on_others_btn" tool_tip="Deseleziona qui per nascondere i media in uso dagli altri avatar nei dintorni" value="true"/> + <check_box label="Riproduci suoni dai gesti" name="gesture_audio_play_btn" tool_tip="Seleziona per ascoltare i suoni dai gesti" value="true"/> <text name="voice_chat_settings"> Impostazioni Chat vocale </text> @@ -35,28 +36,5 @@ <button label="Imposta tasto" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="Reimposta sul pulsante centrale del mouse"/> <button label="Dispositivi di Input/Output" name="device_settings_btn" width="165"/> - <panel label="Impostazioni del dispositivo" name="device_settings_panel"> - <panel.string name="default_text"> - Predefinito - </panel.string> - <panel.string name="default system device"> - Dispositivo di sistema predefinito - </panel.string> - <panel.string name="no device"> - Nessun dispositivo - </panel.string> - <text name="Input"> - Input - </text> - <text name="My volume label"> - Il mio volume: - </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Cambia il volume utilizzando questa barra"/> - <text name="wait_text"> - Attendi - </text> - <text name="Output"> - Output - </text> - </panel> + <panel label="Impostazioni del dispositivo" name="device_settings_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml new file mode 100644 index 0000000000..81bc8253f4 --- /dev/null +++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Ambiente" name="panel_env_info"> + <text name="water_settings_title"> + Seleziona le impostazioni del ciclo dell'acqua e del cielo/giornata che vuoi che vedano tutti coloro che visitano la tua regione. Maggiori informazioni + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Usa valori predefiniti di Second Life" name="use_sl_default_settings"/> + <radio_item label="Usa le impostazioni seguenti" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="water_settings_title"> + Impostazione Acqua + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Ciclo cielo / giornata + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Cielo fisso" name="my_sky_settings"/> + <radio_item label="Ciclo giornata" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Seleziona un valore predefinito-" name="item0"/> + </combo_box> + </panel> + <button label="Applica" name="apply_btn"/> + <button label="Annulla" name="cancel_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml index 92044bae11..c61ac3ecce 100644 --- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml @@ -7,21 +7,56 @@ sconosciuto </text> <spinner label="Altezza dell'acqua" name="water_height_spin"/> - <button label="?" name="water_height_help"/> - <spinner label="Limite di altezza del terreno" name="terrain_raise_spin"/> - <button label="?" name="terrain_raise_help"/> - <spinner label="Limite di abbassamento del terreno" name="terrain_lower_spin" bottom_delta="-34"/> - <button label="?" name="terrain_lower_help"/> - <check_box label="Usa il sole della regione" name="use_estate_sun_check"/> - <button label="?" name="use_estate_sun_help"/> - <check_box label="Sole fisso" name="fixed_sun_check"/> - <button label="?" name="fixed_sun_help"/> - <slider label="Fase" name="sun_hour_slider"/> - <button label="Applica" name="apply_btn"/> + <spinner label="Limite di altezza del +terreno" name="terrain_raise_spin"/> + <spinner bottom_delta="-34" label="Limite di abbassamento +del terreno" name="terrain_lower_spin"/> + <text name="detail_texture_text"> + Texture terreno (richiede file 512x512, 24 bit .tga) + </text> + <text name="height_text_lbl"> + 1 (basso) + </text> + <text name="height_text_lbl2"> + 2 + </text> + <text name="height_text_lbl3"> + 3 + </text> + <text name="height_text_lbl4"> + 4 (Alto) + </text> + <text name="height_text_lbl5"> + Intervalli altitudine texture + </text> + <text name="height_text_lbl10"> + Questi valori indicano la gamma di miscele per le texture di cui sopra. + </text> + <text name="height_text_lbl11"> + Misurato in metri, il valore BASSO è la MASSIMA altezza della texture n. 1, e il valore ALTO è l'altezza MINIMA della texture n. 4. + </text> + <text name="height_text_lbl6"> + Nordovest + </text> + <text name="height_text_lbl7"> + Nordest + </text> + <spinner label="Basso" name="height_start_spin_1"/> + <spinner label="Basso" name="height_start_spin_3"/> + <spinner label="Alto" name="height_range_spin_1"/> + <spinner label="Alto" name="height_range_spin_3"/> + <text name="height_text_lbl8"> + Sudovest + </text> + <text name="height_text_lbl9"> + Sudest + </text> + <spinner label="Basso" name="height_start_spin_0"/> + <spinner label="Basso" name="height_start_spin_2"/> + <spinner label="Alto" name="height_range_spin_0"/> + <spinner label="Alto" name="height_range_spin_2"/> <button label="Scarica terreno RAW..." name="download_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/> - <button label="?" name="download_raw_help"/> <button label="Carica terreno RAW..." name="upload_raw_btn" tool_tip="Disponibile solo per i proprietari del terreno, non per i manager"/> - <button label="?" name="upload_raw_help"/> - <button width="170" label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento"/> - <button left="190" label="?" name="bake_terrain_help"/> + <button label="Trasforma il terreno" name="bake_terrain_btn" tool_tip="Imposta il terreno corrente come punto medio per i limiti di innalzamento/abbassamento" width="170"/> + <button label="Applica" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml index 1c1744d94b..72ca2f6d68 100644 --- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml @@ -1,6 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Cose" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + Elementi ricevuti ([NUM]) + </string> + <string name="InboxLabelNoArg"> + Elementi ricevuti + </string> + <button label="Elementi ricevuti" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] nuovi + </text> + <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <text name="inbox_inventory_placeholder"> + Gli acquisti dal mercato verranno consegnati qui. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel name="outbox_layout_panel"> + <panel label="" name="marketplace_outbox"> + <button label="Casella uscita commercianti" name="outbox_btn"/> + <button label="" name="outbox_sync_btn" tool_tip="Sposta al mercato"/> + <panel tool_tip="Drag and drop items here to prepare them for sale on your storefront"> + <text name="outbox_inventory_placeholder"> + Imposta il tuo account commercianti per usare questa funzione. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 6af515d82d..4bcb4dd88f 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -1177,6 +1177,12 @@ Prova ad accedere nuovamente tra un minuto. <string name="InventoryNoTexture"> Non hai una copia di questa texture nel tuo inventario </string> + <string name="InventoryInboxNoItems"> + Gli elementi acquistati attraverso il mercato verranno consegnati qui + </string> + <string name="InventoryOutboxNoItems"> + Trascina gli elementi qui per poi elencarli nel tuo mercato. + </string> <string name="no_transfer" value="(nessun trasferimento)"/> <string name="no_modify" value="(nessuna modifica)"/> <string name="no_copy" value="(nessuna copia)"/> @@ -1301,6 +1307,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="InvFolder All"> Tutto </string> + <string name="no_attachments"> + Nessun allegato indossato + </string> <string name="Buy"> Acquista </string> @@ -1636,6 +1645,9 @@ Prova ad accedere nuovamente tra un minuto. <string name="IMTeen"> teen </string> + <string name="Anyone"> + chiunque + </string> <string name="RegionInfoError"> errore </string> @@ -1852,6 +1864,12 @@ Prova ad accedere nuovamente tra un minuto. <string name="Public"> Pubblica </string> + <string name="LocalSettings"> + Impostazioni locali + </string> + <string name="RegionSettings"> + Impostazioni regione + </string> <string name="ClassifiedClicksTxt"> Clicca: [TELEPORT] teleport, [MAP] mappa, [PROFILE] profilo </string> @@ -3640,6 +3658,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE]. <string name="LocationCtrlGeneralIconTooltip"> Regione generale </string> + <string name="LocationCtrlSeeAVsTooltip"> + Avatar visibili e chat consentita fuori di questo lotto + </string> <string name="UpdaterWindowTitle"> Aggiornamento [APP_NAME] </string> diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml index 2f578862d3..e870a8ace9 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -133,12 +133,12 @@ 誤 </text> <button label="土地の購入" label_selected="土地を購入..." left="130" name="Buy Land..." width="100"/> + <button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/> <button label="スクリプト情報" name="Scripts..." width="100"/> <button label="グループに購入" label_selected="グループ用に購入..." name="Buy For Group..."/> <button label="入場許可を購入" label_selected="入場許可を購入..." left="130" name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="100"/> <button label="土地の放棄" label_selected="土地を放棄..." name="Abandon Land..."/> <button label="土地を取り戻す" label_selected="土地の返還を要求..." name="Reclaim Land..."/> - <button label="リンデンセール" label_selected="Linden セール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/> </panel> <panel label="約款" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -310,6 +310,9 @@ <panel.string name="push_restrict_region_text"> プッシュ禁止 （地域設定優先） </panel.string> + <panel.string name="see_avs_text"> + この区画にいる住人と会ってチャットする + </panel.string> <text name="allow_label"> 他の住人への許可： </text> @@ -372,6 +375,10 @@ スナップショット： </text> <texture_picker label="" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/> + <text name="allow_label5"> + 他の区画にいる住人への許可： + </text> + <check_box label="アバターを表示" name="SeeAvatarsCheck" tool_tip="他の区画の住人が、この区画にいる住人に会ってチャットすることを許可し、あなたもそれら住人に会ってチャットできるようにします。"/> <text name="landing_point"> 着地点: [LANDING] </text> @@ -428,6 +435,11 @@ サウンド： </text> <check_box label="ジェスチャーとオブジェクトの音をこの区画だけに限定する" name="check sound local"/> + <text name="Avatar Sounds:"> + アバターのサウンド： + </text> + <check_box label="全員" name="all av sound check"/> + <check_box label="グループ" name="group av sound check"/> <text name="Voice settings:"> ボイス： </text> diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml new file mode 100644 index 0000000000..eb39d1b336 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Env Preset" title="環境の事前設定を削除"> + <string name="title_water"> + 水の事前設定を削除 + </string> + <string name="title_sky"> + 空の事前設定を削除 + </string> + <string name="title_day_cycle"> + デイサイクルを削除 + </string> + <string name="label_water"> + 事前設定： + </string> + <string name="label_sky"> + 事前設定： + </string> + <string name="label_day_cycle"> + デイサイクル： + </string> + <string name="msg_confirm_deletion"> + 選択された事前設定を削除しますか？ + </string> + <string name="msg_sky_is_referenced"> + デイサイクルの参照先として使われている事前設定は削除できません。 + </string> + <string name="combo_label"> + - 事前設定を選択 - + </string> + <text name="label"> + 事前設定： + </text> + <button label="削除" name="delete"/> + <button label="取り消し" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..fd601672b6 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Day cycle" title="デイサイクルを編集"> + <string name="title_new"> + 新たなデイサイクルを作成 + </string> + <string name="title_edit"> + デイサイクルを編集 + </string> + <string name="hint_new"> + 新しいデイサイクルに名前をつけ、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="hint_edit"> + 自分で作成したデイサイクルを編集するには、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="combo_label"> + - 事前設定を選択 - + </string> + <text name="label"> + 事前設定の名前： + </text> + <text name="note"> + 注意：自分で作成した事前設定の名前を変更すると、新しい事前設定が別に作成されるだけで、元の事前設定は変更されません。 + </text> + <text name="hint_item1"> + - 特定の空の設定や時間を編集するにはタブを1つクリックします。 + </text> + <text name="hint_item2"> + - 移行時間を設定するにはタブをクリックしてドラッグします。 + </text> + <text name="hint_item3"> + - デイサイクルをプレビューするにはスクラバーを使います。 + </text> + <panel name="day_cycle_slider_panel"> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleKeys"/> + <button label="キーの追加" label_selected="キーの追加" name="WLAddKey"/> + <button label="キーの削除" label_selected="キーの削除" name="WLDeleteKey"/> + <text name="WL12am"> + 12am + </text> + <text name="WL3am"> + 3am + </text> + <text name="WL6am"> + 6am + </text> + <text name="WL9amHash"> + 9am + </text> + <text name="WL12pmHash"> + 12pm + </text> + <text name="WL3pm"> + 3pm + </text> + <text name="WL6pm"> + 6pm + </text> + <text name="WL9pm"> + 9pm + </text> + <text name="WL12am2"> + 12am + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + </panel> + <text name="WLCurKeyPresetText"> + 空の設定： + </text> + <combo_box label="事前設定" name="WLSkyPresets"/> + <text name="WLCurKeyTimeText"> + 時間： + </text> + <time name="time" value="6:00 AM"/> + <check_box label="これを新しいデイサイクルにする" name="make_default_cb"/> + <button label="保存" name="save"/> + <button label="取り消し" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..68d0c70baa --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Sky Preset" title="空の事前設定を編集"> + <string name="title_new"> + 新しい空の事前設定を作成 + </string> + <string name="title_edit"> + 空の事前設定を編集 + </string> + <string name="hint_new"> + 新しい事前設定に名前をつけ、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="hint_edit"> + 空の事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="combo_label"> + - 事前設定を選択 - + </string> + <text name="hint"> + 事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。 + </text> + <text name="label"> + 事前設定の名前： + </text> + <text name="note"> + 注意：自分で作成した事前設定の名前を変更すると、新しい事前設定が別に作成されるだけで、元の事前設定は変更されません。 + </text> + <tab_container name="WindLight Tabs"> + <panel label="大気" name="Atmosphere"> + <text name="BHText"> + 空の配色 + </text> + <text name="BDensText"> + 空と遠景の露光 + </text> + <text name="BDensText2"> + 空の配色と濃度 + </text> + <text name="HDText"> + 大気の不透明度 + </text> + <text name="DensMultText"> + 大気の不透明度の増幅 + </text> + <text name="WLDistanceMultText"> + 視界の増幅 + </text> + <text name="MaxAltText"> + 最大高度 + </text> + </panel> + <panel label="ライティング" name="Lighting"> + <text name="SLCText"> + 太陽/月の色 + </text> + <text name="WLAmbientText"> + 風 + </text> + <text name="SunGlowText"> + 太陽の輝き + </text> + <slider label="焦点" name="WLGlowB"/> + <slider label="サイズ" name="WLGlowR"/> + <text name="WLStarText"> + 星の輝き + </text> + <text name="SceneGammaText"> + 風景ガンマ + </text> + <text name="TODText"> + 太陽/月の位置 + </text> + <multi_slider initial_value="0" name="WLSunPos"/> + <text name="WL12amHash"> + | + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL12amHash2"> + | + </text> + <text name="WL12am"> + 12am + </text> + <text name="WL6am"> + 6am + </text> + <text name="WL12pmHash"> + 12pm + </text> + <text name="WL6pm"> + 6pm + </text> + <text name="WL12am2"> + 12am + </text> + <time name="WLDayTime" value="6:00 AM"/> + <text name="WLEastAngleText"> + 東の角度 + </text> + </panel> + <panel label="雲" name="Clouds"> + <text name="WLCloudColorText"> + 雲の色 + </text> + <text name="WLCloudColorText2"> + 雲のXY/密度 + </text> + <slider label="X" name="WLCloudX"/> + <slider label="Y" name="WLCloudY"/> + <slider label="D" name="WLCloudDensity"/> + <text name="WLCloudCoverageText"> + 雲の量 + </text> + <text name="WLCloudScaleText"> + 雲のスケール + </text> + <text name="WLCloudDetailText"> + 雲の詳細（XY/密度） + </text> + <slider label="X" name="WLCloudDetailX"/> + <slider label="Y" name="WLCloudDetailY"/> + <slider label="D" name="WLCloudDetailDensity"/> + <text name="WLCloudScrollXText"> + 雲の移動速度（X方向） + </text> + <check_box label="ロック" name="WLCloudLockX"/> + <text name="WLCloudScrollYText"> + 雲の移動速度（Y 方向） + </text> + <check_box label="ロック" name="WLCloudLockY"/> + </panel> + </tab_container> + <check_box label="この事前設定を新しい空の設定にする" name="make_default_cb"/> + <button label="保存" name="save"/> + <button label="取り消し" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml new file mode 100644 index 0000000000..eddfbd4298 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Water Preset" title="水の事前設定を編集"> + <string name="title_new"> + 新しい水の事前設定を作成 + </string> + <string name="title_edit"> + 水の事前設定を編集 + </string> + <string name="hint_new"> + 新しい事前設定に名前をつけ、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="hint_edit"> + 水の事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。 + </string> + <string name="combo_label"> + - 事前設定を選択 - + </string> + <text name="hint"> + 事前設定を編集するには、希望の設定に調節して、「保存」をクリックします。 + </text> + <text name="label"> + 事前設定の名前： + </text> + <text name="note"> + 注意：自分で作成した事前設定の名前を変更すると、新しい事前設定が別に作成されるだけで、元の事前設定は変更されません。 + </text> + <panel name="panel_water_preset"> + <text name="water_color_label"> + 水中のフォグ効果の色 + </text> + <text name="water_fog_density_label"> + 水中の透明度指数 + </text> + <text name="underwater_fog_modifier_label"> + 水中のフォグ効果加減 + </text> + <text name="BHText"> + 大波の方向 + </text> + <slider label="X" name="WaterWave1DirX"/> + <slider label="Y" name="WaterWave1DirY"/> + <text name="BDensText"> + さざ波の反射スケール + </text> + <text name="HDText"> + フレネル・スケール + </text> + <text name="FresnelOffsetText"> + フレネル・オフセット + </text> + <text name="BHText2"> + 小波の方向 + </text> + <slider label="X" name="WaterWave2DirX"/> + <slider label="Y" name="WaterWave2DirY"/> + <text name="DensMultText"> + 水面の屈折スケール + </text> + <text name="WaterScaleBelowText"> + 水中の屈折スケール + </text> + <text name="MaxAltText"> + 不透明度の増幅 + </text> + <text name="BHText3"> + ノーマル・マップ + </text> + </panel> + <check_box label="この事前設定を新しい水の設定にする" name="make_default_cb"/> + <button label="保存" name="save"/> + <button label="取り消し" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml new file mode 100644 index 0000000000..0e3803119f --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Environment Editor Floater" title="自然環境の設定"> + <text name="note"> + ビューワの自然環境の設定は以下のオプションを使ってカスタマイズできます。 + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="リージョンの設定を使用" name="use_region_settings"/> + <radio_item label="自然環境をカスタマイズ" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="note"> + 注意：カスタム設定は他のユーザーには見えません。 + </text> + <text name="water_settings_title"> + 水の設定 + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="- 事前設定を選択 -" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + 空 / デイサイクル + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="空の固定" name="my_sky_settings"/> + <radio_item label="デイサイクル" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="- 事前設定を選択 -" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="- 事前設定を選択 -" name="item0"/> + </combo_box> + </panel> + <button label="OK" name="ok_btn"/> + <button label="取り消し" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml index 5eb141a28c..d0580b752c 100644 --- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml @@ -3,6 +3,9 @@ <string name="status_idle"> 待機状態 </string> + <string name="status_parse_error"> + Dae に問題が見つかりました - 詳細についてはログをご参照ください。 + </string> <string name="status_reading_file"> ローディング... </string> @@ -12,6 +15,9 @@ <string name="status_vertex_number_overflow"> エラー：頂点の数が65534を超過したので中止されました。 </string> + <string name="bad_element"> + エラー：要素が無効です + </string> <string name="high"> 高 </string> diff --git a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml index a785172f20..249d9f22b9 100644 --- a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml @@ -193,6 +193,9 @@ <string name="status_idle"> 待機状態 </string> + <string name="status_parse_error"> + Dae に問題が見つかりました - 詳細についてはログをご参照ください。 + </string> <string name="status_reading_file"> ローディング... </string> @@ -202,6 +205,9 @@ <string name="status_vertex_number_overflow"> エラー：頂点の数が65534を超過したので中止されました。 </string> + <string name="bad_element"> + エラー：要素が無効です + </string> <string name="high"> 高 </string> diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index f7d77d351e..0cb5c2d8bb 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -75,7 +75,7 @@ </text> <check_box initial_value="true" label="テクスチャを引き延ばす" name="checkbox stretch textures"/> <check_box initial_value="true" label="グリッドにスナップ" name="checkbox snap to grid"/> - <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" > + <combo_box name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します"> <combo_box.item label="インワールドグリッド" name="World"/> <combo_box.item label="ローカルグリッド" name="Local"/> <combo_box.item label="リファレンスグリッド" name="Reference"/> @@ -137,7 +137,7 @@ <text name="object_cost" tool_tip="[prims] / [physics complexity] として現在選択されているオブジェクトのコスト"> 料金： [COST] / [PHYSICS] </text> - <tab_container name="Object Info Tabs" > + <tab_container name="Object Info Tabs"> <panel label="一般" name="General"> <panel.string name="text deed continued"> 譲渡 @@ -379,22 +379,22 @@ オブジェクトの特徴を編集： </text> <check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軸を中心にオブジェクトの屈曲を有効にします（クライアント側のみ）"/> - <spinner label="柔軟性" name="FlexNumSections" /> - <spinner label="重力" name="FlexGravity" /> - <spinner label="ドラッグ" name="FlexFriction" /> - <spinner label="風" name="FlexWind" /> - <spinner label="緊張" name="FlexTension" /> - <spinner label="X 軸方向の力" name="FlexForceX" /> - <spinner label="Y 軸方向の力" name="FlexForceY" /> - <spinner label="Z 軸方向の力" name="FlexForceZ" /> + <spinner label="柔軟性" name="FlexNumSections"/> + <spinner label="重力" name="FlexGravity"/> + <spinner label="ドラッグ" name="FlexFriction"/> + <spinner label="風" name="FlexWind"/> + <spinner label="緊張" name="FlexTension"/> + <spinner label="X 軸方向の力" name="FlexForceX"/> + <spinner label="Y 軸方向の力" name="FlexForceY"/> + <spinner label="Z 軸方向の力" name="FlexForceZ"/> <check_box label="光" name="Light Checkbox Ctrl" tool_tip="オブジェクトが発光します"/> <color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/> <texture_picker label="" name="light texture control" tool_tip="クリックで投影画を選択します（遅延レンダリング有効時のみ）"/> - <spinner label="輝度" name="Light Intensity" /> + <spinner label="輝度" name="Light Intensity"/> <spinner label="FOV" name="Light FOV"/> - <spinner label="半径" name="Light Radius" /> + <spinner label="半径" name="Light Radius"/> <spinner label="焦点" name="Light Focus"/> - <spinner label="弱まる" name="Light Falloff" /> + <spinner label="弱まる" name="Light Falloff"/> <spinner label="環境" name="Light Ambiance"/> <text name="label physicsshapetype"> 実像の種類： @@ -411,7 +411,7 @@ </combo_box> <spinner label="重力" name="Physics Gravity"/> <spinner label="摩擦" name="Physics Friction"/> - <spinner label="密度" name="Physics Density"/> + <spinner label="密度（100 kg/m^3）" name="Physics Density"/> <spinner label="復元" name="Physics Restitution"/> </panel> <panel label="材質" name="Texture"> @@ -496,18 +496,18 @@ </panel> </panel> <panel label="中身" name="Contents"> - <button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script" /> - <button label="権限" name="button permissions" /> + <button label="新しいスクリプト" label_selected="新規スクリプト" name="button new script"/> + <button label="権限" name="button permissions"/> </panel> </tab_container> <panel name="land info panel"> <text name="label_parcel_info"> 区画情報 </text> - <text name="label_area_price" > + <text name="label_area_price"> 価格： [AREA] 平方メートル L$ [PRICE] </text> - <text name="label_area" > + <text name="label_area"> 面積： [AREA] 平方メートル </text> <button label="土地情報" label_selected="土地情報" name="button about land"/> diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml index 265f3ebcd0..dca872e9b8 100644 --- a/indra/newview/skins/default/xui/ja/menu_login.xml +++ b/indra/newview/skins/default/xui/ja/menu_login.xml @@ -18,7 +18,7 @@ <menu_item_call label="利用規約を表示" name="TOS"/> <menu_item_call label="クリティカルメッセージを表示" name="Critical"/> <menu_item_call label="メディアブラウザのテスト" name="Web Browser Test"/> - <menu_item_call label="Web コンテンツフローターのテスト" name="Web Content Floater Test"/> + <menu_item_call label="Web コンテンツフローターのデバッグテスト" name="Web Content Floater Debug Test"/> <menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/> <menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml index a31480158a..44c5438509 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_group_plus"> +<toggleable_menu name="menu_group_plus"> <menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/> <menu_item_check label="名前で並べ替え" name="sort_name"/> <menu_item_check label="距離で並べ替え" name="sort_distance"/> <menu_item_check label="人のアイコン表示" name="view_icons"/> + <menu_item_check label="地図を表示" name="view_map"/> <menu_item_call label="ブロックされた住人とオブジェクトを表示" name="show_blocked_list"/> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index ec9db02522..09b315b026 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -31,6 +31,7 @@ <menu_item_call label="所属グループ" name="My Groups"/> <menu_item_check label="近くのチャット" name="Nearby Chat"/> <menu_item_call label="近くにいる人" name="Active Speakers"/> + <menu_item_check label="近くのボイス" name="Nearby Voice"/> </menu> <menu label="世界" name="World"> <menu_item_check label="ミニマップ" name="Mini-Map"/> @@ -63,8 +64,24 @@ <menu_item_call label="正午" name="Noon"/> <menu_item_call label="日没" name="Sunset"/> <menu_item_call label="深夜" name="Midnight"/> - <menu_item_call label="エステートタイム" name="Revert to Region Default"/> - <menu_item_call label="自然環境エディター" name="Environment Editor"/> + </menu> + <menu label="自然環境エディター" name="Enviroment Editor"> + <menu_item_call label="環境の設定..." name="Enviroment Settings"/> + <menu label="水の事前設定" name="Water Presets"> + <menu_item_call label="新しい事前設定..." name="new_water_preset"/> + <menu_item_call label="事前設定を編集..." name="edit_water_preset"/> + <menu_item_call label="事前設定を削除..." name="delete_water_preset"/> + </menu> + <menu label="空の事前設定" name="Sky Presets"> + <menu_item_call label="新しい事前設定..." name="new_sky_preset"/> + <menu_item_call label="事前設定を編集..." name="edit_sky_preset"/> + <menu_item_call label="事前設定を削除..." name="delete_sky_preset"/> + </menu> + <menu label="デイの事前設定" name="Day Presets"> + <menu_item_call label="新しい事前設定..." name="new_day_preset"/> + <menu_item_call label="事前設定を編集..." name="edit_day_preset"/> + <menu_item_call label="事前設定を削除..." name="delete_day_preset"/> + </menu> </menu> </menu> <menu label="制作" name="BuildTools"> diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml index 7a97538117..5334042dc9 100644 --- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> +<toggleable_menu name="Gear Wearing"> <menu_item_call label="アウトフットの編集" name="edit"/> <menu_item_call label="取り外す" name="takeoff"/> -</menu> + <menu_item_call label="アウトフィットのリストをクリップボードにコピー" name="copy"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index d63ca84035..a471e4941d 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -1590,6 +1590,11 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ <button name="Cancel" text="取り消し"/> </form> </notification> + <notification name="TooManyTeleportOffers"> + [OFFERS] 回にわたってテレポートを送ろうとしましたが、 +それは限度数 [LIMIT] を超えています。 + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="OfferTeleportFromGod"> 現在地に住人をゴッドサモンしますか？ <form name="form"> @@ -2018,6 +2023,10 @@ Linden Lab トラベル、Web、検索の履歴をすべて削除しますか？ <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/> </notification> + <notification name="ConfirmClearCache"> + ビューワのキャッシュをクリアしますか？ + <usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/> + </notification> <notification name="ConfirmClearCookies"> 本当にクッキーをクリアしますか？ <usetemplate name="okcancelbuttons" notext="キャンセル" yestext="はい"/> @@ -2043,48 +2052,30 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ 保存された事前設定を上書きしますか？ <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> - <notification name="WLDeletePresetAlert"> - 「 [SKY] 」を削除しますか？ - <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> - </notification> <notification name="WLNoEditDefault"> デフォルトの設定を編集したり削除したりすることはできません。 </notification> <notification name="WLMissingSky"> このデイサイクルのファイルは次の存在しない「空」ファイルを参照しています： [SKY]。 </notification> - <notification name="PPSaveEffectAlert"> - ポストプロセス効果が存在します。 上書きしますか？ - <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> - </notification> - <notification name="NewSkyPreset"> - 新しい空の名前を指定してください。 - <form name="form"> - <input name="message"> - 新しい事前設定 - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="キャンセル"/> - </form> + <notification name="WLRegionApplyFail"> + 申し訳ございませんが、設定をリージョンに適用できませんでした。一度リージョンを出てから戻ると、問題が解決されるかもしれません。問題の発生した理由：[FAIL_REASON] </notification> - <notification name="ExistsSkyPresetAlert"> - 事前設定がすでに存在します！ + <notification name="EnvCannotDeleteLastDayCycleKey"> + デイサイクルを空にはできないので、このデイサイクルの最後のキーを削除することはできません。最後のキーを削除して新しいキーを作成するのではなく、最後のキーを変更してください。 + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="NewWaterPreset"> - 新しい水の事前設定の名前を指定してください。 - <form name="form"> - <input name="message"> - 新しい事前設定 - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="キャンセル"/> - </form> + <notification name="DayCycleTooManyKeyframes"> + このデイサイクルにはこれ以上キーフレームを追加できません。[SCOPE] の範囲のデイサイクルに追加できるキーフレーム数は最高 [MAX] です。 + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="ExistsWaterPresetAlert"> - 事前設定がすでに存在します！ + <notification name="EnvUpdateRate"> + リージョンの自然環境の設定は [WAIT] 秒ごとにしか更新できません。その間隔を置いてからもう一度お試しください。 + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="WaterNoEditDefault"> - デフォルトの設定を編集したり削除したりすることはできません。 + <notification name="PPSaveEffectAlert"> + ポストプロセス効果が存在します。 上書きしますか？ + <usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/> </notification> <notification name="ChatterBoxSessionStartError"> [RECIPIENT] と新しいチャットを開始することができません。 @@ -2378,6 +2369,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ <notification name="NoBuild"> このエリアでは制作が禁止されています。 オブジェクトを制作したり Rez することはできません。 </notification> + <notification name="SeeAvatars"> + この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル 0 での通常の文字チャットもブロックされます。 + </notification> <notification name="ScriptsStopped"> 管理者がこのリージョンのスクリプトを一時停止しました。 </notification> @@ -2802,7 +2796,9 @@ M キーを押して変更します。 共有する住人を選択します。 </notification> <notification name="MeshUploadError"> - [LABEL] をアップロードできませんでした： [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + [LABEL] をアップロードできませんでした：[MESSAGE] [IDENTIFIER] + +詳細についてはログをご覧ください。 </notification> <notification name="ShareItemsConfirmation"> 次のアイテムを共有しますか？ diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml index e9e36e4842..df9ef40113 100644 --- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Outfits"> + <accordion name="outfits_accordion"> + <no_matched_tabs_text name="no_matched_outfits_msg" value="お探しのものは見つかりましたか？[secondlife:///app/search/all/[SEARCH_TERM] 検索] をお試しください。"/> + <no_visible_tabs_text name="no_outfits_msg" value="アウトフィットがまだありません。[secondlife:///app/search/all 検索] をお試しください。"/> + </accordion> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="オプションを表示します"/> + <menu_button name="options_gear_btn" tool_tip="オプションを表示します"/> <button name="trash_btn" tool_tip="選択したアウトフィットを削除する"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml index 8a40d7aa5a..7235bc0f18 100644 --- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml @@ -68,6 +68,8 @@ <text name="scripts_value" value="オン"/> <text name="damage_label" value="ダメージ："/> <text name="damage_value" value="オフ"/> + <text name="see_avatars_label" value="アバターを表示："/> + <text name="see_avatars_value" value="オフ"/> <button label="土地情報" name="about_land_btn"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml index ccc5c3908b..dcaa23fee5 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml @@ -3,6 +3,19 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <text name="Cache:"> + キャッシュ： + </text> + <spinner label="キャッシュサイズ（64～9,984MB）" name="cachesizespinner"/> + <text name="text_box5"> + MB + </text> + <button label="キャッシュをクリア" label_selected="キャッシュをクリア" name="clear_cache"/> + <text name="Cache location"> + キャッシュの保存場所： + </text> + <button label="参照" label_selected="参照" name="set_cache"/> + <button label="デフォルトの場所" label_selected="デフォルトの場所" name="default_cache_location"/> <text name="UI Size:"> UI サイズ： </text> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml index c11e636875..3a4c360ccc 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml @@ -19,6 +19,7 @@ <check_box label="有効" name="enable_voice_check"/> <check_box label="メディアを自動再生する" name="media_auto_play_btn" tool_tip="ここにチェックを入れてメディアの自動再生を許可します" value="true"/> <check_box label="他のアバターに取り付けられたメディアを再生する" name="media_show_on_others_btn" tool_tip="このチェックを外すと、近くにいる他のアバターに取り付けられたメディアを非表示にします" value="true"/> + <check_box label="ジェスチャーの音を再生" name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を聞くにはこれを選択" value="true"/> <text name="voice_chat_settings"> ボイスチャットの設定 </text> @@ -35,28 +36,5 @@ <button label="キー設定" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="マウスの中央ボタンにリセット"/> <button label="入力・出力機器" name="device_settings_btn"/> - <panel label="機器の設定" name="device_settings_panel"> - <panel.string name="default_text"> - デフォルト - </panel.string> - <panel.string name="default system device"> - デフォルトのシステム機器 - </panel.string> - <panel.string name="no device"> - 機器が設定されていません - </panel.string> - <text name="Input"> - 入力 - </text> - <text name="My volume label"> - 私の音量： - </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使って音量を調節します"/> - <text name="wait_text"> - しばらくお待ちください。 - </text> - <text name="Output"> - 出力 - </text> - </panel> + <panel label="機器の設定" name="device_settings_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml new file mode 100644 index 0000000000..f6ef3f0934 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="環境" name="panel_env_info"> + <text name="water_settings_title"> + あなたのリージョンを訪れるユーザーに見せたい、水と空/デイサイクルの設定を選択します。詳細 + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Second Life のデフォルト設定を使用" name="use_sl_default_settings"/> + <radio_item label="次の設定を使用" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="water_settings_title"> + 水の設定 + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="- 事前設定を選択 -" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + 空 / デイサイクル + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="空の固定" name="my_sky_settings"/> + <radio_item label="デイサイクル" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="- 事前設定を選択 -" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="- 事前設定を選択 -" name="item0"/> + </combo_box> + </panel> + <button label="適用" name="apply_btn"/> + <button label="取り消し" name="cancel_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index 8df803b2dc..fb853c1925 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="地形" name="Terrain"> <text name="region_text_lbl"> 地域： @@ -6,25 +6,55 @@ <text name="region_text"> 未知 </text> - <spinner label="水面の高さ" name="water_height_spin" /> - <button label="?" name="water_height_help" /> - <spinner label="地形の上昇限度" name="terrain_raise_spin" /> - <button label="?" name="terrain_raise_help" /> - <spinner label="地形の下降限度" name="terrain_lower_spin" /> - <button label="?" name="terrain_lower_help" /> - <check_box label="不動産太陽使用" name="use_estate_sun_check" /> - <button label="?" name="use_estate_sun_help" /> - <check_box label="太陽固定" name="fixed_sun_check" /> - <button label="?" name="fixed_sun_help" /> - <slider label="段階" name="sun_hour_slider" /> - <button label="適用" name="apply_btn" /> - <button label="RAW 地形ダウンロード..." name="download_raw_btn" - tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" /> - <button label="?" name="download_raw_help" /> - <button label="RAW 地形アップロード..." name="upload_raw_btn" - tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です" /> - <button label="?" name="upload_raw_help" /> - <button label="地形の構築" name="bake_terrain_btn" - tool_tip="現在の地形を上昇・下降範囲の中間点として設定します" /> - <button label="?" name="bake_terrain_help" /> + <spinner label="水面の高さ" name="water_height_spin"/> + <spinner label="地形の上昇限度" name="terrain_raise_spin"/> + <spinner label="地形の下降限度" name="terrain_lower_spin"/> + <text name="detail_texture_text"> + 地形テクスチャ（512x512 の 24 bit .tga ファイル） + </text> + <text name="height_text_lbl"> + 1（低） + </text> + <text name="height_text_lbl2"> + 2 + </text> + <text name="height_text_lbl3"> + 3 + </text> + <text name="height_text_lbl4"> + 4（高） + </text> + <text name="height_text_lbl5"> + 地形の隆起範囲 + </text> + <text name="height_text_lbl10"> + 数値は上のテクスチャのブレンド範囲を示します。 + </text> + <text name="height_text_lbl11"> + 計測単位はメートルで、「低」の値は、1番のテクスチャの高さの「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。 + </text> + <text name="height_text_lbl6"> + 北西 + </text> + <text name="height_text_lbl7"> + 北東 + </text> + <spinner label="低" name="height_start_spin_1"/> + <spinner label="低" name="height_start_spin_3"/> + <spinner label="高" name="height_range_spin_1"/> + <spinner label="高" name="height_range_spin_3"/> + <text name="height_text_lbl8"> + 南西 + </text> + <text name="height_text_lbl9"> + 南東 + </text> + <spinner label="低" name="height_start_spin_0"/> + <spinner label="低" name="height_start_spin_2"/> + <spinner label="高" name="height_range_spin_0"/> + <spinner label="高" name="height_range_spin_2"/> + <button label="RAW 地形ダウンロード..." name="download_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/> + <button label="RAW 地形アップロード..." name="upload_raw_btn" tool_tip="不動産オーナーのみ利用可能、管理者は利用不可です"/> + <button label="地形の構築" name="bake_terrain_btn" tool_tip="現在の地形を上昇・下降範囲の中間点として設定します"/> + <button label="適用" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml index e26d8717d1..7edda6e1a3 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml @@ -1,6 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="もの" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + 受け取った商品（[NUM]） + </string> + <string name="InboxLabelNoArg"> + 受け取った商品 + </string> + <button label="受け取った商品" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] 新登場 + </text> + <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <text name="inbox_inventory_placeholder"> + マーケットプレイスから購入した商品はここに配達されます。 + </text> + </panel> + </panel> + </layout_panel> + <layout_panel name="outbox_layout_panel"> + <panel label="" name="marketplace_outbox"> + <button label="マーチャントのアウトボックス" name="outbox_btn"/> + <button label="" name="outbox_sync_btn" tool_tip="自分のマーケットプレイス店頭に移動"/> + <panel tool_tip="Drag and drop items here to prepare them for sale on your storefront"> + <text name="outbox_inventory_placeholder"> + この機能を使用するには、マーチャントアカウントをセットアップしてください。 + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index fa6d25d238..cb4fb80a55 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1192,6 +1192,12 @@ support@secondlife.com にお問い合わせください。 <string name="InventoryNoTexture"> 「持ち物」内にこのテクスチャのコピーがありません </string> + <string name="InventoryInboxNoItems"> + マーケットプレイスで購入した商品はここに配達されます。 + </string> + <string name="InventoryOutboxNoItems"> + マーケットプレイス店頭に掲載するための準備として、ここに商品をドラッグします。 + </string> <string name="no_transfer" value=" （再販・プレゼント不可）"/> <string name="no_modify" value=" （編集不可）"/> <string name="no_copy" value=" （コピー不可）"/> @@ -1322,6 +1328,9 @@ support@secondlife.com にお問い合わせください。 <string name="InvFolder All"> 全員 </string> + <string name="no_attachments"> + 着用しているアタッチメントはありません + </string> <string name="Buy"> 買う </string> @@ -1657,6 +1666,9 @@ support@secondlife.com にお問い合わせください。 <string name="IMTeen"> ティーン </string> + <string name="Anyone"> + 全員 + </string> <string name="RegionInfoError"> エラー </string> @@ -1879,6 +1891,12 @@ support@secondlife.com にお問い合わせください。 <string name="Public"> パブリック </string> + <string name="LocalSettings"> + ローカル設定 + </string> + <string name="RegionSettings"> + リージョン（地域）の設定 + </string> <string name="ClassifiedClicksTxt"> クリック数： [TELEPORT] テレポート、 [MAP] 地図、 [PROFILE] プロフィール </string> @@ -3724,6 +3742,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="LocationCtrlGeneralIconTooltip"> General リージョン </string> + <string name="LocationCtrlSeeAVsTooltip"> + この区画外にアバターを見えるようにして、チャットも許可 + </string> <string name="UpdaterWindowTitle"> [APP_NAME] アップデート </string> diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index e48cac7d1f..514c7382f8 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -133,12 +133,12 @@ Vá para o menu Mundo > Sobre o terreno ou selecione outro lote para mostrar 0 </text> <button label="Comprar terreno..." label_selected="Comprar terreno..." left="130" name="Buy Land..." width="125"/> + <button label="Venda Linden" name="Linden Sale..." tool_tip="O terreno precisa ser possuído, estar com o conteúdo configurado e não estar pronto para leilão."/> <button label="Dados do script" name="Scripts..."/> <button label="Comprar para o grupo" name="Buy For Group..."/> <button label="Comprar passe..." label_selected="Comprar passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a este terreno." width="125"/> <button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..."/> <button label="Pedir terreno" name="Reclaim Land..."/> - <button label="Venda Linden" name="Linden Sale..." tool_tip="O terreno precisa ser possuído, estar com o conteúdo configurado e não estar pronto para leilão."/> </panel> <panel label="CONTRATO" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -308,6 +308,9 @@ Apenas lotes maiores podem ser listados na busca. <panel.string name="push_restrict_region_text"> Proibido empurrar (regulamento da região) </panel.string> + <panel.string name="see_avs_text"> + Veja e bata papo com os residentes deste terreno + </panel.string> <text name="allow_label"> Autorizar outros residentes a: </text> @@ -370,6 +373,10 @@ Apenas lotes maiores podem ser listados na busca. Foto: </text> <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/> + <text name="allow_label5"> + Permitir que residentes de outros terrenos: + </text> + <check_box label="Ver avatares" name="SeeAvatarsCheck" tool_tip="Permite que residentes de outros terrenos vejam e conversem com os residentes deste terreno e vice-versa."/> <text name="landing_point"> Ponto de Aterrissagem: [LANDING] </text> @@ -429,6 +436,11 @@ Mídia: Som: </text> <check_box label="Limitar sons de gestos e objetos a esta parcela" name="check sound local"/> + <text name="Avatar Sounds:"> + Áudio de avatares: + </text> + <check_box label="Todos" name="all av sound check"/> + <check_box label="Grupo" name="group av sound check"/> <text name="Voice settings:"> Voz: </text> diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml new file mode 100644 index 0000000000..a8b5d8f67d --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<floater name="Delete Env Preset" title="EXCLUIR CONF AMBIENTE"> + <string name="title_water"> + Excluir pré-configuração da água + </string> + <string name="title_sky"> + Excluir pré-configuração de céu + </string> + <string name="title_day_cycle"> + Excluir pré-configuração dos dias + </string> + <string name="label_water"> + Pré-configuração: + </string> + <string name="label_sky"> + Pré-configuração: + </string> + <string name="label_day_cycle"> + Ciclo dia: + </string> + <string name="msg_confirm_deletion"> + Tem certeza de que quer excluir esta pré-configuração? + </string> + <string name="msg_sky_is_referenced"> + Impossível excluir pré-configuração utilizada por um ou mais ciclos de dia . + </string> + <string name="combo_label"> + -Selecione uma pré-configuração- + </string> + <text name="label"> + Pré-configuração: + </text> + <button label="Excluir" name="delete"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml new file mode 100644 index 0000000000..9e25938986 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Day cycle" title="Editar ciclo dos dias"> + <string name="title_new"> + Criar novo ciclo de dias + </string> + <string name="title_edit"> + Editar ciclo dos dias + </string> + <string name="hint_new"> + Dê um nome ao seu ciclo dos dias, ajuste os controles para criá-lo e clique em "Salvar". + </string> + <string name="hint_edit"> + Para editar sua configuração do dia, ajuste os controles e clique em "Salvar". + </string> + <string name="combo_label"> + -Selecione uma pré-configuração- + </string> + <text name="label"> + Nome: + </text> + <text name="note"> + Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a uma pré-configuração atual. + </text> + <text name="hint_item1"> + - Clique em uma guia para editar as configurações e horário de um céu. + </text> + <text name="hint_item2"> + - Clique e arraste as guias para definir as transições. + </text> + <text name="hint_item3"> + - Use a seta para rever o ciclo dos dias. + </text> + <panel name="day_cycle_slider_panel"> + <multi_slider initial_value="0" name="WLTimeSlider"/> + <multi_slider initial_value="0" name="WLDayCycleKeys"/> + <button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/> + <button label="Excluir chave" label_selected="Excluir chave" name="WLDeleteKey"/> + <text name="WL12am"> + 24:00 + </text> + <text name="WL3am"> + 03:00 + </text> + <text name="WL6am"> + 06:00 + </text> + <text name="WL9amHash"> + 09:00 + </text> + <text name="WL12pmHash"> + 12:00 + </text> + <text name="WL3pm"> + 15:00 + </text> + <text name="WL6pm"> + 18:00 + </text> + <text name="WL9pm"> + 21:00 + </text> + <text name="WL12am2"> + 24:00 + </text> + <text name="WL12amHash"> + | + </text> + <text name="WL3amHash"> + I + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL9amHash2"> + I + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL3pmHash"> + I + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL9pmHash"> + I + </text> + <text name="WL12amHash2"> + | + </text> + </panel> + <text name="WLCurKeyPresetText"> + Configuração do céu: + </text> + <combo_box label="Pré-configuração" name="WLSkyPresets"/> + <text name="WLCurKeyTimeText"> + Hora: + </text> + <time name="time" value="06:00"/> + <check_box label="Usar como novo ciclo de dias" name="make_default_cb"/> + <button label="Salvar" name="save"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml new file mode 100644 index 0000000000..1f1fbcce7e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Sky Preset" title="Editar pré-configuração do céu"> + <string name="title_new"> + Criar nova pré-configuração de céu + </string> + <string name="title_edit"> + Editar pré-configuração do céu + </string> + <string name="hint_new"> + Dê um nome à sua pré-configuração, ajuste os controles para criá-la e clique em "Salvar". + </string> + <string name="hint_edit"> + Para editar sua pré-configuração do céu, ajuste os controles e clique em "Salvar". + </string> + <string name="combo_label"> + -Selecione uma pré-configuração- + </string> + <text name="hint"> + Para editar sua pré-configuração do céu, ajuste os controles e clique em "Salvar". + </text> + <text name="label"> + Nome: + </text> + <text name="note"> + Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a pré-configuração atual. + </text> + <tab_container name="WindLight Tabs"> + <panel label="ATMOSFERA" name="Atmosphere"> + <text name="BHText"> + Horizonte azul + </text> + <text name="BDensText"> + Horizonte com névoa + </text> + <text name="BDensText2"> + Densidade azul + </text> + <text name="HDText"> + Densidade da névoa + </text> + <text name="DensMultText"> + Multiplicador de densidade + </text> + <text name="WLDistanceMultText"> + Multiplicador de distância + </text> + <text name="MaxAltText"> + Altitude máxima + </text> + </panel> + <panel label="ILUMINAÇÃO" name="Lighting"> + <text name="SLCText"> + Cor do sol/lua + </text> + <text name="WLAmbientText"> + Ambiente + </text> + <text name="SunGlowText"> + Brilho do sol + </text> + <slider label="Foco" name="WLGlowB"/> + <slider label="Tamanho" name="WLGlowR"/> + <text name="WLStarText"> + Brilho das estrelas + </text> + <text name="SceneGammaText"> + Raios gama + </text> + <text name="TODText"> + Posição do sol/lua + </text> + <multi_slider initial_value="0" name="WLSunPos"/> + <text name="WL12amHash"> + | + </text> + <text name="WL6amHash"> + | + </text> + <text name="WL12pmHash2"> + | + </text> + <text name="WL6pmHash"> + | + </text> + <text name="WL12amHash2"> + | + </text> + <text name="WL12am"> + 24:00 + </text> + <text name="WL6am"> + 06:00 + </text> + <text name="WL12pmHash"> + 12:00 + </text> + <text name="WL6pm"> + 18:00 + </text> + <text name="WL12am2"> + 24:00 + </text> + <time name="WLDayTime" value="06:00"/> + <text name="WLEastAngleText"> + Ângulo leste + </text> + </panel> + <panel label="NUVENS" name="Clouds"> + <text name="WLCloudColorText"> + Cor das nuvens + </text> + <text name="WLCloudColorText2"> + XY / densidade das nuvens + </text> + <slider label="X" name="WLCloudX"/> + <slider label="Y" name="WLCloudY"/> + <slider label="D" name="WLCloudDensity"/> + <text name="WLCloudCoverageText"> + Cobertura das nuvens + </text> + <text name="WLCloudScaleText"> + Escala das nuvens + </text> + <text name="WLCloudDetailText"> + Detalhe das nuvens (XY / densidade) + </text> + <slider label="X" name="WLCloudDetailX"/> + <slider label="Y" name="WLCloudDetailY"/> + <slider label="D" name="WLCloudDetailDensity"/> + <text name="WLCloudScrollXText"> + Passagem das nuvens X + </text> + <check_box label="Fixar" name="WLCloudLockX"/> + <text name="WLCloudScrollYText"> + Passagem das nuvens Y + </text> + <check_box label="Fixar" name="WLCloudLockY"/> + </panel> + </tab_container> + <check_box label="Usar esta pré-configuração como meu novo céu" name="make_default_cb"/> + <button label="Salvar" name="save"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml new file mode 100644 index 0000000000..7bde22851e --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Edit Water Preset" title="Editar pré-configuração da água"> + <string name="title_new"> + Criar nova pré-configuração de água + </string> + <string name="title_edit"> + Editar pré-configuração da água + </string> + <string name="hint_new"> + Dê um nome à sua pré-configuração, ajuste os controles para criá-la e clique em "Salvar". + </string> + <string name="hint_edit"> + Para editar sua pré-configuração de água, ajuste os controles e clique em "Salvar". + </string> + <string name="combo_label"> + -Selecione uma pré-configuração- + </string> + <text name="hint"> + Para editar sua pré-configuração, ajuste os controles e clique em "Salvar". + </text> + <text name="label"> + Nome da pré-configuração: + </text> + <text name="note"> + Observação: trocar o nome de uma pré-configuração criará uma nova sem modificar a configuração atual. + </text> + <panel name="panel_water_preset"> + <text name="water_color_label"> + Cor da névoa da água + </text> + <text name="water_fog_density_label"> + Expoente da densidade da névoa + </text> + <text name="underwater_fog_modifier_label"> + Modificador de névoa submerso + </text> + <text name="BHText"> + Direção de onda grande + </text> + <slider label="X" name="WaterWave1DirX"/> + <slider label="Y" name="WaterWave1DirY"/> + <text name="BDensText"> + Escala de ondas de reflexo + </text> + <text name="HDText"> + Escala de Fresnel + </text> + <text name="FresnelOffsetText"> + Recuo de Fresnel + </text> + <text name="BHText2"> + Direção de onda pequena + </text> + <slider label="X" name="WaterWave2DirX"/> + <slider label="Y" name="WaterWave2DirY"/> + <text name="DensMultText"> + Escala de refração acima + </text> + <text name="WaterScaleBelowText"> + Escala de refração abaixo + </text> + <text name="MaxAltText"> + Multiplicador de distorção + </text> + <text name="BHText3"> + Mapa normal + </text> + </panel> + <check_box label="Usar esta pré-configuração na minha água" name="make_default_cb"/> + <button label="Salvar" name="save"/> + <button label="Cancelar" name="cancel"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml new file mode 100644 index 0000000000..4055ba97ef --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Environment Editor Floater" title="AMBIENTE"> + <text name="note"> + Use as opções abaixo para personalizar as configurações de ambiente no visualizador. + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Usar configurações da região" name="use_region_settings"/> + <radio_item label="Personalizar meu ambiente" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="note"> + Observação: suas configurações não se aplicam aos outros usuários. + </text> + <text name="water_settings_title"> + Configuração de água + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Selecione uma pré-configuração-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Ciclo céu / dia + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Céu fixo" name="my_sky_settings"/> + <radio_item label="Ciclo dia" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Selecione uma pré-configuração-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Selecione uma pré-configuração-" name="item0"/> + </combo_box> + </panel> + <button label="OK" name="ok_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml index cdad55bded..fbd88500a8 100644 --- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml @@ -3,6 +3,9 @@ <string name="status_idle"> Inativo </string> + <string name="status_parse_error"> + Dae parsing - erro, detalhes no log. + </string> <string name="status_reading_file"> Carregando... </string> @@ -12,6 +15,9 @@ <string name="status_vertex_number_overflow"> Erro: Número de Vertex acima de 65534. Abortado. </string> + <string name="bad_element"> + Erro: elemento inválido + </string> <string name="high"> Alto </string> diff --git a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml index 1064e16e83..e8d5fcdc05 100644 --- a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml @@ -193,6 +193,9 @@ <string name="status_idle"> Inativo </string> + <string name="status_parse_error"> + Dae parsing - erro, detalhes no log. + </string> <string name="status_reading_file"> Carregando... </string> @@ -202,6 +205,9 @@ <string name="status_vertex_number_overflow"> Erro: Número de Vertex acima de 65534. Abortado. </string> + <string name="bad_element"> + Erro: elemento inválido + </string> <string name="high"> Alto </string> diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index ed273d9f28..35d9a0ffab 100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml @@ -405,7 +405,7 @@ </combo_box> <spinner label="Gravidade" name="Physics Gravity"/> <spinner label="Fricção" name="Physics Friction"/> - <spinner label="Densidade" name="Physics Density"/> + <spinner label="Densidade em 100 kg/m^3" name="Physics Density"/> <spinner label="Restituição" name="Physics Restitution"/> </panel> <panel label="Textura" name="Texture"> diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index 3dff3d7c8a..1d3fa48fb3 100644 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml @@ -17,7 +17,7 @@ <menu_item_call label="Mostrar TOS" name="TOS"/> <menu_item_call label="Mostrar mensagem crítica" name="Critical"/> <menu_item_call label="Teste de mídia do navegador" name="Web Browser Test"/> - <menu_item_call label="Teste de conteúdo web" name="Web Content Floater Test"/> + <menu_item_call label="Test de Bugs de Conteúdo Web" name="Web Content Floater Debug Test"/> <menu_item_check label="Exibir seletor da grade" name="Show Grid Picker"/> <menu_item_call label="Exibir painel de notificações" name="Show Notifications Console"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml index 228ce46a31..0d32d58de4 100644 --- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="menu_group_plus"> +<toggleable_menu name="menu_group_plus"> <menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/> <menu_item_check label="Ordenar por nome" name="sort_name"/> <menu_item_check label="Ordenar por distância" name="sort_distance"/> <menu_item_check label="Ver ícones de pessoas" name="view_icons"/> + <menu_item_check label="Ver Mapa" name="view_map"/> <menu_item_call label="Ver residentes e objetos bloqueados" name="show_blocked_list"/> -</menu> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 4213db7440..c184fb0af3 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -31,6 +31,7 @@ <menu_item_call label="Meus grupos" name="My Groups"/> <menu_item_check label="Bate-papo local" name="Nearby Chat"/> <menu_item_call label="Pessoas por perto" name="Active Speakers"/> + <menu_item_check label="Voz por perto" name="Nearby Voice"/> </menu> <menu label="Mundo" name="World"> <menu_item_check label="Mini Mapa" name="Mini-Map"/> @@ -63,8 +64,24 @@ <menu_item_call label="Meio-dia" name="Noon"/> <menu_item_call label="Pôr-do-Sol" name="Sunset"/> <menu_item_call label="Meia-noite" name="Midnight"/> - <menu_item_call label="Horário da propriedade" name="Revert to Region Default"/> - <menu_item_call label="Editor de ambiente" name="Environment Editor"/> + </menu> + <menu label="Editor de ambientes" name="Enviroment Editor"> + <menu_item_call label="Configurações de ambiente..." name="Enviroment Settings"/> + <menu label="Pré-configurações de água" name="Water Presets"> + <menu_item_call label="Nova pré-configuração..." name="new_water_preset"/> + <menu_item_call label="Editar pré-configuração..." name="edit_water_preset"/> + <menu_item_call label="Excluir pré-configuração..." name="delete_water_preset"/> + </menu> + <menu label="Pré-configurações de céu" name="Sky Presets"> + <menu_item_call label="Nova pré-configuração..." name="new_sky_preset"/> + <menu_item_call label="Editar pré-configuração..." name="edit_sky_preset"/> + <menu_item_call label="Excluir pré-configuração..." name="delete_sky_preset"/> + </menu> + <menu label="Pré-configurações de dias" name="Day Presets"> + <menu_item_call label="Nova pré-configuração..." name="new_day_preset"/> + <menu_item_call label="Editar pré-configuração..." name="edit_day_preset"/> + <menu_item_call label="Excluir pré-configuração..." name="delete_day_preset"/> + </menu> </menu> </menu> <menu label="Construir" name="BuildTools"> diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml index 7b6ce4d87e..75dca703cb 100644 --- a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml +++ b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<menu name="Gear Wearing"> +<toggleable_menu name="Gear Wearing"> <menu_item_call label="Editar look" name="edit"/> <menu_item_call label="Tirar" name="takeoff"/> -</menu> + <menu_item_call label="Copiar lista do look para a área de transferência" name="copy"/> +</toggleable_menu> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 56a33f51e8..ffdaf8a26f 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1541,6 +1541,10 @@ Por favor volte mais tarde. <button name="Cancel" text="Cancelar"/> </form> </notification> + <notification name="TooManyTeleportOffers"> + Você fez [OFFERS] ofertas de teletransporte, porém o seu limite é [LIMIT]. + <usetemplate name="okbutton" yestext="OK"/> + </notification> <notification name="OfferTeleportFromGod"> Convocar residente à sua localização com poderes de deus? <form name="form"> @@ -1962,6 +1966,10 @@ Você gostaria de deixar o modo Ocupado antes de completar esta transação? Tem certeza de que quer apagar todo o histórico de viagens, web e buscas? <usetemplate name="okcancelbuttons" notext="Não" yestext="OK"/> </notification> + <notification name="ConfirmClearCache"> + Tem certeza que deseja apagar o cache do visualizador? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> + </notification> <notification name="ConfirmClearCookies"> Você tem certeza de que deseja limpar os cookies? <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/> @@ -1987,48 +1995,30 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de Você deseja substituir a pré-configuração salva? <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> - <notification name="WLDeletePresetAlert"> - Você deseja apagar [SKY]? - <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> - </notification> <notification name="WLNoEditDefault"> Você não pode editar ou excluir um padrão predefinido. </notification> <notification name="WLMissingSky"> Este arquivo de ciclo de dia se refere a um arquivo de céu faltando: [SKY]. </notification> - <notification name="PPSaveEffectAlert"> - Existe efeito de Pós-Processamento. Você deseja substituí-lo? - <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> - </notification> - <notification name="NewSkyPreset"> - Me dê o nome para o novo céu. - <form name="form"> - <input name="message"> - Novo padrão - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Cancelar"/> - </form> + <notification name="WLRegionApplyFail"> + As configurações não podem ser aplicadas à região. Talvez sair e votlar à região resolva. Motivo: [FAIL_REASON] </notification> - <notification name="ExistsSkyPresetAlert"> - Este padrão já existe! + <notification name="EnvCannotDeleteLastDayCycleKey"> + Impossível excluir a última chave do ciclo pois um ciclo não pode ficar vazio. Modifique a última chave em vez de tentar apagá-la, depois crie uma chave nova. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="NewWaterPreset"> - Dê o nome para o novo padrão de água. - <form name="form"> - <input name="message"> - Nova Apresentação - </input> - <button name="OK" text="OK"/> - <button name="Cancel" text="Cancelar"/> - </form> + <notification name="DayCycleTooManyKeyframes"> + Não é possível adicionar mais chaves de quadro a este ciclo. O máximo de chaves de quadro para ciclos de dia de [SCOPE] é [MAX]. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="ExistsWaterPresetAlert"> - Este padrão já existe! + <notification name="EnvUpdateRate"> + Cada configuração de ambiente só pode ser atualizada a cada [WAIT] segundos. Aguarde pelo menos isso e tente novamente. + <usetemplate name="okbutton" yestext="OK"/> </notification> - <notification name="WaterNoEditDefault"> - Você não pode editar ou apagar um padrão predefinido. + <notification name="PPSaveEffectAlert"> + Existe efeito de Pós-Processamento. Você deseja substituí-lo? + <usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/> </notification> <notification name="ChatterBoxSessionStartError"> Não foi possível iniciar uma nova sessão bate-papo com [RECIPIENT]. @@ -2316,6 +2306,9 @@ Logo, não é possível voar aqui. <notification name="NoBuild"> Esta área desativou a opção de construir. Não é possível construir ou fazer rez de objetos nesta área. </notification> + <notification name="SeeAvatars"> + Este terreno oculta os avatares e bate-papo de outro terreno. Não é possível ver residentes fora do terreno e vice-versa. O bate-papo por texto no canal 0 também está bloqueado. + </notification> <notification name="ScriptsStopped"> Um administrador não permitiu scripts temporariamente nesta região. </notification> @@ -2740,7 +2733,9 @@ O botão será exibido quando houver espaço suficente. Selecione os residentes com quem compartilhar. </notification> <notification name="MeshUploadError"> - [LABEL] não foi carregado: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER] + [LABEL] não foi carregado: [MESSAGE] [IDENTIFIER] + +Mais detalhes no log. </notification> <notification name="ShareItemsConfirmation"> Tem certeza de que quer compartilhar os itens abaixo? diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml index 2b2e7c1dbf..2d74e092a4 100644 --- a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml +++ b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Outfits"> + <accordion name="outfits_accordion"> + <no_matched_tabs_text name="no_matched_outfits_msg" value="Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/people/[SEARCH_TERM] Busca]."/> + <no_visible_tabs_text name="no_outfits_msg" value="Você ainda não tem nenhum look. Tente encontrar um na [secondlife:///app/search/groups Busca]."/> + </accordion> <panel name="bottom_panel"> - <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> + <menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/> <button name="trash_btn" tool_tip="Excluir o look selecionado"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml index 7fc07483c0..8abe579702 100644 --- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml @@ -64,6 +64,8 @@ <text name="scripts_value" value="Ligado"/> <text name="damage_label" value="Dano:"/> <text name="damage_value" value="Desligado"/> + <text name="see_avatars_label" value="Ver avatares:"/> + <text name="see_avatars_value" value="Desligar"/> <button label="Sobre o terreno" name="about_land_btn"/> </panel> </accordion_tab> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index bbe7e15ba2..c72928fc35 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml @@ -3,6 +3,19 @@ <panel.string name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> + <text name="Cache:"> + Cache: + </text> + <spinner label="Cache (64 - 9984 MB)" name="cachesizespinner"/> + <text name="text_box5"> + MB + </text> + <button label="Limpar cache" label_selected="Limpar cache" name="clear_cache"/> + <text name="Cache location"> + Localização do cache: + </text> + <button label="Navegar" label_selected="Navegar" name="set_cache"/> + <button label="Localização padrão" label_selected="Localização padrão" name="default_cache_location"/> <text name="UI Size:"> Interface: </text> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml index 4164147e5c..d910a7b812 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml @@ -19,6 +19,7 @@ <check_box label="Ativado" name="enable_voice_check"/> <check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="true"/> <check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="true"/> + <check_box label="Tocar áudio de gestos" name="gesture_audio_play_btn" tool_tip="Selecione para ouvir o áudio de gestos" value="verdadeiro"/> <text name="voice_chat_settings"> Configuração de bate-papo de voz </text> @@ -35,28 +36,5 @@ <button label="Definir chave" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/> <button label="Controles de entrada/saída" name="device_settings_btn" width="180"/> - <panel label="Configuração dos dispositivo" name="device_settings_panel"> - <panel.string name="default_text"> - Padrão - </panel.string> - <panel.string name="default system device"> - Dispositivo padrão do sistema - </panel.string> - <panel.string name="no device"> - Nenhum - </panel.string> - <text name="Input"> - Entrada - </text> - <text name="My volume label"> - Meu volume: - </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Mude o volume usando o controle deslizante"/> - <text name="wait_text"> - Aguarde - </text> - <text name="Output"> - Saída - </text> - </panel> + <panel label="Configuração dos dispositivo" name="device_settings_panel"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml new file mode 100644 index 0000000000..79eedebe5f --- /dev/null +++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel label="Ambiente" name="panel_env_info"> + <text name="water_settings_title"> + Selecione as configurações de Água e céu / Ciclo dos dias que todos os visitantes à sua região verão. Mais informações + </text> + <radio_group name="region_settings_radio_group"> + <radio_item label="Usar o padrão do Second Life" name="use_sl_default_settings"/> + <radio_item label="Usar as seguintes configurações" name="use_my_settings"/> + </radio_group> + <panel name="user_environment_settings"> + <text name="water_settings_title"> + Configuração de água + </text> + <combo_box name="water_settings_preset_combo"> + <combo_box.item label="-Selecione uma pré-configuração-" name="item0"/> + </combo_box> + <text name="sky_dayc_settings_title"> + Ciclo céu / dia + </text> + <radio_group name="sky_dayc_settings_radio_group"> + <radio_item label="Céu fixo" name="my_sky_settings"/> + <radio_item label="Ciclo dia" name="my_dayc_settings"/> + </radio_group> + <combo_box name="sky_settings_preset_combo"> + <combo_box.item label="-Selecione uma pré-configuração-" name="item0"/> + </combo_box> + <combo_box name="dayc_settings_preset_combo"> + <combo_box.item label="-Selecione uma pré-configuração-" name="item0"/> + </combo_box> + </panel> + <button label="Aplicar" name="apply_btn"/> + <button label="Cancelar" name="cancel_btn"/> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml index b9b0e9d90f..74330a8946 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml @@ -7,21 +7,56 @@ nenhum </text> <spinner label="Altura da água" name="water_height_spin"/> - <button label="?" name="water_height_help"/> - <spinner label="Limite do aumento do terreno" name="terrain_raise_spin"/> - <button label="?" name="terrain_raise_help"/> - <spinner label="Limite mais baixo do terreno" name="terrain_lower_spin" bottom_delta="-34"/> - <button label="?" name="terrain_lower_help"/> - <check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/> - <button label="?" name="use_estate_sun_help"/> - <check_box label="Sol fixo" name="fixed_sun_check"/> - <button label="?" name="fixed_sun_help"/> - <slider label="Fase" name="sun_hour_slider"/> - <button label="Aplicar" name="apply_btn"/> + <spinner label="Limite do aumento do +terreno" name="terrain_raise_spin"/> + <spinner bottom_delta="-34" label="Limite mais baixo do +terreno" name="terrain_lower_spin"/> + <text name="detail_texture_text"> + Texturas de terreno (exige arquivos .tga 512x512, 24 bit) + </text> + <text name="height_text_lbl"> + 1 (Baixo) + </text> + <text name="height_text_lbl2"> + 2 + </text> + <text name="height_text_lbl3"> + 3 + </text> + <text name="height_text_lbl4"> + 4 (Alto) + </text> + <text name="height_text_lbl5"> + Intervalos de elevação de textura + </text> + <text name="height_text_lbl10"> + Os valores representam o intervalo de mistura das texturas acima. + </text> + <text name="height_text_lbl11"> + Em metros, o valor BAIXO é a altura MÁXIMA da Textura 1, e HIGH é a altura MÍNIMA da Textura 4. + </text> + <text name="height_text_lbl6"> + Noroeste + </text> + <text name="height_text_lbl7"> + Nordeste + </text> + <spinner label="Baixo" name="height_start_spin_1"/> + <spinner label="Baixo" name="height_start_spin_3"/> + <spinner label="Alto" name="height_range_spin_1"/> + <spinner label="Alto" name="height_range_spin_3"/> + <text name="height_text_lbl8"> + Sudoeste + </text> + <text name="height_text_lbl9"> + Sudeste + </text> + <spinner label="Baixo" name="height_start_spin_0"/> + <spinner label="Baixo" name="height_start_spin_2"/> + <spinner label="Alto" name="height_range_spin_0"/> + <spinner label="Alto" name="height_range_spin_2"/> <button label="Download de terreno RAW..." name="download_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/> - <button label="?" name="download_raw_help"/> <button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponível aos gerentes, somente aos proprietários."/> - <button label="?" name="upload_raw_help"/> - <button width="170" label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/> - <button left="190" label="?" name="bake_terrain_help"/> + <button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo" width="170"/> + <button label="Aplicar" name="apply_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml index 11ac6c106a..988e7c7076 100644 --- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml @@ -1,6 +1,38 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Coisas" name="objects panel"> <panel label="" name="sidepanel__inventory_panel"> + <layout_stack name="inventory_layout_stack"> + <layout_panel name="inbox_layout_panel"> + <panel label="" name="marketplace_inbox"> + <string name="InboxLabelWithArg"> + Itens recebidos ([NUM]) + </string> + <string name="InboxLabelNoArg"> + Itens recebidos + </string> + <button label="Itens recebidos" name="inbox_btn"/> + <text name="inbox_fresh_new_count"> + [NUM] novos + </text> + <panel tool_tip="Drag and drop items to your inventory to manage and use them"> + <text name="inbox_inventory_placeholder"> + Compras do marketplace serão entregues aqui. + </text> + </panel> + </panel> + </layout_panel> + <layout_panel name="outbox_layout_panel"> + <panel label="" name="marketplace_outbox"> + <button label="Caixa de saída de comerciante" name="outbox_btn"/> + <button label="" name="outbox_sync_btn" tool_tip="Enviar para minha vitrine no Marketplace"/> + <panel tool_tip="Drag and drop items here to prepare them for sale on your storefront"> + <text name="outbox_inventory_placeholder"> + Abra uma conta de comerciante para usar este recurso. + </text> + </panel> + </panel> + </layout_panel> + </layout_stack> <panel name="button_panel"> <layout_stack name="button_panel_ls"> <layout_panel name="info_btn_lp"> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index ed93217d59..3b3b7041d7 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -1132,6 +1132,12 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar <string name="InventoryNoTexture"> Você não possui uma cópia desta textura no seu inventário </string> + <string name="InventoryInboxNoItems"> + Compras do marketplace serão entregues aqui. + </string> + <string name="InventoryOutboxNoItems"> + Arraste seus itens aqui para preparar sua listagem na sua vitrine do Marketplace. + </string> <string name="no_transfer" value="(não transferível)"/> <string name="no_modify" value="(não modificável)"/> <string name="no_copy" value="(não copiável)"/> @@ -1256,6 +1262,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar <string name="InvFolder All"> Tudo </string> + <string name="no_attachments"> + Nenhum anexo vestido + </string> <string name="Buy"> Comprar </string> @@ -1591,6 +1600,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar <string name="IMTeen"> adolescente </string> + <string name="Anyone"> + qualquer um + </string> <string name="RegionInfoError"> erro </string> @@ -1807,6 +1819,12 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar <string name="Public"> Público </string> + <string name="LocalSettings"> + Configurações locais + </string> + <string name="RegionSettings"> + Configurações da região + </string> <string name="ClassifiedClicksTxt"> Cliques: [TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil </string> @@ -3594,6 +3612,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="LocationCtrlGeneralIconTooltip"> Região em geral </string> + <string name="LocationCtrlSeeAVsTooltip"> + Avatar visíveis e bate-papo permitido fora deste terreno + </string> <string name="UpdaterWindowTitle"> [APP_NAME] Atualização </string> diff --git a/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml index 0ef2234fec..56c2310f2f 100644 --- a/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/de/panel_im_control_panel.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <text name="avatar_name" value="Unbekannt"/> <layout_stack name="button_stack"> <layout_panel name="view_profile_btn_panel"> <button label="Profil" name="view_profile_btn"/> @@ -11,20 +10,20 @@ <layout_panel name="teleport_btn_panel"> <button label="Teleportieren" name="teleport_btn" tool_tip="Dieser Person einen Teleport anbieten"/> </layout_panel> - <layout_panel name="share_btn_panel"> - <button label="Teilen" name="share_btn"/> - </layout_panel> - <layout_panel name="pay_btn_panel"> - <button label="Bezahlen" name="pay_btn"/> - </layout_panel> <layout_panel name="call_btn_panel"> <button label="Anrufen" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Anruf beenden" name="end_call_btn"/> </layout_panel> - <layout_panel name="voice_ctrls_btn_panel"> - <button label="Voice-Steuerung" name="voice_ctrls_btn"/> + <layout_panel name="block_btn_panel"> + <button label="Ignorieren" name="block_btn"/> + </layout_panel> + <layout_panel name="unblock_btn_panel"> + <button label="Freischalten" name="unblock_btn"/> + </layout_panel> + <layout_panel name="volume_ctrl_panel"> + <slider name="volume_slider" tool_tip="Anrufvolumen" value="0,5"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml index 1be6997813..93b6526f77 100644 --- a/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/es/panel_im_control_panel.xml @@ -10,20 +10,20 @@ <layout_panel name="teleport_btn_panel"> <button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/> </layout_panel> - <layout_panel name="share_btn_panel"> - <button label="Compartir" name="share_btn"/> - </layout_panel> - <layout_panel name="pay_btn_panel"> - <button label="Pagar" name="pay_btn"/> - </layout_panel> <layout_panel name="call_btn_panel"> <button label="Llamar" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Colgar" name="end_call_btn"/> </layout_panel> - <layout_panel name="voice_ctrls_btn_panel"> - <button label="Controles de la voz" name="voice_ctrls_btn"/> + <layout_panel name="block_btn_panel"> + <button label="Ignorar" name="block_btn"/> + </layout_panel> + <layout_panel name="unblock_btn_panel"> + <button label="No ignorar" name="unblock_btn"/> + </layout_panel> + <layout_panel name="volume_ctrl_panel"> + <slider name="volume_slider" tool_tip="Volumen de la llamada" value="0.5"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml index fdc5aeca49..1643cf3229 100644 --- a/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/fr/panel_im_control_panel.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <text name="avatar_name" value="Inconnu"/> <layout_stack name="button_stack"> <layout_panel name="view_profile_btn_panel"> <button label="Profil" name="view_profile_btn"/> @@ -11,20 +10,20 @@ <layout_panel name="teleport_btn_panel"> <button label="Téléporter" name="teleport_btn" tool_tip="Proposer de téléporter cette personne."/> </layout_panel> - <layout_panel name="share_btn_panel"> - <button label="Partager" name="share_btn"/> - </layout_panel> - <layout_panel name="pay_btn_panel"> - <button label="Payer" name="pay_btn"/> - </layout_panel> <layout_panel name="call_btn_panel"> <button label="Appeler" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Quitter l'appel" name="end_call_btn"/> </layout_panel> - <layout_panel name="voice_ctrls_btn_panel"> - <button label="Contrôles vocaux" name="voice_ctrls_btn"/> + <layout_panel name="block_btn_panel"> + <button label="Ignorer" name="block_btn"/> + </layout_panel> + <layout_panel name="unblock_btn_panel"> + <button label="Ne plus ignorer" name="unblock_btn"/> + </layout_panel> + <layout_panel name="volume_ctrl_panel"> + <slider name="volume_slider" tool_tip="Volume de l'appel." value="0,5"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml index 756db84c1c..269931a1a4 100644 --- a/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/it/panel_im_control_panel.xml @@ -10,20 +10,20 @@ <layout_panel name="teleport_btn_panel"> <button label="Teleport" name="teleport_btn" tool_tip="Offri teleport a questa persona"/> </layout_panel> - <layout_panel name="share_btn_panel"> - <button label="Condividi" name="share_btn"/> - </layout_panel> - <layout_panel name="pay_btn_panel"> - <button label="Paga" name="pay_btn"/> - </layout_panel> <layout_panel name="call_btn_panel"> <button label="Chiama" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Chiudi chiamata" name="end_call_btn"/> </layout_panel> - <layout_panel name="voice_ctrls_btn_panel"> - <button label="Regolazione voce" name="voice_ctrls_btn"/> + <layout_panel name="block_btn_panel"> + <button label="Blocca" name="block_btn"/> + </layout_panel> + <layout_panel name="unblock_btn_panel"> + <button label="Sblocca" name="unblock_btn"/> + </layout_panel> + <layout_panel name="volume_ctrl_panel"> + <slider name="volume_slider" tool_tip="Volume chiamata" value="0.5"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml index f2429ac12a..14c38c796f 100644 --- a/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/ja/panel_im_control_panel.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_im_control_panel"> - <text name="avatar_name" value="不明"/> <layout_stack name="button_stack"> <layout_panel name="view_profile_btn_panel"> <button label="プロフィール" name="view_profile_btn"/> @@ -11,20 +10,20 @@ <layout_panel name="teleport_btn_panel"> <button label="テレポート" name="teleport_btn" tool_tip="この人にテレポートを送ります"/> </layout_panel> - <layout_panel name="share_btn_panel"> - <button label="共有" name="share_btn"/> - </layout_panel> - <layout_panel name="pay_btn_panel"> - <button label="支払う" name="pay_btn"/> - </layout_panel> <layout_panel name="call_btn_panel"> <button label="コール" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="コール終了" name="end_call_btn"/> </layout_panel> - <layout_panel name="voice_ctrls_btn_panel"> - <button label="ボイスコントロール" name="voice_ctrls_btn"/> + <layout_panel name="block_btn_panel"> + <button label="ブロック" name="block_btn"/> + </layout_panel> + <layout_panel name="unblock_btn_panel"> + <button label="ブロック解除" name="unblock_btn"/> + </layout_panel> + <layout_panel name="volume_ctrl_panel"> + <slider name="volume_slider" tool_tip="コールの音量" value="0.5"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml index d223ee9c69..190323c3b0 100644 --- a/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml +++ b/indra/newview/skins/minimal/xui/pt/panel_im_control_panel.xml @@ -10,20 +10,20 @@ <layout_panel name="teleport_btn_panel"> <button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/> </layout_panel> - <layout_panel name="share_btn_panel"> - <button label="Compartilhar" name="share_btn"/> - </layout_panel> - <layout_panel name="pay_btn_panel"> - <button label="Pagar" name="pay_btn"/> - </layout_panel> <layout_panel name="call_btn_panel"> <button label="Ligar" name="call_btn"/> </layout_panel> <layout_panel name="end_call_btn_panel"> <button label="Encerrar ligação" name="end_call_btn"/> </layout_panel> - <layout_panel name="voice_ctrls_btn_panel"> - <button label="Controles de voz" name="voice_ctrls_btn"/> + <layout_panel name="block_btn_panel"> + <button label="Bloquear" name="block_btn"/> + </layout_panel> + <layout_panel name="unblock_btn_panel"> + <button label="Desbloquear" name="unblock_btn"/> + </layout_panel> + <layout_panel name="volume_ctrl_panel"> + <slider name="volume_slider" tool_tip="Volume da ligação" value="0.5"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp index dd7761475e..3c89b64d52 100644 --- a/indra/newview/tests/llviewernetwork_test.cpp +++ b/indra/newview/tests/llviewernetwork_test.cpp @@ -164,7 +164,7 @@ namespace tut std::string("https://secondlife.com/helpers/")); ensure_equals("Agni login page is correct", grid[GRID_LOGIN_PAGE_VALUE].asString(), - std::string("http://secondlife.com/app/login/")); + std::string("http://viewer-login.agni.lindenlab.com/")); ensure("Agni is a favorite", grid.has(GRID_IS_FAVORITE_VALUE)); ensure("Agni is a system grid", @@ -208,7 +208,7 @@ namespace tut std::string("https://secondlife.com/helpers/")); ensure_equals("Agni login page the same after grid file", grid[GRID_LOGIN_PAGE_VALUE].asString(), - std::string("http://secondlife.com/app/login/")); + std::string("http://viewer-login.agni.lindenlab.com/")); ensure("Agni still a favorite after grid file", grid.has(GRID_IS_FAVORITE_VALUE)); ensure("Agni system grid still set after grid file", @@ -310,7 +310,7 @@ namespace tut std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/")); ensure_equals("Override known grid login uri: login page is not set", grid[GRID_LOGIN_PAGE_VALUE].asString(), - std::string("http://secondlife.com/app/login/")); + std::string("http://viewer-login.agni.lindenlab.com/")); // Override with loginuri // override custom grid @@ -359,7 +359,7 @@ namespace tut std::string("https://my.helper.uri/mycustomhelpers")); ensure_equals("Override known grid helper uri: login page is not changed", grid[GRID_LOGIN_PAGE_VALUE].asString(), - std::string("http://secondlife.com/app/login/")); + std::string("http://viewer-login.agni.lindenlab.com/")); // Override with helperuri // override custom grid @@ -451,9 +451,9 @@ namespace tut ensure_equals("getHelperURI", LLGridManager::getInstance()->getHelperURI(), std::string("https://secondlife.com/helpers/")); ensure_equals("getLoginPage", LLGridManager::getInstance()->getLoginPage(), - std::string("http://secondlife.com/app/login/")); + std::string("http://viewer-login.agni.lindenlab.com/")); ensure_equals("getLoginPage2", LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"), - std::string("http://secondlife.com/app/login/")); + std::string("http://viewer-login.agni.lindenlab.com/")); ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid()); std::vector<std::string> uris; LLGridManager::getInstance()->getLoginURIs(uris); diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp index 51ff754c27..170babbb98 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp @@ -296,6 +296,7 @@ void LLCrashLoggerWindows::gatherPlatformSpecificFiles() bool LLCrashLoggerWindows::mainLoop() { + llinfos << "CrashSubmitBehavior is " << mCrashBehavior << llendl; // Note: parent hwnd is 0 (the desktop). No dlg proc. See Petzold (5th ed) HexCalc example, Chapter 11, p529 // win_crash_logger.rc has been edited by hand. @@ -308,6 +309,7 @@ bool LLCrashLoggerWindows::mainLoop() if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND) { + llinfos << "Showing crash report submit progress window." << llendl; ShowWindow(gHwndProgress, SW_SHOW ); sendCrashLogs(); } @@ -354,7 +356,7 @@ bool LLCrashLoggerWindows::mainLoop() void LLCrashLoggerWindows::updateApplication(const std::string& message) { - LLCrashLogger::updateApplication(); + LLCrashLogger::updateApplication(message); if(!message.empty()) show_progress(message); update_messages(); } @@ -370,6 +372,3 @@ bool LLCrashLoggerWindows::cleanup() PostQuitMessage(0); return true; } - - - diff --git a/indra/win_crash_logger/llcrashloggerwindows.h b/indra/win_crash_logger/llcrashloggerwindows.h index 24c564457c..5c45a998b3 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.h +++ b/indra/win_crash_logger/llcrashloggerwindows.h @@ -41,7 +41,6 @@ public: virtual void updateApplication(const std::string& message = LLStringUtil::null); virtual bool cleanup(); virtual void gatherPlatformSpecificFiles(); - //void annotateCallStack(); void setHandle(HINSTANCE hInst) { mhInst = hInst; } private: void ProcessDlgItemText(HWND hWnd, int nIDDlgItem); diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp index 5c22053317..8e916ae437 100644 --- a/indra/win_crash_logger/win_crash_logger.cpp +++ b/indra/win_crash_logger/win_crash_logger.cpp @@ -24,51 +24,30 @@ * $/LicenseInfo$ */ -// win_crash_logger.cpp : Defines the entry point for the application. -// - -// Must be first include, precompiled headers. #include "linden_common.h" - #include "stdafx.h" - #include <stdlib.h> - #include "llcrashloggerwindows.h" - - -// -// Implementation -// - int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - llinfos << "Starting crash reporter" << llendl; + llinfos << "Starting crash reporter." << llendl; LLCrashLoggerWindows app; app.setHandle(hInstance); - bool ok = app.init(); - if(!ok) + app.parseCommandOptions(__argc, __argv); + + if (! app.init()) { llwarns << "Unable to initialize application." << llendl; return -1; } - // Run the application main loop - if(!LLApp::isQuitting()) app.mainLoop(); - - if (!app.isError()) - { - // - // We don't want to do cleanup here if the error handler got called - - // the assumption is that the error handler is responsible for doing - // app cleanup if there was a problem. - // - app.cleanup(); - } + app.mainLoop(); + app.cleanup(); + llinfos << "Crash reporter finished normally." << llendl; return 0; } |